From 7220194f4bd78b244b0fe7da9749285eeade479f Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Mon, 2 Oct 2023 11:43:00 +0000
Subject: [PATCH] fix: Removed No Views placeholder and now we keep
 hasNonDefaultViews in table meta and wrote unit tests

---
 .../dashboard/TreeView/CreateViewBtn.vue      |  5 ++
 .../dashboard/TreeView/TableNode.vue          |  9 ++-
 .../dashboard/TreeView/ViewsList.vue          | 19 ++---
 packages/nc-gui/lang/en.json                  |  1 -
 packages/nc-gui/store/tables.ts               | 15 ++++
 packages/nocodb/src/models/Model.ts           | 47 +++++++++++
 packages/nocodb/src/models/View.ts            | 10 +++
 packages/nocodb/tests/unit/factory/table.ts   | 14 +++-
 packages/nocodb/tests/unit/factory/view.ts    | 16 +++-
 .../tests/unit/rest/tests/attachment.test.ts  |  1 -
 .../tests/unit/rest/tests/table.test.ts       | 81 ++++++++++++++++++-
 11 files changed, 200 insertions(+), 18 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
index a9810a14eb..3c30e105d7 100644
--- a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
@@ -47,6 +47,11 @@ function onOpenModal({
         force: true,
       })
 
+      table.value.meta = {
+        ...(table.value.meta as object),
+        hasNonDefaultViews: true,
+      }
+
       navigateToView({
         view,
         tableId: table.value.id!,
diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 2be468ce4a..cfc05e1b46 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -167,13 +167,20 @@ const isTableOpened = computed(() => {
         @click="onOpenTable"
       >
         <div class="flex flex-row h-full items-center">
-          <NcButton type="text" size="xxsmall" class="nc-sidebar-node-btn nc-sidebar-expand" @click.stop="onExpand">
+          <NcButton
+            v-if="(table.meta as any)?.hasNonDefaultViews"
+            type="text"
+            size="xxsmall"
+            class="nc-sidebar-node-btn nc-sidebar-expand"
+            @click.stop="onExpand"
+          >
             <GeneralIcon
               icon="triangleFill"
               class="nc-sidebar-base-node-btns group-hover:visible invisible cursor-pointer transform transition-transform duration-500 h-1.5 w-1.5 !text-gray-600 rotate-90"
               :class="{ '!rotate-180': isExpanded }"
             />
           </NcButton>
+          <div v-else class="min-w-5.75"></div>
           <div class="flex w-auto" :data-testid="`tree-view-table-draggable-handle-${table.title}`">
             <div
               class="flex items-center nc-table-icon"
diff --git a/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue b/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue
index bd12f9b5ec..7e171b02de 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue
@@ -277,6 +277,13 @@ function openDeleteDialog(view: ViewType) {
         tableId: table.value.id!,
         force: true,
       })
+
+      const activeNonDefaultViews = viewsByTable.value.get(table.value.id!)?.filter((v) => !v.is_default) ?? []
+
+      table.value.meta = {
+        ...(table.value.meta as object),
+        hasNonDefaultViews: activeNonDefaultViews.length > 1,
+      }
     },
   })
 
@@ -356,18 +363,8 @@ function onOpenModal({
 </script>
 
 <template>
-  <div
-    v-if="!views.length"
-    class="text-gray-500 my-1.75 xs:(my-2.5 text-base)"
-    :class="{
-      'ml-19.25 xs:ml-22.25': isDefaultBase,
-      'ml-24.75 xs:ml-30': !isDefaultBase,
-    }"
-  >
-    {{ $t('labels.noViews') }}
-  </div>
-
   <a-menu
+    v-if="views.length"
     ref="menuRef"
     :class="{ dragging }"
     class="nc-views-menu flex flex-col w-full !border-r-0 !bg-inherit"
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index a3ff0a8869..7e472fdecf 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -436,7 +436,6 @@
     "untitledToken": "Untitled token",
     "tableName": "Table name",
     "dashboardName": "Dashboard name",
-    "noViews": "No views",
     "createView": "Create a View",
     "creatingView": "Creating View",
     "duplicateView": "Duplicate view",
diff --git a/packages/nc-gui/store/tables.ts b/packages/nc-gui/store/tables.ts
index bfbf842bc8..9bd5d80394 100644
--- a/packages/nc-gui/store/tables.ts
+++ b/packages/nc-gui/store/tables.ts
@@ -76,6 +76,21 @@ export const useTablesStore = defineStore('tablesStore', () => {
       includeM2M: includeM2M.value,
     })
 
+    tables.list?.forEach((t) => {
+      let meta = t.meta
+      if (typeof meta === 'string') {
+        try {
+          meta = JSON.parse(meta)
+        } catch (e) {
+          console.error(e)
+        }
+      }
+
+      if (!meta) meta = {}
+
+      t.meta = meta
+    })
+
     projectTables.value.set(projectId, tables.list || [])
   }
 
