From a757da68384731f71847d26872dcacada4e37ea4 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 22 Dec 2022 17:39:36 +0530
Subject: [PATCH] fix(gui):shared view creation bug and show icon in shared
 view

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../components/smartsheet/sidebar/MenuTop.vue  |  1 +
 .../smartsheet/sidebar/RenameableMenuItem.vue  | 16 ++++++++++++----
 packages/nc-gui/composables/useSharedView.ts   |  7 +++++--
 packages/nc-gui/layouts/shared-view.vue        |  3 ++-
 packages/nocodb/src/lib/models/View.ts         | 12 +++++++++---
 packages/nocodb/src/lib/utils/modelUtils.ts    | 18 ++++++++++--------
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue b/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
index a08eed3735..5fe7476271 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
@@ -216,6 +216,7 @@ function openDeleteDialog(view: ViewType) {
 
 const setIcon = async (icon: string, view: ViewType) => {
   try {
+    // modify the icon property in meta
     view.meta = {
       ...(view.meta || {}),
       icon,
diff --git a/packages/nc-gui/components/smartsheet/sidebar/RenameableMenuItem.vue b/packages/nc-gui/components/smartsheet/sidebar/RenameableMenuItem.vue
index 3d5646d57c..3d4cafa757 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/RenameableMenuItem.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/RenameableMenuItem.vue
@@ -12,6 +12,8 @@ import {
   useVModel,
 } from '#imports'
 
+import { Tooltip } from 'ant-design-vue'
+
 interface Props {
   view: ViewType
   onValidate: (view: ViewType) => boolean | string
@@ -173,10 +175,14 @@ function onStopEdit() {
     @dblclick.stop="onDblClick"
     @click.stop="onClick"
   >
-    <div v-e="['a:view:open', { view: vModel.type }]" class="text-xs flex items-center w-full gap-2" data-testid="view-item">
+    <div v-e="['a:view:open', { view: vModel.type }]" class="text-xs flex items-center w-full gap-2"
+         data-testid="view-item">
       <div class="flex w-auto min-w-5" :data-testid="`view-sidebar-drag-handle-${vModel.alias || vModel.title}`">
         <a-dropdown :trigger="['click']" @click.stop>
-          <GeneralViewIcon :meta="props.view"></GeneralViewIcon>
+          <component :is="isUIAllowed('tableIconCustomisation') ? Tooltip : 'div'">
+            <GeneralViewIcon :meta="props.view"></GeneralViewIcon>
+            <template v-if="isUIAllowed('tableIconCustomisation')" #title>Change icon</template>
+          </component>
 
           <template v-if="isUIAllowed('viewIconCustomisation')" #overlay>
             <GeneralEmojiIcons class="shadow bg-white p-2" @select-icon="emits('selectIcon', $event)" />
@@ -184,7 +190,8 @@ function onStopEdit() {
         </a-dropdown>
       </div>
 
-      <a-input v-if="isEditing" :ref="focusInput" v-model:value="vModel.title" @blur="onCancel" @keydown="onKeyDown($event)" />
+      <a-input v-if="isEditing" :ref="focusInput" v-model:value="vModel.title" @blur="onCancel"
+               @keydown="onKeyDown($event)" />
 
       <div v-else>
         <LazyGeneralTruncateText>{{ vModel.alias || vModel.title }}</LazyGeneralTruncateText>
@@ -199,7 +206,8 @@ function onStopEdit() {
               {{ $t('activity.copyView') }}
             </template>
 
-            <MdiContentCopy class="hidden group-hover:block text-gray-500 nc-view-copy-icon" @click.stop="onDuplicate" />
+            <MdiContentCopy class="hidden group-hover:block text-gray-500 nc-view-copy-icon"
+                            @click.stop="onDuplicate" />
           </a-tooltip>
 
           <template v-if="!vModel.is_default">
diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts
index b0ddc867db..cb0c5ea8c5 100644
--- a/packages/nc-gui/composables/useSharedView.ts
+++ b/packages/nc-gui/composables/useSharedView.ts
@@ -58,8 +58,11 @@ export function useSharedView() {
         'xc-password': localPassword ?? password.value,
       },
     })
-
-    allowCSVDownload.value = JSON.parse(viewMeta.meta)?.allowCSVDownload
+    try {
+      allowCSVDownload.value = (typeof viewMeta.meta === 'string' ? JSON.parse(viewMeta.meta) : viewMeta.meta)?.allowCSVDownload
+    } catch {
+      allowCSVDownload.value = false
+    }
 
     if (localPassword) password.value = localPassword
     sharedView.value = { title: '', ...viewMeta }
diff --git a/packages/nc-gui/layouts/shared-view.vue b/packages/nc-gui/layouts/shared-view.vue
index 986213d401..797f68f5d4 100644
--- a/packages/nc-gui/layouts/shared-view.vue
+++ b/packages/nc-gui/layouts/shared-view.vue
@@ -58,7 +58,8 @@ export default {
                 <MdiReload :class="{ 'animate-infinite animate-spin ': isLoading }" />
               </template>
 
-              <div v-else class="text-xl font-semibold truncate text-white nc-shared-view-title">
+              <div v-else class="text-xl font-semibold truncate text-white nc-shared-view-title flex gap-2 items-center">
+                <GeneralViewIcon class="!text-2xl" :meta="sharedView" />
                 {{ sharedView?.title }}
               </div>
             </div>
diff --git a/packages/nocodb/src/lib/models/View.ts b/packages/nocodb/src/lib/models/View.ts
index 06c092cc04..cc83d8bfea 100644
--- a/packages/nocodb/src/lib/models/View.ts
+++ b/packages/nocodb/src/lib/models/View.ts
@@ -5,7 +5,7 @@ import {
   CacheScope,
   MetaTable,
 } from '../utils/globals';
-import { parseMetaProp, stringifyMetaProp } from '../utils/modelUtils'
+import { parseMetaProp, stringifyMetaProp } from '../utils/modelUtils';
 import Model from './Model';
 import FormView from './FormView';
 import GridView from './GridView';
@@ -715,11 +715,16 @@ export default class View implements ViewType {
     }
   }
 
+  // todo: cache
   static async getByUUID(uuid: string, ncMeta = Noco.ncMeta) {
     const view = await ncMeta.metaGet2(null, null, MetaTable.VIEWS, {
       uuid,
     });
 
+    if (view) {
+      parseMetaProp(view);
+    }
+
     return view && new View(view);
   }
 
@@ -748,8 +753,9 @@ export default class View implements ViewType {
         viewId
       );
     }
-    if (!view.meta) {
+    if (!view.meta || !('allowCSVDownload' in view.meta)) {
       const defaultMeta = {
+        ...(view.meta ?? {}),
         allowCSVDownload: true,
       };
       // get existing cache
@@ -757,7 +763,7 @@ export default class View implements ViewType {
       const o = await NocoCache.get(key, CacheGetType.TYPE_OBJECT);
       if (o) {
         // update data
-        o.meta = JSON.stringify(defaultMeta);
+        o.meta = defaultMeta;
         // set cache
         await NocoCache.set(key, o);
       }
diff --git a/packages/nocodb/src/lib/utils/modelUtils.ts b/packages/nocodb/src/lib/utils/modelUtils.ts
index f2b6c7b96c..130e081f0a 100644
--- a/packages/nocodb/src/lib/utils/modelUtils.ts
+++ b/packages/nocodb/src/lib/utils/modelUtils.ts
@@ -1,5 +1,7 @@
-export function parseMetaProp(modelOrModelList: { meta: any } | { meta: any }[]) {
-  if (!modelOrModelList) return
+export function parseMetaProp(
+  modelOrModelList: { meta: any } | { meta: any }[]
+) {
+  if (!modelOrModelList) return;
 
   // parse meta property
   for (const model of Array.isArray(modelOrModelList)
@@ -7,17 +9,17 @@ export function parseMetaProp(modelOrModelList: { meta: any } | { meta: any }[])
     : [modelOrModelList]) {
     try {
       model.meta =
-        typeof model.meta === 'string' ? JSON.parse(model.meta) : model.meta
+        typeof model.meta === 'string' ? JSON.parse(model.meta) : model.meta;
     } catch {
-      model.meta = {}
+      model.meta = {};
     }
   }
 }
 
 export function stringifyMetaProp(
-  modelOrModelList: { meta?: any } | { meta?: any }[],
+  modelOrModelList: { meta?: any } | { meta?: any }[]
 ) {
-  if (!modelOrModelList) return
+  if (!modelOrModelList) return;
 
   // parse meta property
   for (const model of Array.isArray(modelOrModelList)
@@ -25,9 +27,9 @@ export function stringifyMetaProp(
     : [modelOrModelList]) {
     try {
       model.meta =
-        typeof model.meta !== 'string' ? model.meta : JSON.parse(model.meta)
+        typeof model.meta === 'string' ? model.meta : JSON.stringify(model.meta);
     } catch (e) {
-      model.meta = '{}'
+      model.meta = '{}';
     }
   }
 }