From fe6f1282e4f5e01ed6b2a1f7eda123f3c6fb17ad Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 18 Aug 2022 17:22:08 +0800
Subject: [PATCH 01/18] refactor(gui-v2): isUIAllowed

---
 .../composables/useUIPermission/index.ts         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useUIPermission/index.ts b/packages/nc-gui-v2/composables/useUIPermission/index.ts
index 9ac28afbe4..48e3caaae6 100644
--- a/packages/nc-gui-v2/composables/useUIPermission/index.ts
+++ b/packages/nc-gui-v2/composables/useUIPermission/index.ts
@@ -7,7 +7,7 @@ export function useUIPermission() {
 
   const projectRoles = useState<Record<string, boolean>>(USER_PROJECT_ROLES, () => ({}))
 
-  const getRoles = (skipPreviewAs = false) => {
+  const baseRoles = computed(() => {
     let userRoles = user.value?.roles || {}
 
     // if string populate key-value paired object
@@ -19,24 +19,24 @@ export function useUIPermission() {
     }
 
     // merge user role and project specific user roles
-    let roles = {
+    const roles = {
       ...userRoles,
       ...projectRoles.value,
     }
 
+    return roles
+  })
+
+  const isUIAllowed = (permission: Permission | string, skipPreviewAs = false) => {
+    let roles = baseRoles.value
     if (previewAs.value && !skipPreviewAs) {
       roles = {
         [previewAs.value]: true,
       }
     }
 
-    return roles
-  }
-
-  const isUIAllowed = (permission: Permission | string, skipPreviewAs = false) => {
-    return Object.entries<boolean>(getRoles(skipPreviewAs)).some(([role, hasRole]) => {
+    return Object.entries<boolean>(roles).some(([role, hasRole]) => {
       const rolePermission = rolePermissions[role as keyof typeof rolePermissions] as '*' | Record<Permission, true>
-
       return hasRole && (rolePermission === '*' || rolePermission?.[permission as Permission])
     })
   }

From b49e7dedb6a9c8e676047c6803cfb6ffdc0abb39 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 18 Aug 2022 17:22:38 +0800
Subject: [PATCH 02/18] fix(gui-v2): add missing share base logic in
 loadProjectRoles

---
 packages/nc-gui-v2/composables/useProject.ts | 32 ++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useProject.ts b/packages/nc-gui-v2/composables/useProject.ts
index 31cf3e2eb7..90e418c622 100644
--- a/packages/nc-gui-v2/composables/useProject.ts
+++ b/packages/nc-gui-v2/composables/useProject.ts
@@ -18,6 +18,14 @@ export function useProject(projectId?: MaybeRef<string>) {
   // todo: refactor path param name and variable name
   const projectType = $computed(() => route.params.projectType as string)
 
+  const projectBaseType = $computed(() => project.value?.bases?.[0]?.type || '')
+  const isMysql = computed(() => ['mysql', 'mysql2'].includes(projectBaseType))
+  const isPg = computed(() => projectBaseType === 'pg')
+  const sqlUi = computed(
+    () => SqlUiFactory.create({ client: projectBaseType }) as Exclude<ReturnType<typeof SqlUiFactory['create']>, typeof OracleUi>,
+  )
+  const isSharedBase = computed(() => projectType === 'base')
+
   async function loadProjectMetaInfo(force?: boolean) {
     if (!projectMetaInfo.value || force) {
       const data = await $api.project.metaGet(project.value.id!, {}, {})
@@ -28,7 +36,17 @@ export function useProject(projectId?: MaybeRef<string>) {
   async function loadProjectRoles() {
     projectRoles.value = {}
 
-    if (project.value.id) {
+    if (isSharedBase.value) {
+      const user = await $api.auth.me(
+        {},
+        {
+          headers: {
+            'xc-shared-base-id': route.params.projectId,
+          },
+        },
+      )
+      projectRoles.value = user.roles
+    } else if (project.value.id) {
       const user = await $api.auth.me({ project_id: project.value.id })
       projectRoles.value = user.roles
     }
@@ -37,8 +55,7 @@ export function useProject(projectId?: MaybeRef<string>) {
   async function loadTables() {
     if (project.value.id) {
       const tablesResponse = await $api.dbTable.list(project.value.id, {
-        // FIXME: type
-        includeM2M: includeM2M.value || '',
+        includeM2M: includeM2M.value,
       })
       if (tablesResponse.list) tables.value = tablesResponse.list
     }
@@ -58,15 +75,6 @@ export function useProject(projectId?: MaybeRef<string>) {
     await loadTables()
   }
 
-  const projectBaseType = $computed(() => project.value?.bases?.[0]?.type || '')
-
-  const isMysql = computed(() => ['mysql', 'mysql2'].includes(projectBaseType))
-  const isPg = computed(() => projectBaseType === 'pg')
-  const sqlUi = computed(
-    () => SqlUiFactory.create({ client: projectBaseType }) as Exclude<ReturnType<typeof SqlUiFactory['create']>, typeof OracleUi>,
-  )
-  const isSharedBase = computed(() => projectType === 'base')
-
   return {
     project,
     tables,

From 9aa8f9e506befeffe0f476c3d02df0a5024b4374 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 18 Aug 2022 17:23:03 +0800
Subject: [PATCH 03/18] fix(gui-v2): add missing isSharedBase

---
 .../nc-gui-v2/components/dashboard/TreeView.vue   |  4 ++--
 .../components/smartsheet-toolbar/ShareView.vue   | 12 +++++++++---
 packages/nc-gui-v2/layouts/base.vue               |  2 +-
 .../[projectType]/[projectId]/index/index.vue     | 15 +++++++++++++--
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index d7999e4251..bb7515d7df 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -202,7 +202,7 @@ const activeTable = computed(() => {
                   <div class="nc-tbl-title flex-1">{{ table.title }}</div>
 
                   <a-dropdown
-                    v-if="!isLocked && (isUIAllowed('table-rename') || isUIAllowed('table-delete'))"
+                    v-if="!isSharedBase && !isLocked && (isUIAllowed('table-rename') || isUIAllowed('table-delete'))"
                     :trigger="['click']"
                     @click.stop
                   >
@@ -244,7 +244,7 @@ const activeTable = computed(() => {
         </div>
       </div>
 
-      <template v-if="!isLocked" #overlay>
+      <template v-if="!isLocked && !isSharedBase" #overlay>
         <a-menu class="cursor-pointer">
           <template v-if="contextMenuTarget.type === 'table'">
             <a-menu-item
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
index a12f810cd5..aebf7a945e 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ShareView.vue
@@ -4,8 +4,7 @@ import { ViewTypes } from 'nocodb-sdk'
 import { computed } from 'vue'
 import { message } from 'ant-design-vue'
 import { useNuxtApp } from '#app'
-import { useSmartsheetStoreOrThrow } from '#imports'
-import { extractSdkResponseErrorMsg } from '~/utils'
+import { extractSdkResponseErrorMsg, useProject, useSmartsheetStoreOrThrow } from '#imports'
 import MdiOpenInNewIcon from '~icons/mdi/open-in-new'
 import MdiCopyIcon from '~icons/mdi/content-copy'
 
@@ -19,6 +18,8 @@ const { dashboardUrl } = useDashboard()
 
 const { isUIAllowed } = useUIPermission()
 
+const { isSharedBase } = useProject()
+
 let showShareModel = $ref(false)
 
 let passwordProtected = $ref(false)
@@ -118,7 +119,12 @@ onMounted(() => {
 
 <template>
   <div>
-    <a-button v-if="isUIAllowed('share-view')" v-t="['c:view:share']" outlined class="nc-btn-share-view nc-toolbar-btn">
+    <a-button
+      v-if="isUIAllowed('share-view') && !isSharedBase"
+      v-t="['c:view:share']"
+      outlined
+      class="nc-btn-share-view nc-toolbar-btn"
+    >
       <div class="flex align-center gap-1" @click="genShareLink">
         <MdiOpenInNewIcon />
         <!-- Share View -->
diff --git a/packages/nc-gui-v2/layouts/base.vue b/packages/nc-gui-v2/layouts/base.vue
index d46b05c9bd..d76792da90 100644
--- a/packages/nc-gui-v2/layouts/base.vue
+++ b/packages/nc-gui-v2/layouts/base.vue
@@ -48,7 +48,7 @@ const logout = () => {
 
           <GeneralReleaseInfo />
 
-          <GeneralShareBaseButton />
+          <GeneralShareBaseButton v-if="!isSharedBase" />
 
           <a-tooltip placement="bottom">
             <template #title> Switch language</template>
diff --git a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
index 693549d18b..c726f9afad 100644
--- a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { TabItem } from '~/composables'
 import { TabType } from '~/composables'
-import { TabMetaInj, useTabs, useUIPermission } from '#imports'
+import { TabMetaInj, useProject, useTabs, useUIPermission } from '#imports'
 import MdiAirTableIcon from '~icons/mdi/table-large'
 import MdiView from '~icons/mdi/eye-circle-outline'
 import MdiAccountGroup from '~icons/mdi/account-group'
@@ -10,10 +10,16 @@ const { tabs, activeTabIndex, activeTab, closeTab } = useTabs()
 
 const { isUIAllowed } = useUIPermission()
 
+const { isSharedBase } = useProject()
+
 const tableCreateDialog = ref(false)
+
 const airtableImportDialog = ref(false)
+
 const quickImportDialog = ref(false)
+
 const importType = ref('')
+
 const currentMenu = ref<string[]>(['addORImport'])
 
 provide(TabMetaInj, activeTab)
@@ -50,7 +56,12 @@ const icon = (tab: TabItem) => {
           </a-tab-pane>
 
           <template #leftExtra>
-            <a-menu v-if="isUIAllowed('addOrImport')" v-model:selectedKeys="currentMenu" class="border-0" mode="horizontal">
+            <a-menu
+              v-if="isUIAllowed('addOrImport') && !isSharedBase"
+              v-model:selectedKeys="currentMenu"
+              class="border-0"
+              mode="horizontal"
+            >
               <a-sub-menu key="addORImport">
                 <template #title>
                   <div class="text-sm flex items-center gap-2 pt-[8px] pb-3">

From 084bd671b3036ff8c2021e74d5dd4ff5eda0b2a4 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 18 Aug 2022 17:23:22 +0800
Subject: [PATCH 04/18] chore(gui-v2): SharedViewList -> sharedViewList

---
 .../nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
index c8e43546d8..93331df01e 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
+++ b/packages/nc-gui-v2/components/smartsheet-toolbar/MoreActions.vue
@@ -130,7 +130,7 @@ const exportFile = async (exportType: ExportTypes) => {
             </div>
 
             <div
-              v-if="isUIAllowed('SharedViewList') && !isView && !isPublicView"
+              v-if="isUIAllowed('sharedViewList') && !isView && !isPublicView"
               v-t="['a:actions:shared-view-list']"
               class="nc-menu-item"
               @click="sharedViewListDlg = true"
@@ -139,7 +139,6 @@ const exportFile = async (exportType: ExportTypes) => {
               <!-- Shared View List -->
               {{ $t('activity.listSharedView') }}
             </div>
-
             <div
               v-if="isUIAllowed('webhook') && !isView && !isPublicView"
               v-t="['c:actions:webhook']"

From 4139e2da81e3c7086201b3535796950c18bb008f Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 18 Aug 2022 17:35:52 +0800
Subject: [PATCH 05/18] fix(gui-v2): add missing
 isUIAllowed('xcDatatableEditable') & i18n

---
 .../nc-gui-v2/components/smartsheet/Grid.vue  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui-v2/components/smartsheet/Grid.vue b/packages/nc-gui-v2/components/smartsheet/Grid.vue
index a496f32207..4ec5f4d171 100644
--- a/packages/nc-gui-v2/components/smartsheet/Grid.vue
+++ b/packages/nc-gui-v2/components/smartsheet/Grid.vue
@@ -479,17 +479,28 @@ const expandForm = (row: Row, state: Record<string, any>) => {
             </tr>
           </tbody>
         </table>
-        <template v-if="!isLocked" #overlay>
+        <template v-if="!isLocked && isUIAllowed('xcDatatableEditable')" #overlay>
           <a-menu class="bg-white shadow" @click="contextMenu = false">
             <a-menu-item v-if="contextMenuTarget" @click="deleteRow(contextMenuTarget.row)"
-              ><span class="text-xs">Delete row</span></a-menu-item
+              ><span class="text-xs">
+                <!-- Delete Row -->
+                {{ $t('activity.deleteRow') }}
+              </span></a-menu-item
+            >
+            <a-menu-item @click="deleteSelectedRows"
+              ><span class="text-xs">
+                <!-- Delete Selected Rows -->
+                {{ $t('activity.deleteSelectedRow') }}
+              </span></a-menu-item
             >
-            <a-menu-item @click="deleteSelectedRows"><span class="text-xs">Delete all selected rows</span></a-menu-item>
             <a-menu-item v-if="contextMenuTarget" @click="clearCell(contextMenuTarget)"
               ><span class="text-xs">Clear cell</span>
             </a-menu-item>
             <a-menu-item v-if="contextMenuTarget" @click="addEmptyRow(contextMenuTarget.row + 1)">
-              <span class="text-xs">Insert new row</span>
+              <span class="text-xs">
+                <!-- Insert New Row -->
+                {{ $t('activity.insertRow') }}
+              </span>
             </a-menu-item>
           </a-menu>
         </template>

From b4ba3315c981af22f0c09005c33cc8a5f13d6f87 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 18 Aug 2022 17:53:24 +0800
Subject: [PATCH 06/18] fix(gui-v2): add missing isSharedBase on LTAR cells

---
 .../components/virtual-cell/BelongsTo.vue         |  7 +++++--
 .../nc-gui-v2/components/virtual-cell/HasMany.vue |  9 ++++++---
 .../components/virtual-cell/ManyToMany.vue        |  9 ++++++---
 .../virtual-cell/components/ItemChip.vue          | 15 +++++++++++++--
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue b/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
index b9da198501..7d838ea275 100644
--- a/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
@@ -11,6 +11,7 @@ import {
   defineAsyncComponent,
   inject,
   ref,
+  useProject,
   useProvideLTARStore,
   useSmartsheetRowStoreOrThrow,
 } from '#imports'
@@ -31,10 +32,12 @@ const row = inject(RowInj)!
 
 const active = inject(ActiveCellInj)!
 
-const readonly = inject(ReadonlyInj, false)
+const readOnly = inject(ReadonlyInj, false)
 
 const isLocked = inject(IsLockedInj)
 
+const { isSharedBase } = useProject()
+
 const listItemsDlg = ref(false)
 
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
@@ -74,7 +77,7 @@ const unlinkRef = async (rec: Record<string, any>) => {
         <ItemChip :item="value" :value="value[relatedTablePrimaryValueProp]" @unlink="unlinkRef(value)" />
       </template>
     </div>
-    <div v-if="!readonly || !isLocked" class="flex-1 flex justify-end gap-1 min-h-[30px] align-center">
+    <div v-if="!readOnly && !isLocked && !isSharedBase" class="flex-1 flex justify-end gap-1 min-h-[30px] align-center">
       <component
         :is="addIcon"
         class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 select-none group-hover:(text-gray-500) nc-plus"
diff --git a/packages/nc-gui-v2/components/virtual-cell/HasMany.vue b/packages/nc-gui-v2/components/virtual-cell/HasMany.vue
index 7710c7e4e2..e171856528 100644
--- a/packages/nc-gui-v2/components/virtual-cell/HasMany.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/HasMany.vue
@@ -13,6 +13,7 @@ import {
   defineAsyncComponent,
   inject,
   ref,
+  useProject,
   useProvideLTARStore,
   useSmartsheetRowStoreOrThrow,
 } from '#imports'
@@ -33,7 +34,7 @@ const reloadTrigger = inject(ReloadViewDataHookInj)!
 
 const isForm = inject(IsFormInj)
 
-const readonly = inject(ReadonlyInj, false)
+const readOnly = inject(ReadonlyInj, false)
 
 const isLocked = inject(IsLockedInj)
 
@@ -41,6 +42,8 @@ const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
 
+const { isSharedBase } = useProject()
+
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
 const { loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore(
   column as Ref<Required<ColumnType>>,
@@ -91,13 +94,13 @@ const unlinkRef = async (rec: Record<string, any>) => {
           </span>
         </template>
       </div>
-      <div v-if="!isLocked" class="flex-grow flex justify-end gap-1 min-h-[30px] align-center">
+      <div v-if="!isLocked && !isSharedBase" class="flex-grow flex justify-end gap-1 min-h-[30px] align-center">
         <MdiArrowExpand
           class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
           @click="childListDlg = true"
         />
         <MdiPlus
-          v-if="!readonly"
+          v-if="!readOnly"
           class="select-none text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
           @click="listItemsDlg = true"
         />
diff --git a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
index ea5ec4a5eb..b382250417 100644
--- a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
@@ -12,6 +12,7 @@ import {
   computed,
   inject,
   ref,
+  useProject,
   useProvideLTARStore,
   useSmartsheetRowStoreOrThrow,
 } from '#imports'
@@ -32,7 +33,7 @@ const reloadTrigger = inject(ReloadViewDataHookInj)!
 
 const isForm = inject(IsFormInj)
 
-const readonly = inject(ReadonlyInj, false)
+const readOnly = inject(ReadonlyInj, false)
 
 const isLocked = inject(IsLockedInj)
 
@@ -40,6 +41,8 @@ const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
 
+const { isSharedBase } = useProject()
+
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
 const { loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore(
   column as Ref<Required<ColumnType>>,
@@ -91,14 +94,14 @@ const unlinkRef = async (rec: Record<string, any>) => {
         </template>
       </div>
 
-      <div v-if="!isLocked" class="flex-1 flex justify-end gap-1 min-h-[30px] align-center">
+      <div v-if="!isLocked && !isSharedBase" class="flex-1 flex justify-end gap-1 min-h-[30px] align-center">
         <MdiArrowExpand
           class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
           @click="childListDlg = true"
         />
 
         <MdiPlus
-          v-if="!readonly"
+          v-if="!readOnly"
           class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-plus"
           @click="listItemsDlg = true"
         />
diff --git a/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue b/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
index a98f18b660..ff80046c16 100644
--- a/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
@@ -1,5 +1,14 @@
 <script lang="ts" setup>
-import { ActiveCellInj, IsFormInj, ReadonlyInj, defineAsyncComponent, inject, ref, useLTARStoreOrThrow } from '#imports'
+import {
+  ActiveCellInj,
+  IsFormInj,
+  ReadonlyInj,
+  defineAsyncComponent,
+  inject,
+  ref,
+  useLTARStoreOrThrow,
+  useProject,
+} from '#imports'
 
 interface Props {
   value?: string | number | boolean
@@ -14,6 +23,8 @@ const ExpandedForm: any = defineAsyncComponent(() => import('../../smartsheet/ex
 
 const { relatedTableMeta } = useLTARStoreOrThrow()!
 
+const { isSharedBase } = useProject()
+
 const readonly = inject(ReadonlyInj, false)
 
 const active = inject(ActiveCellInj, ref(false))
@@ -45,7 +56,7 @@ export default {
 
     <Suspense>
       <ExpandedForm
-        v-if="!readonly && !isLocked && expandedFormDlg"
+        v-if="!readonly && !isLocked && expandedFormDlg && !isSharedBase"
         v-model="expandedFormDlg"
         :row="{ row: item }"
         :meta="relatedTableMeta"

From 49a488494c6d9847e288167f56c8eabe826d8fef Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 11:09:03 +0800
Subject: [PATCH 07/18] fix(gui-v2): use isUIAllowed('xcDatatableEditable')
 instead of isSharedBase

---
 .../nc-gui-v2/components/virtual-cell/BelongsTo.vue    | 10 +++++++---
 packages/nc-gui-v2/components/virtual-cell/HasMany.vue | 10 +++++++---
 .../nc-gui-v2/components/virtual-cell/ManyToMany.vue   |  6 +++---
 .../components/virtual-cell/components/ItemChip.vue    | 10 +++++-----
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue b/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
index 7d838ea275..dd24632af5 100644
--- a/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/BelongsTo.vue
@@ -11,9 +11,9 @@ import {
   defineAsyncComponent,
   inject,
   ref,
-  useProject,
   useProvideLTARStore,
   useSmartsheetRowStoreOrThrow,
+  useUIPermission,
 } from '#imports'
 import MdiArrowExpand from '~icons/mdi/arrow-expand'
 import MdiPlus from '~icons/mdi/plus'
@@ -36,11 +36,12 @@ const readOnly = inject(ReadonlyInj, false)
 
 const isLocked = inject(IsLockedInj)
 
-const { isSharedBase } = useProject()
+const { isUIAllowed } = useUIPermission()
 
 const listItemsDlg = ref(false)
 
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
+
 const { loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore(
   column as Ref<Required<ColumnType>>,
   row,
@@ -77,7 +78,10 @@ const unlinkRef = async (rec: Record<string, any>) => {
         <ItemChip :item="value" :value="value[relatedTablePrimaryValueProp]" @unlink="unlinkRef(value)" />
       </template>
     </div>
-    <div v-if="!readOnly && !isLocked && !isSharedBase" class="flex-1 flex justify-end gap-1 min-h-[30px] align-center">
+    <div
+      v-if="!readOnly && !isLocked && isUIAllowed('xcDatatableEditable')"
+      class="flex-1 flex justify-end gap-1 min-h-[30px] align-center"
+    >
       <component
         :is="addIcon"
         class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 select-none group-hover:(text-gray-500) nc-plus"
diff --git a/packages/nc-gui-v2/components/virtual-cell/HasMany.vue b/packages/nc-gui-v2/components/virtual-cell/HasMany.vue
index e171856528..b766ca2135 100644
--- a/packages/nc-gui-v2/components/virtual-cell/HasMany.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/HasMany.vue
@@ -13,9 +13,9 @@ import {
   defineAsyncComponent,
   inject,
   ref,
-  useProject,
   useProvideLTARStore,
   useSmartsheetRowStoreOrThrow,
+  useUIPermission,
 } from '#imports'
 
 const ItemChip = defineAsyncComponent(() => import('./components/ItemChip.vue'))
@@ -42,9 +42,10 @@ const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
 
-const { isSharedBase } = useProject()
+const { isUIAllowed } = useUIPermission()
 
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
+
 const { loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore(
   column as Ref<Required<ColumnType>>,
   row,
@@ -94,7 +95,10 @@ const unlinkRef = async (rec: Record<string, any>) => {
           </span>
         </template>
       </div>
-      <div v-if="!isLocked && !isSharedBase" class="flex-grow flex justify-end gap-1 min-h-[30px] align-center">
+      <div
+        v-if="!isLocked && isUIAllowed('xcDatatableEditable')"
+        class="flex-grow flex justify-end gap-1 min-h-[30px] align-center"
+      >
         <MdiArrowExpand
           class="select-none transform text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
           @click="childListDlg = true"
diff --git a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
index b382250417..aa72c68914 100644
--- a/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/ManyToMany.vue
@@ -12,9 +12,9 @@ import {
   computed,
   inject,
   ref,
-  useProject,
   useProvideLTARStore,
   useSmartsheetRowStoreOrThrow,
+  useUIPermission,
 } from '#imports'
 
 const ItemChip = defineAsyncComponent(() => import('./components/ItemChip.vue'))
@@ -41,7 +41,7 @@ const listItemsDlg = ref(false)
 
 const childListDlg = ref(false)
 
-const { isSharedBase } = useProject()
+const { isUIAllowed } = useUIPermission()
 
 const { state, isNew, removeLTARRef } = useSmartsheetRowStoreOrThrow()
 const { loadRelatedTableMeta, relatedTablePrimaryValueProp, unlink } = useProvideLTARStore(
@@ -94,7 +94,7 @@ const unlinkRef = async (rec: Record<string, any>) => {
         </template>
       </div>
 
-      <div v-if="!isLocked && !isSharedBase" class="flex-1 flex justify-end gap-1 min-h-[30px] align-center">
+      <div v-if="!isLocked && isUIAllowed('xcDatatableEditable')" class="flex-1 flex justify-end gap-1 min-h-[30px] align-center">
         <MdiArrowExpand
           class="text-sm nc-action-icon text-gray-500/50 hover:text-gray-500 nc-arrow-expand"
           @click="childListDlg = true"
diff --git a/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue b/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
index ff80046c16..f200f21547 100644
--- a/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
+++ b/packages/nc-gui-v2/components/virtual-cell/components/ItemChip.vue
@@ -7,7 +7,7 @@ import {
   inject,
   ref,
   useLTARStoreOrThrow,
-  useProject,
+  useUIPermission,
 } from '#imports'
 
 interface Props {
@@ -23,9 +23,9 @@ const ExpandedForm: any = defineAsyncComponent(() => import('../../smartsheet/ex
 
 const { relatedTableMeta } = useLTARStoreOrThrow()!
 
-const { isSharedBase } = useProject()
+const { isUIAllowed } = useUIPermission()
 
-const readonly = inject(ReadonlyInj, false)
+const readOnly = inject(ReadonlyInj, false)
 
 const active = inject(ActiveCellInj, ref(false))
 
@@ -50,13 +50,13 @@ export default {
   >
     <span class="name">{{ value }}</span>
 
-    <div v-show="active || isForm" v-if="!readonly && !isLocked" class="flex align-center">
+    <div v-show="active || isForm" v-if="!readOnly && !isLocked && isUIAllowed('xcDatatableEditable')" class="flex align-center">
       <MdiCloseThick class="unlink-icon text-xs text-gray-500/50 group-hover:text-gray-500" @click.stop="emit('unlink')" />
     </div>
 
     <Suspense>
       <ExpandedForm
-        v-if="!readonly && !isLocked && expandedFormDlg && !isSharedBase"
+        v-if="!readOnly && !isLocked && expandedFormDlg"
         v-model="expandedFormDlg"
         :row="{ row: item }"
         :meta="relatedTableMeta"

From 3d6bb72f175b7d6b4e99e5e8c868905486f83718 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 12:10:03 +0800
Subject: [PATCH 08/18] fix(gui-v2): fields for share base

---
 packages/nc-gui-v2/composables/useViewColumns.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts
index 45e7df3f53..81851548c7 100644
--- a/packages/nc-gui-v2/composables/useViewColumns.ts
+++ b/packages/nc-gui-v2/composables/useViewColumns.ts
@@ -8,6 +8,7 @@ import type { Field } from '~/lib'
 
 export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRef<TableType>, reloadData?: () => void) {
   const isPublic = inject(IsPublicInj, ref(false))
+
   const fields = ref<Field[]>()
 
   const filterQuery = ref('')
@@ -16,10 +17,13 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
 
   const { isUIAllowed } = useUIPermission()
 
+  const { isSharedBase } = useProject()
+
   const loadViewColumns = async () => {
     if (!meta || !view) return
 
     let order = 1
+
     if (view.value?.id) {
       const data = (isPublic.value ? meta.value?.columns : await $api.dbViewColumn.list(view.value.id)) as any[]
 
@@ -48,7 +52,7 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
   }
 
   const showAll = async (ignoreIds?: any) => {
-    if (isPublic.value) {
+    if (isPublic.value || isSharedBase) {
       fields.value = fields.value?.map((field: Field) => ({
         ...field,
         show: true,
@@ -71,7 +75,7 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
     reloadData?.()
   }
   const hideAll = async (ignoreIds?: any) => {
-    if (isPublic.value) {
+    if (isPublic.value || isSharedBase) {
       fields.value = fields.value?.map((field: Field) => ({
         ...field,
         show: false,
@@ -94,7 +98,7 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
   }
 
   const saveOrUpdate = async (field: any, index: number) => {
-    if (isPublic.value && fields.value) {
+    if ((isPublic.value || isSharedBase) && fields.value) {
       fields.value[index] = field
       meta.value.columns = meta.value?.columns?.map((column: ColumnType) => {
         if (column.id === field.fk_column_id) {
@@ -140,7 +144,7 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
     },
     set(v: boolean) {
       if (view?.value?.id) {
-        if (!isPublic.value) {
+        if (!isPublic.value && !isSharedBase) {
           $api.dbView
             .update(view.value.id, {
               show_system_fields: v,

From be1802e52c3e7575a3f3fe62e2b1bd5dda2a6180 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 12:10:09 +0800
Subject: [PATCH 09/18] fix(gui-v2): filter for share base

---
 packages/nc-gui-v2/composables/useViewFilters.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/composables/useViewFilters.ts b/packages/nc-gui-v2/composables/useViewFilters.ts
index 8a7f27cb86..2fc0f5de38 100644
--- a/packages/nc-gui-v2/composables/useViewFilters.ts
+++ b/packages/nc-gui-v2/composables/useViewFilters.ts
@@ -29,6 +29,8 @@ export function useViewFilters(
 
   const isPublic = inject(IsPublicInj, ref(false))
 
+  const { isSharedBase } = useProject()
+
   const { $api } = useNuxtApp()
 
   const { isUIAllowed } = useUIPermission()
@@ -60,7 +62,7 @@ export function useViewFilters(
   }
 
   const loadFilters = async (hookId?: string) => {
-    if (isPublic.value) return
+    if (isPublic.value || isSharedBase) return
 
     if (hookId) {
       if (parentId) {

From ec25499f7c14c5168de5eb5b29147a85aca0ed88 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 12:11:31 +0800
Subject: [PATCH 10/18] fix(gui-v2): sort for share base

---
 packages/nc-gui-v2/composables/useViewSorts.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useViewSorts.ts b/packages/nc-gui-v2/composables/useViewSorts.ts
index b6a3fa6bc0..e343fd14f2 100644
--- a/packages/nc-gui-v2/composables/useViewSorts.ts
+++ b/packages/nc-gui-v2/composables/useViewSorts.ts
@@ -7,11 +7,15 @@ export function useViewSorts(
   reloadData?: () => void,
 ) {
   const _sorts = ref<SortType[]>([])
+
   const { sorts: sharedViewSorts, sharedView } = useSharedView()
 
   const reloadHook = inject(ReloadViewDataHookInj)
+
   const isPublic = inject(IsPublicInj, ref(false))
 
+  const { isSharedBase } = useProject()
+
   const sorts = computed<SortType[]>({
     get: () => (isPublic.value ? sharedViewSorts.value : _sorts.value),
     set: (value) => {
@@ -39,9 +43,8 @@ export function useViewSorts(
   }
 
   const saveOrUpdate = async (sort: SortType, i: number) => {
-    // TODO:
-    // if (!this.shared && this._isUIAllowed('sortSync')) {
-    if (isPublic.value) {
+    if (isPublic.value || isSharedBase) {
+      // FIXME: not working for isSharedBase case
       sorts.value[i] = sort
       sorts.value = [...sorts.value]
       return
@@ -66,10 +69,7 @@ export function useViewSorts(
   }
 
   const deleteSort = async (sort: SortType, i: number) => {
-    // TOOD:
-    // if (!this.shared && sort.id && this._isUIAllowed('sortSync')) {
-
-    if (isUIAllowed('sortSync') && sort.id && !isPublic.value) {
+    if (isUIAllowed('sortSync') && sort.id && !isPublic.value && !isSharedBase) {
       await $api.dbTableSort.delete(sort.id)
     }
     sorts.value.splice(i, 1)

From bb2b876a4dc0c5c3f4f40817a252090a866b9bc6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 12:23:26 +0800
Subject: [PATCH 11/18] fix(gui-v2): disable project index for share base

---
 .../[projectId]/index/index/index.vue         | 47 +++++++++++--------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue
index d6624356c8..702f090510 100644
--- a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue
+++ b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index/index.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { UploadChangeParam, UploadFile } from 'ant-design-vue'
 import { message } from 'ant-design-vue'
-import { ref, useDialog, useDropZone, useFileDialog, useNuxtApp, watch } from '#imports'
+import { ref, useDialog, useDropZone, useFileDialog, useNuxtApp, useProject, watch } from '#imports'
 import DlgQuickImport from '~/components/dlg/QuickImport.vue'
 
 const dropZone = ref<HTMLDivElement>()
@@ -10,6 +10,8 @@ const { isOverDropZone } = useDropZone(dropZone, onDrop)
 
 const { files, open, reset } = useFileDialog()
 
+const { isSharedBase } = useProject()
+
 const { $e } = useNuxtApp()
 
 type QuickImportTypes = 'excel' | 'json' | 'csv'
@@ -106,26 +108,31 @@ function openQuickImportDialog(type: QuickImportTypes, file: File) {
 </script>
 
 <template>
-  <div ref="dropZone" class="h-full w-full text-gray-600 flex items-center justify-center relative">
-    <general-overlay
-      :model-value="true"
-      :class="[isOverDropZone ? 'bg-gray-300/75 border-primary shadow' : 'bg-gray-100/25 border-gray-500 cursor-pointer']"
-      inline
-      style="top: 20%; left: 20%; right: 20%; bottom: 20%"
-      class="text-3xl flex items-center justify-center gap-2 border-1 border-dashed rounded hover:border-primary"
-      @click="open"
-    >
-      <template v-if="isOverDropZone"> <MaterialSymbolsFileCopyOutline class="text-pink-500" /> Drop here </template>
-    </general-overlay>
-
-    <div class="flex flex-col gap-6 items-center justify-center md:w-1/2 mx-auto text-center">
+  <div class="h-full w-full text-gray-600 flex items-center justify-center relative">
+    <div v-if="isSharedBase" class="flex flex-col gap-6 items-center justify-center mx-auto text-center">
       <div class="text-3xl">Welcome to NocoDB!</div>
-
-      <div class="flex items-center flex-wrap justify-center gap-2 prose-lg leading-8">
-        To get started, either drop a <span class="flex items-center gap-2"><PhFileCsv /> CSV</span>,
-        <span class="flex items-center gap-2"><BiFiletypeJson /> JSON</span> or
-        <span class="flex items-center gap-2"><BiFiletypeXlsx /> Excel</span> file here or click the button in the top-left of
-        this page.
+    </div>
+    <div v-else ref="dropZone">
+      <general-overlay
+        :model-value="true"
+        :class="[isOverDropZone ? 'bg-gray-300/75 border-primary shadow' : 'bg-gray-100/25 border-gray-500 cursor-pointer']"
+        inline
+        style="top: 20%; left: 20%; right: 20%; bottom: 20%"
+        class="text-3xl flex items-center justify-center gap-2 border-1 border-dashed rounded hover:border-primary"
+        @click="open"
+      >
+        <template v-if="isOverDropZone"> <MaterialSymbolsFileCopyOutline class="text-pink-500" /> Drop here </template>
+      </general-overlay>
+
+      <div class="flex flex-col gap-6 items-center justify-center md:w-1/2 mx-auto text-center">
+        <div class="text-3xl">Welcome to NocoDB!</div>
+
+        <div class="flex items-center flex-wrap justify-center gap-2 prose-lg leading-8">
+          To get started, either drop a <span class="flex items-center gap-2"><PhFileCsv /> CSV</span>,
+          <span class="flex items-center gap-2"><BiFiletypeJson /> JSON</span> or
+          <span class="flex items-center gap-2"><BiFiletypeXlsx /> Excel</span> file here or click the button in the top-left of
+          this page.
+        </div>
       </div>
     </div>
   </div>

From 8c0113989d0b240962c5722ed39607598c98e8c6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 15:22:38 +0800
Subject: [PATCH 12/18] fix(gui-v2): sorting / filtering in share base

---
 packages/nc-gui-v2/composables/useViewData.ts  | 6 +++++-
 packages/nc-gui-v2/composables/useViewSorts.ts | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useViewData.ts b/packages/nc-gui-v2/composables/useViewData.ts
index 70eac6ceda..85768d91eb 100644
--- a/packages/nc-gui-v2/composables/useViewData.ts
+++ b/packages/nc-gui-v2/composables/useViewData.ts
@@ -2,7 +2,7 @@ import type { Api, ColumnType, FormType, GalleryType, PaginatedType, TableType,
 import type { ComputedRef, Ref } from 'vue'
 import { message } from 'ant-design-vue'
 import { useNuxtApp } from '#app'
-import { IsPublicInj, NOCO, extractPkFromRow, extractSdkResponseErrorMsg, useProject } from '#imports'
+import { IsPublicInj, NOCO, extractPkFromRow, extractSdkResponseErrorMsg, useProject, useUIPermission } from '#imports'
 
 const formatData = (list: Record<string, any>[]) =>
   list.map((row) => ({
@@ -42,6 +42,8 @@ export function useViewData(
   const { project } = useProject()
   const { fetchSharedViewData, paginationData: sharedPaginationData } = useSharedView()
   const { $api } = useNuxtApp()
+  const { sorts, nestedFilters: filters } = useSharedView()
+  const { isUIAllowed } = useUIPermission()
 
   const paginationData = computed({
     get: () => (isPublic.value ? sharedPaginationData.value : _paginationData.value),
@@ -109,6 +111,8 @@ export function useViewData(
     const response = !isPublic.value
       ? await $api.dbViewRow.list('noco', project.value.id!, meta.value.id!, viewMeta!.value.id, {
           ...params,
+          ...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
+          ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(filters.value) }),
           where: where?.value,
         })
       : await fetchSharedViewData()
diff --git a/packages/nc-gui-v2/composables/useViewSorts.ts b/packages/nc-gui-v2/composables/useViewSorts.ts
index e343fd14f2..82a918d222 100644
--- a/packages/nc-gui-v2/composables/useViewSorts.ts
+++ b/packages/nc-gui-v2/composables/useViewSorts.ts
@@ -17,9 +17,9 @@ export function useViewSorts(
   const { isSharedBase } = useProject()
 
   const sorts = computed<SortType[]>({
-    get: () => (isPublic.value ? sharedViewSorts.value : _sorts.value),
+    get: () => (isPublic.value || isSharedBase ? sharedViewSorts.value : _sorts.value),
     set: (value) => {
-      if (isPublic.value) {
+      if (isPublic.value || isSharedBase) {
         sharedViewSorts.value = value
       } else {
         _sorts.value = value

From e9c64919d340a02675b803f2bcc796fee541a58e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 15:36:10 +0800
Subject: [PATCH 13/18] fix(gui-v2): hide 3 dots in share base in treeview

---
 packages/nc-gui-v2/components/dashboard/TreeView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue
index 59db893d27..62f051e60c 100644
--- a/packages/nc-gui-v2/components/dashboard/TreeView.vue
+++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue
@@ -215,7 +215,7 @@ function openTableCreateDialog() {
           >
             <MdiPlus />
             <span class="text-gray-500 group-hover:(text-primary/100) flex-1">{{ $t('tooltip.addTable') }}</span>
-            <a-dropdown :trigger="['click']" @click.stop>
+            <a-dropdown v-if="!isSharedBase" :trigger="['click']" @click.stop>
               <MdiDotsVertical class="transition-opacity opacity-0 group-hover:opacity-100" />
               <template #overlay>
                 <a-menu class="nc-add-project-menu !py-0 ml-6 rounded text-sm">

From 96d4fd132890a30d3abef35c6fc6a0d8d941c6a6 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 16:08:45 +0800
Subject: [PATCH 14/18] fix: add missing filterList for viewers

---
 packages/nocodb/src/lib/utils/projectAcl.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/utils/projectAcl.ts b/packages/nocodb/src/lib/utils/projectAcl.ts
index a3482a7137..cf0b1f91b8 100644
--- a/packages/nocodb/src/lib/utils/projectAcl.ts
+++ b/packages/nocodb/src/lib/utils/projectAcl.ts
@@ -211,6 +211,7 @@ export default {
 
     // sort & filter
     sortList: true,
+    filterList: true,
     projectInfoGet: true,
 
     galleryViewGet: true,
@@ -240,7 +241,7 @@ export default {
     indexList: true,
     list: true,
     xcExportAsCsv: true,
-    dataCount: true,
+    dataCount: true
   },
   user_new: {
     passwordChange: true,

From 342dab4679652c007ef12b2c6e0ddb5bb961ac4d Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 16:09:07 +0800
Subject: [PATCH 15/18] fix(gui-v2): allow public view & share base view to
 read filters

---
 packages/nc-gui-v2/composables/useViewFilters.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useViewFilters.ts b/packages/nc-gui-v2/composables/useViewFilters.ts
index 2fc0f5de38..ae594163a2 100644
--- a/packages/nc-gui-v2/composables/useViewFilters.ts
+++ b/packages/nc-gui-v2/composables/useViewFilters.ts
@@ -62,8 +62,6 @@ export function useViewFilters(
   }
 
   const loadFilters = async (hookId?: string) => {
-    if (isPublic.value || isSharedBase) return
-
     if (hookId) {
       if (parentId) {
         filters.value = await $api.dbTableFilter.childrenRead(parentId)

From ea5d6026a16d2f35bc2faa1a6a516a1b4c06a689 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 17:51:30 +0800
Subject: [PATCH 16/18] chore(gui-v2): lint

---
 packages/nc-gui-v2/composables/useViewFilters.ts                | 2 --
 .../nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/nc-gui-v2/composables/useViewFilters.ts b/packages/nc-gui-v2/composables/useViewFilters.ts
index ae594163a2..9e55c5b579 100644
--- a/packages/nc-gui-v2/composables/useViewFilters.ts
+++ b/packages/nc-gui-v2/composables/useViewFilters.ts
@@ -29,8 +29,6 @@ export function useViewFilters(
 
   const isPublic = inject(IsPublicInj, ref(false))
 
-  const { isSharedBase } = useProject()
-
   const { $api } = useNuxtApp()
 
   const { isUIAllowed } = useUIPermission()
diff --git a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
index cb307fc342..c8e8805a4f 100644
--- a/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
+++ b/packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue
@@ -116,4 +116,4 @@ const { isOpen, toggle } = useSidebar()
 :deep(.ant-menu-submenu::after) {
   @apply !border-none;
 }
-</style>
\ No newline at end of file
+</style>

From 4ad939d21eec0846f2555110e02140017c3b8a1a Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 18:07:55 +0800
Subject: [PATCH 17/18] chore(gui-v2): remove FIXME comment

---
 packages/nc-gui-v2/composables/useViewSorts.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui-v2/composables/useViewSorts.ts b/packages/nc-gui-v2/composables/useViewSorts.ts
index 82a918d222..f9772fdc9d 100644
--- a/packages/nc-gui-v2/composables/useViewSorts.ts
+++ b/packages/nc-gui-v2/composables/useViewSorts.ts
@@ -44,7 +44,6 @@ export function useViewSorts(
 
   const saveOrUpdate = async (sort: SortType, i: number) => {
     if (isPublic.value || isSharedBase) {
-      // FIXME: not working for isSharedBase case
       sorts.value[i] = sort
       sorts.value = [...sorts.value]
       return

From 387b7682c015ead52d1da7fd470f9ab29f1c2800 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 19 Aug 2022 18:08:19 +0800
Subject: [PATCH 18/18] fix(gui-v2): missing column after reordering issue

---
 packages/nc-gui-v2/composables/useViewColumns.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/composables/useViewColumns.ts b/packages/nc-gui-v2/composables/useViewColumns.ts
index 81851548c7..fe5f718de6 100644
--- a/packages/nc-gui-v2/composables/useViewColumns.ts
+++ b/packages/nc-gui-v2/composables/useViewColumns.ts
@@ -98,7 +98,7 @@ export function useViewColumns(view: Ref<ViewType> | undefined, meta: ComputedRe
   }
 
   const saveOrUpdate = async (field: any, index: number) => {
-    if ((isPublic.value || isSharedBase) && fields.value) {
+    if (isPublic.value && fields.value) {
       fields.value[index] = field
       meta.value.columns = meta.value?.columns?.map((column: ColumnType) => {
         if (column.id === field.fk_column_id) {