diff --git a/packages/nocodb/src/models/Model.ts b/packages/nocodb/src/models/Model.ts
index 863db4ba31..befb022c34 100644
--- a/packages/nocodb/src/models/Model.ts
+++ b/packages/nocodb/src/models/Model.ts
@@ -221,6 +221,19 @@ export default class Model implements TableType {
         (a.order != null ? a.order : Infinity) -
         (b.order != null ? b.order : Infinity),
     );
+
+    for (const model of modelList) {
+      if (model.meta?.hasNonDefaultViews === undefined) {
+        model.meta = {
+          ...(model.meta ?? {}),
+          hasNonDefaultViews: await Model.getNonDefaultViewsCountAndReset(
+            { modelId: model.id },
+            ncMeta,
+          ),
+        };
+      }
+    }
+
     return modelList.map((m) => new Model(m));
   }
 
@@ -255,6 +268,18 @@ export default class Model implements TableType {
       await NocoCache.setList(CacheScope.MODEL, [project_id], modelList);
     }
 
+    for (const model of modelList) {
+      if (model.meta?.hasNonDefaultViews === undefined) {
+        model.meta = {
+          ...(model.meta ?? {}),
+          hasNonDefaultViews: await Model.getNonDefaultViewsCountAndReset(
+            { modelId: model.id },
+            ncMeta,
+          ),
+        };
+      }
+    }
+
     return modelList.map((m) => new Model(m));
   }
 
@@ -964,4 +989,26 @@ export default class Model implements TableType {
       tableId,
     );
   }
+
+  static async getNonDefaultViewsCountAndReset(
+    {
+      modelId,
+    }: {
+      modelId: string;
+    },
+    _ncMeta = Noco.ncMeta,
+  ) {
+    const model = await this.get(modelId);
+    let modelMeta = parseMetaProp(model);
+
+    const views = await View.list(modelId);
+    modelMeta = {
+      ...(modelMeta ?? {}),
+      hasNonDefaultViews: views.length > 1,
+    };
+
+    await this.updateMeta(modelId, modelMeta);
+
+    return modelMeta?.hasNonDefaultViews;
+  }
 }
diff --git a/packages/nocodb/src/models/View.ts b/packages/nocodb/src/models/View.ts
index 2fed460e6f..2e59e25345 100644
--- a/packages/nocodb/src/models/View.ts
+++ b/packages/nocodb/src/models/View.ts
@@ -501,6 +501,11 @@ export default class View implements ViewType {
       }
     }
 
+    await Model.getNonDefaultViewsCountAndReset(
+      { modelId: view.fk_model_id },
+      ncMeta,
+    );
+
     return View.get(view_id, ncMeta);
   }
 
@@ -1078,6 +1083,11 @@ export default class View implements ViewType {
       CacheScope.SINGLE_QUERY,
       `${view.fk_model_id}:${view.id}:*`,
     );
+
+    await Model.getNonDefaultViewsCountAndReset(
+      { modelId: view.fk_model_id },
+      ncMeta,
+    );
   }
 
   private static extractViewColumnsTableName(view: View) {
diff --git a/packages/nocodb/tests/unit/factory/table.ts b/packages/nocodb/tests/unit/factory/table.ts
index 23b3d63738..14ce7eb9ac 100644
--- a/packages/nocodb/tests/unit/factory/table.ts
+++ b/packages/nocodb/tests/unit/factory/table.ts
@@ -45,4 +45,16 @@ const getAllTables = async ({ project }: { project: Project }) => {
   return tables;
 };
 
-export { createTable, getTable, getAllTables };
+const updateTable = async (
+  context,
+  { table, args }: { table: Model; args: any },
+) => {
+  const response = await request(context.app)
+    .patch(`/api/v1/db/meta/tables/${table.id}`)
+    .set('xc-auth', context.token)
+    .send(args);
+
+  return response.body;
+};
+
+export { createTable, getTable, getAllTables, updateTable };
diff --git a/packages/nocodb/tests/unit/factory/view.ts b/packages/nocodb/tests/unit/factory/view.ts
index 2e8d808af1..a0945b0666 100644
--- a/packages/nocodb/tests/unit/factory/view.ts
+++ b/packages/nocodb/tests/unit/factory/view.ts
@@ -121,4 +121,18 @@ const updateView = async (
   }
 };
 
-export { createView, updateView, getView };
+const deleteView = async (
+  context,
+  {
+    viewId,
+  }: {
+    viewId: string;
+  },
+) => {
+  await request(context.app)
+    .delete(`/api/v1/db/meta/views/${viewId}`)
+    .set('xc-auth', context.token)
+    .expect(200);
+};
+
+export { createView, updateView, getView, deleteView };
diff --git a/packages/nocodb/tests/unit/rest/tests/attachment.test.ts b/packages/nocodb/tests/unit/rest/tests/attachment.test.ts
index a45ab7a9f4..0ddc7d5c31 100644
--- a/packages/nocodb/tests/unit/rest/tests/attachment.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/attachment.test.ts
@@ -14,7 +14,6 @@ function attachmentTests() {
 
   beforeEach(async function () {
     console.time('#### attachmentTests');
-    context = await init();
     fs.writeFileSync(FILE_PATH, 'test', `utf-8`);
     context = await init();
     console.timeEnd('#### attachmentTests');
diff --git a/packages/nocodb/tests/unit/rest/tests/table.test.ts b/packages/nocodb/tests/unit/rest/tests/table.test.ts
index 965e163e9d..f846d90844 100644
--- a/packages/nocodb/tests/unit/rest/tests/table.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/table.test.ts
@@ -1,11 +1,13 @@
 import 'mocha';
 import request from 'supertest';
+import { expect } from 'chai';
+import { createView, deleteView } from 'tests/unit/factory/view';
+import { ViewTypes } from 'nocodb-sdk';
 import init from '../../init';
-import { createTable, getAllTables } from '../../factory/table';
+import { createTable, getAllTables, updateTable } from '../../factory/table';
 import { createProject } from '../../factory/project';
 import { defaultColumns } from '../../factory/column';
 import Model from '../../../../src/models/Model';
-import { expect } from 'chai';
 
 // Test case list
 // 1. Get table list
@@ -277,6 +279,81 @@ function tableTest() {
     //   new Error();
     // });
   });
+
+  it('Add and delete view should update hasNonDefaultViews', async () => {
+    let response = await request(context.app)
+      .get(`/api/v1/db/meta/projects/${project.id}/tables`)
+      .set('xc-auth', context.token)
+      .send({})
+      .expect(200);
+
+    expect(response.body.list[0].meta.hasNonDefaultViews).to.be.false;
+
+    const view = await createView(context, {
+      table,
+      title: 'view1',
+      type: ViewTypes.GRID,
+    });
+
+    response = await request(context.app)
+      .get(`/api/v1/db/meta/projects/${project.id}/tables`)
+      .set('xc-auth', context.token)
+      .send({})
+      .expect(200);
+
+    expect(response.body.list[0].meta.hasNonDefaultViews).to.be.true;
+
+    await deleteView(context, { viewId: view.id });
+
+    response = await request(context.app)
+      .get(`/api/v1/db/meta/projects/${project.id}/tables`)
+      .set('xc-auth', context.token)
+      .send({})
+      .expect(200);
+
+    expect(response.body.list[0].meta.hasNonDefaultViews).to.be.false;
+  });
+
+  it('Project with empty meta should update hasNonDefaultViews', async () => {
+    let response = await request(context.app)
+      .get(`/api/v1/db/meta/projects/${project.id}/tables`)
+      .set('xc-auth', context.token)
+      .send({})
+      .expect(200);
+
+    expect(response.body.list[0].meta.hasNonDefaultViews).to.be.false;
+
+    const view = await createView(context, {
+      table,
+      title: 'view1',
+      type: ViewTypes.GRID,
+    });
+
+    await updateTable(context, {
+      table,
+      args: {
+        meta: {},
+      },
+    });
+
+    response = await request(context.app)
+      .get(`/api/v1/db/meta/projects/${project.id}/tables`)
+      .set('xc-auth', context.token)
+      .send({})
+      .expect(200);
+
+    expect(response.body.list[0].meta.hasNonDefaultViews).to.be.true;
+
+    await deleteView(context, { viewId: view.id });
+
+    response = await request(context.app)
+      .get(`/api/v1/db/meta/projects/${project.id}/tables`)
+      .set('xc-auth', context.token)
+      .send({})
+      .expect(200);
+
+    expect(response.body.list[0].meta.hasNonDefaultViews).to.be.false;
+  });
 }
 
 export default async function () {