From 053aeada32a1d51e2fdaa7b7badccba27dc6cc67 Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Fri, 1 Sep 2023 14:50:15 +0530
Subject: [PATCH 01/23] fix(nc-gui): expand icon visible only on click

---
 packages/nc-gui/components/cell/TextArea.vue  | 30 ++++++++++---------
 .../components/cell/attachment/index.vue      | 16 ++++++----
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 81782d1bd7..fd6250da82 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { VNodeRef } from '@vue/runtime-core'
-import { EditModeInj, IsExpandedFormOpenInj, RowHeightInj, inject, useVModel } from '#imports'
+import { EditModeInj, IsExpandedFormOpenInj, RowHeightInj, inject, useVModel, iconMap, ActiveCellInj } from '#imports'
 
 const props = defineProps<{
   modelValue?: string | number
@@ -32,6 +32,8 @@ const isVisible = ref(false)
 const inputWrapperRef = ref<HTMLElement | null>(null)
 const inputRef = ref<HTMLTextAreaElement | null>(null)
 
+const active = inject(ActiveCellInj, ref(false))
+
 watch(isVisible, () => {
   if (isVisible.value) {
     setTimeout(() => {
@@ -86,21 +88,21 @@ onClickOutside(inputWrapperRef, (e) => {
 
       <span v-else>{{ vModel }}</span>
 
-      <NcButton
-        class="!absolute right-0 bottom-0 nc-long-text-toggle-expand !duration-0"
-        :class="{
-          'top-1': rowHeight !== 1,
-          'mt-2': editEnabled,
-          'top-0.15': rowHeight === 1,
-          '!hidden': isExpandedFormOpen,
-        }"
-        type="text"
-        size="xsmall"
+      <div
+        v-if="active"
+        class="!absolute right-0 h-5 w-5 group cursor-pointer py-1 flex justify-center gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+        :class="{'right-2 bottom-2':editEnabled}"
+        data-testid="attachment-cell-file-picker-button"
         @click.stop="isVisible = !isVisible"
       >
-        <GeneralIcon v-if="isVisible" icon="shrink" class="nc-long-text-toggle-expand h-3.75 w-3.75 !text-xs" />
-        <GeneralIcon v-else icon="expand" class="nc-long-text-toggle-expand h-3.75 w-3.75 !text-xs" />
-      </NcButton>
+        <a-tooltip placement="bottom">
+            <template #title>Expand</template>
+            <component
+              :is="iconMap.expand"
+              class="transform dark:(!text-white) group-hover:(!text-accent scale-120) text-gray-500 text-[0.75rem]"
+            />
+        </a-tooltip>
+      </div>
     </div>
     <template #overlay>
       <div ref="inputWrapperRef" class="flex flex-col min-w-120 min-h-70 py-3 pl-3 pr-1 expanded-cell-input">
diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index fcef6b4d22..d7ce9ff80e 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -64,6 +64,8 @@ const {
 
 const { dragging } = useSortable(sortableRef, visibleItems, updateModelValue, _isReadonly)
 
+const active = inject(ActiveCellInj, ref(false))
+
 const isReadonly = computed(() => {
   return isLockedMode.value || _isReadonly.value
 })
@@ -127,6 +129,7 @@ watch(
 
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
   if (e.key === 'Enter' && !isReadonly.value) {
+    console.log(ActiveCellInj)
     e.stopPropagation()
     if (!modalVisible.value) {
       modalVisible.value = true
@@ -147,7 +150,8 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
     :style="{
       height: isForm ? undefined : `max(${(rowHeight || 1) * 1.8}rem, 41px)`,
     }"
-    class="nc-attachment-cell relative flex-1 color-transition flex items-center justify-between gap-1"
+    class="nc-attachment-cell relative flex color-transition flex items-center"
+    :class="{'justify-center': !active, 'justify-between': active}"
   >
     <LazyCellAttachmentCarousel />
 
@@ -172,14 +176,13 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
     >
       <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />
 
-      <a-tooltip v-else placement="bottom">
+      <a-tooltip placement="bottom">
         <template #title> Click or drop a file into cell</template>
 
-        <div class="flex items-center gap-1">
+        <div v-if="active || !visibleItems.length" class="flex items-center gap-1">
           <MaterialSymbolsAttachFile
             class="transform dark:(!text-white) group-hover:(!text-accent scale-120) text-gray-500 text-[0.75rem]"
           />
-
           <div
             v-if="!visibleItems.length"
             class="group-hover:text-primary text-gray-500 dark:text-gray-200 dark:group-hover:!text-white text-xs"
@@ -207,7 +210,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
               <div class="text-center w-full">{{ item.title }}</div>
             </template>
             <div v-if="isImage(item.title, item.mimetype ?? item.type)">
-              <div class="nc-attachment flex items-center justify-center" @click.stop="selectedImage = item">
+              <div class="nc-attachment flex items-center justify-center" :class="{'ml-2':active}" @click.stop="selectedImage = item">
                 <LazyCellAttachmentImage
                   class="max-h-[1.8rem] max-w-[1.8rem]"
                   :alt="item.title || `#${i}`"
@@ -215,7 +218,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
                 />
               </div>
             </div>
-            <div v-else class="nc-attachment flex items-center justify-center" @click="openAttachment(item)">
+            <div v-else class="nc-attachment flex items-center justify-center" :class="{'ml-2':active}" @click="openAttachment(item)">
               <component :is="FileIcon(item.icon)" v-if="item.icon" />
 
               <IcOutlineInsertDriveFile v-else />
@@ -225,6 +228,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
       </div>
 
       <div
+        v-if="active"
         class="group cursor-pointer flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 p-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
       >
         <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />

From cf12ed1e10289b94134b3eb0969cb8f09fd5e899 Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Fri, 1 Sep 2023 14:51:27 +0530
Subject: [PATCH 02/23] fix(nc-gui): removed unwanted log

---
 packages/nc-gui/components/cell/attachment/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index d7ce9ff80e..8d33193638 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -129,7 +129,6 @@ watch(
 
 useSelectedCellKeyupListener(inject(ActiveCellInj, ref(false)), (e) => {
   if (e.key === 'Enter' && !isReadonly.value) {
-    console.log(ActiveCellInj)
     e.stopPropagation()
     if (!modalVisible.value) {
       modalVisible.value = true

From f1c2f638b063ecc7dc480551f423aaa4b611a231 Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Sat, 2 Sep 2023 19:08:16 +0530
Subject: [PATCH 03/23] fix(nc-gui): changed to generic tooltip

---
 packages/nc-gui/components/cell/TextArea.vue         |  6 +++---
 packages/nc-gui/components/cell/attachment/index.vue | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index fd6250da82..b23f66a7c6 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -95,13 +95,13 @@ onClickOutside(inputWrapperRef, (e) => {
         data-testid="attachment-cell-file-picker-button"
         @click.stop="isVisible = !isVisible"
       >
-        <a-tooltip placement="bottom">
+        <NcTooltip placement="bottom">
             <template #title>Expand</template>
             <component
               :is="iconMap.expand"
-              class="transform dark:(!text-white) group-hover:(!text-accent scale-120) text-gray-500 text-[0.75rem]"
+              class="transform dark:(!text-white) group-hover:(!text-grey-800 scale-120) text-gray-500 text-xs"
             />
-        </a-tooltip>
+        </NcTooltip>
       </div>
     </div>
     <template #overlay>
diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index 8d33193638..fa1f1d9779 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -175,7 +175,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
     >
       <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />
 
-      <a-tooltip placement="bottom">
+      <NcTooltip placement="bottom">
         <template #title> Click or drop a file into cell</template>
 
         <div v-if="active || !visibleItems.length" class="flex items-center gap-1">
@@ -189,7 +189,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
             Add file(s)
           </div>
         </div>
-      </a-tooltip>
+      </NcTooltip>
     </div>
 
     <div v-else class="flex" />
@@ -204,7 +204,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
         }"
       >
         <template v-for="(item, i) of visibleItems" :key="item.url || item.title">
-          <a-tooltip placement="bottom">
+          <NcTooltip placement="bottom">
             <template #title>
               <div class="text-center w-full">{{ item.title }}</div>
             </template>
@@ -222,7 +222,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
 
               <IcOutlineInsertDriveFile v-else />
             </div>
-          </a-tooltip>
+          </NcTooltip>
         </template>
       </div>
 
@@ -232,7 +232,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
       >
         <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />
 
-        <a-tooltip v-else placement="bottom">
+        <NcTooltip v-else placement="bottom">
           <template #title> View attachments</template>
 
           <component
@@ -240,7 +240,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
             class="transform dark:(!text-white) group-hover:(!text-accent scale-120) text-gray-500 text-[0.75rem]"
             @click.stop="modalVisible = true"
           />
-        </a-tooltip>
+        </NcTooltip>
       </div>
     </template>
 

From cfd45c8fa4c009e29dd40e268fe1f144bba946ab Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Sat, 2 Sep 2023 20:09:15 +0530
Subject: [PATCH 04/23] feat(nc-gui): changed expand hover effect

---
 packages/nc-gui/components/cell/TextArea.vue         | 2 +-
 packages/nc-gui/components/cell/attachment/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index b23f66a7c6..746f500aa9 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -90,7 +90,7 @@ onClickOutside(inputWrapperRef, (e) => {
 
       <div
         v-if="active"
-        class="!absolute right-0 h-5 w-5 group cursor-pointer py-1 flex justify-center gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+        class="!absolute right-0 h-7 w-5 group cursor-pointer py-1 flex justify-center gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
         :class="{'right-2 bottom-2':editEnabled}"
         data-testid="attachment-cell-file-picker-button"
         @click.stop="isVisible = !isVisible"
diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index fa1f1d9779..9feb223842 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -237,7 +237,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
 
           <component
             :is="iconMap.expand"
-            class="transform dark:(!text-white) group-hover:(!text-accent scale-120) text-gray-500 text-[0.75rem]"
+            class="transform dark:(!text-white) group-hover:(!text-grey-800 scale-120) text-gray-500 text-[0.75rem]"
             @click.stop="modalVisible = true"
           />
         </NcTooltip>

From ed78f5ec6de24a51e5566fc0d2f92b1a0cdacb6e Mon Sep 17 00:00:00 2001
From: reenphygeorge <reenphygeorge@gmail.com>
Date: Tue, 5 Sep 2023 20:37:16 +0530
Subject: [PATCH 05/23] feat(nc-gui): bg removed for expand button

---
 packages/nc-gui/components/cell/TextArea.vue         | 2 +-
 packages/nc-gui/components/cell/attachment/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 746f500aa9..0e9ed08bc6 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -90,7 +90,7 @@ onClickOutside(inputWrapperRef, (e) => {
 
       <div
         v-if="active"
-        class="!absolute right-0 h-7 w-5 group cursor-pointer py-1 flex justify-center gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+        class="!absolute right-0 bottom-0 h-6 w-5 group cursor-pointer flex justify-end gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-none p-1 hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
         :class="{'right-2 bottom-2':editEnabled}"
         data-testid="attachment-cell-file-picker-button"
         @click.stop="isVisible = !isVisible"
diff --git a/packages/nc-gui/components/cell/attachment/index.vue b/packages/nc-gui/components/cell/attachment/index.vue
index 9feb223842..c7dada364a 100644
--- a/packages/nc-gui/components/cell/attachment/index.vue
+++ b/packages/nc-gui/components/cell/attachment/index.vue
@@ -169,7 +169,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
     <div
       v-if="!isReadonly"
       :class="{ 'mx-auto px-4': !visibleItems.length }"
-      class="group cursor-pointer py-1 flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+      class="group cursor-pointer py-1 flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-none shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
       data-testid="attachment-cell-file-picker-button"
       @click.stop="open"
     >
@@ -228,7 +228,7 @@ const rowHeight = inject(RowHeightInj, ref(1.8))
 
       <div
         v-if="active"
-        class="group cursor-pointer flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-1 p-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+        class="h-6 w-5 group cursor-pointer flex gap-1 items-center active:(ring ring-accent ring-opacity-100) rounded border-none p-1 hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
       >
         <component :is="iconMap.reload" v-if="isLoading" :class="{ 'animate-infinite animate-spin': isLoading }" />
 

From ee5bfd6889e1bde47cb01d81a72f92abb9fd79e4 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 6 Sep 2023 12:37:08 +0530
Subject: [PATCH 06/23] fix: add upgrader for creating missing index

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../global/init-meta-service.provider.ts      |   2 +-
 .../nocodb/src/version-upgrader/NcUpgrader.ts |   1 +
 .../ncXcdbLTARIndexUpgrader.ts                | 155 ++++++++++++++++++
 3 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts

diff --git a/packages/nocodb/src/modules/global/init-meta-service.provider.ts b/packages/nocodb/src/modules/global/init-meta-service.provider.ts
index 6fa704c4d4..203ad26f00 100644
--- a/packages/nocodb/src/modules/global/init-meta-service.provider.ts
+++ b/packages/nocodb/src/modules/global/init-meta-service.provider.ts
@@ -27,7 +27,7 @@ export const InitMetaServiceProvider: Provider = {
     const config = await NcConfig.createByEnv();
 
     // set version
-    process.env.NC_VERSION = '0108003';
+    process.env.NC_VERSION = '0111002';
 
     // init cache
     await NocoCache.init();
diff --git a/packages/nocodb/src/version-upgrader/NcUpgrader.ts b/packages/nocodb/src/version-upgrader/NcUpgrader.ts
index ce5a6a750b..b539879683 100644
--- a/packages/nocodb/src/version-upgrader/NcUpgrader.ts
+++ b/packages/nocodb/src/version-upgrader/NcUpgrader.ts
@@ -142,6 +142,7 @@ export default class NcUpgrader {
       { name: '0105004', handler: ncHookUpgrader },
       { name: '0107004', handler: ncProjectConfigUpgrader },
       { name: '0108002', handler: ncXcdbLTARUpgrader },
+      { name: '0111002', handler: ncXcdbLTARUpgrader },
     ];
   }
 }
diff --git a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
new file mode 100644
index 0000000000..811d2f9eb5
--- /dev/null
+++ b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
@@ -0,0 +1,155 @@
+import { Logger } from '@nestjs/common';
+import { RelationTypes, UITypes } from 'nocodb-sdk';
+import type { LinkToAnotherRecordColumn } from '~/models';
+import type { MetaService } from '~/meta/meta.service';
+import type { NcUpgraderCtx } from './NcUpgrader';
+import { MetaTable } from '~/utils/globals';
+import { Base } from '~/models';
+import NcConnectionMgrv2 from '~/utils/common/NcConnectionMgrv2';
+import { Model } from '~/models';
+
+const logger = new Logger('LTARIndexUpgrader');
+
+// An upgrader for adding missing index of LTAR relations in XCDB bases
+async function upgradeModelRelationsIndex({
+  model,
+  indexes,
+  ncMeta,
+  sqlClient,
+}: {
+  ncMeta: MetaService;
+  model: Model;
+  sqlClient: ReturnType<
+    (typeof NcConnectionMgrv2)['getSqlClient']
+  > extends Promise<infer U>
+    ? U
+    : ReturnType<(typeof NcConnectionMgrv2)['getSqlClient']>;
+  indexes: {
+    cn: string;
+    key_name: string;
+
+    type: string;
+    rqd: boolean | number;
+    cst: string;
+    cstn: string;
+  }[];
+}) {
+  // Iterate over each column and upgrade LTAR
+  for (const column of await model.getColumns(ncMeta)) {
+    if (column.uidt !== UITypes.LinkToAnotherRecord) {
+      continue;
+    }
+
+    const colOptions = await column.getColOptions<LinkToAnotherRecordColumn>(
+      ncMeta,
+    );
+
+    // if colOptions not found then skip
+    if (!colOptions) {
+      continue;
+    }
+
+    switch (colOptions.type) {
+      case RelationTypes.HAS_MANY:
+        {
+          // const parentCol = await colOptions.getParentColumn(ncMeta);
+          const childCol = await colOptions.getChildColumn(ncMeta);
+
+          // const parentModel = await parentCol.getModel(ncMeta);
+          const childModel = await childCol.getModel(ncMeta);
+
+          // check index already exists or not
+          const indexExists = indexes.find((index) => {
+            return (
+              index.cn === childCol.column_name &&
+              index.key_name === childCol.column_name
+            );
+          });
+
+          if (indexExists) {
+            continue;
+          }
+
+          logger.log(`Creating index for column '${childCol.column_name}'`);
+          // create a new index for the column
+          const indexArgs = {
+            columns: [childCol.column_name],
+            tn: childModel.table_name,
+            non_unique: true,
+          };
+          await sqlClient.indexCreate(indexArgs);
+        }
+        break;
+    }
+  }
+}
+
+// An upgrader for adding missing index for LTAR relations in XCDB bases
+async function upgradeBaseRelations({
+  ncMeta,
+  base,
+}: {
+  ncMeta: MetaService;
+  base: Base;
+}) {
+  // skip deleted projects
+  if ((await base.getProject(ncMeta)).deleted) return;
+
+  const sqlClient = await NcConnectionMgrv2.getSqlClient(base, ncMeta.knex);
+
+  // get models for the base
+  const models = await ncMeta.metaList2(null, base.id, MetaTable.MODELS);
+
+  // get all columns and filter out relations and create index if not exists
+  for (const model of models) {
+    logger.log(`Upgrading model '${model.name}'`);
+    const indexes = await sqlClient.indexList({
+      tn: model.table_name,
+    });
+    await upgradeModelRelationsIndex({
+      ncMeta,
+      model: new Model(model),
+      sqlClient,
+      indexes: indexes.data.list,
+    });
+    logger.log(`Upgraded model '${model.name}'`);
+  }
+}
+
+// Add missing index for LTAR relations
+export default async function ({ ncMeta }: NcUpgraderCtx) {
+  logger.log(
+    'Starting upgrade for LTAR relations in XCDB bases to add missing index',
+  );
+
+  // get all xcdb bases
+  const bases = await ncMeta.metaList2(null, null, MetaTable.BASES, {
+    condition: {
+      is_meta: 1,
+    },
+    orderBy: {},
+  });
+
+  if (!bases.length) return;
+
+  // iterate and upgrade each base
+  for (const base of bases) {
+    // skip if not pg, since for other db we don't need to upgrade
+    if (ncMeta.knex.clientType() !== 'pg') {
+      continue;
+    }
+
+    logger.log(`Upgrading base '${base.name}'`);
+
+    await upgradeBaseRelations({
+      ncMeta,
+      base: new Base(base),
+    });
+
+    logger.log(`Upgraded base '${base.name}'`);
+  }
+
+  logger.log(
+    'Finished upgrade for LTAR relations in XCDB bases to add missing index',
+  );
+}

From 31eab95e8ff60dc372f4e792d8813d8ea8d3bd93 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 6 Sep 2023 12:44:40 +0530
Subject: [PATCH 07/23] fix: map correct upgrader file

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/version-upgrader/NcUpgrader.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/version-upgrader/NcUpgrader.ts b/packages/nocodb/src/version-upgrader/NcUpgrader.ts
index b539879683..78c2364c11 100644
--- a/packages/nocodb/src/version-upgrader/NcUpgrader.ts
+++ b/packages/nocodb/src/version-upgrader/NcUpgrader.ts
@@ -15,6 +15,7 @@ import ncProjectEnvUpgrader from './ncProjectEnvUpgrader';
 import ncHookUpgrader from './ncHookUpgrader';
 import ncProjectConfigUpgrader from './ncProjectConfigUpgrader';
 import ncXcdbLTARUpgrader from './ncXcdbLTARUpgrader';
+import ncXcdbLTARIndexUpgrader from './ncXcdbLTARIndexUpgrader';
 import type { MetaService } from '~/meta/meta.service';
 import type { NcConfig } from '~/interface/config';
 
@@ -142,7 +143,7 @@ export default class NcUpgrader {
       { name: '0105004', handler: ncHookUpgrader },
       { name: '0107004', handler: ncProjectConfigUpgrader },
       { name: '0108002', handler: ncXcdbLTARUpgrader },
-      { name: '0111002', handler: ncXcdbLTARUpgrader },
+      { name: '0111002', handler: ncXcdbLTARIndexUpgrader },
     ];
   }
 }

From b064c0806fcb5873e2cf5aa8e3c4697dc55c2071 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 6 Sep 2023 13:10:00 +0530
Subject: [PATCH 08/23] fix: log corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
index 811d2f9eb5..997869fc85 100644
--- a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
+++ b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
@@ -102,7 +102,9 @@ async function upgradeBaseRelations({
 
   // get all columns and filter out relations and create index if not exists
   for (const model of models) {
-    logger.log(`Upgrading model '${model.name}'`);
+    logger.log(`Upgrading model '${model.title}'`);
+
+    logger.log(`Fetching index list of model '${model.title}'`);
     const indexes = await sqlClient.indexList({
       tn: model.table_name,
     });
@@ -112,7 +114,7 @@ async function upgradeBaseRelations({
       sqlClient,
       indexes: indexes.data.list,
     });
-    logger.log(`Upgraded model '${model.name}'`);
+    logger.log(`Upgraded model '${model.title}'`);
   }
 }
 

From b8f94260e0cb974747151efad16b308a84e692fa Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 6 Sep 2023 13:32:25 +0530
Subject: [PATCH 09/23] fix: exclude composite indexes from list

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../ncXcdbLTARIndexUpgrader.ts                | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
index 997869fc85..0cc10f0428 100644
--- a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
+++ b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
@@ -50,7 +50,8 @@ async function upgradeModelRelationsIndex({
     }
 
     switch (colOptions.type) {
-      case RelationTypes.HAS_MANY:
+      // use belongs to since child column belongs to current table in that case
+      case RelationTypes.BELONGS_TO:
         {
           // const parentCol = await colOptions.getParentColumn(ncMeta);
           const childCol = await colOptions.getChildColumn(ncMeta);
@@ -60,10 +61,7 @@ async function upgradeModelRelationsIndex({
 
           // check index already exists or not
           const indexExists = indexes.find((index) => {
-            return (
-              index.cn === childCol.column_name &&
-              index.key_name === childCol.column_name
-            );
+            return index.cn === childCol.column_name;
           });
 
           if (indexExists) {
@@ -108,11 +106,21 @@ async function upgradeBaseRelations({
     const indexes = await sqlClient.indexList({
       tn: model.table_name,
     });
+    const indexList = indexes.data?.list ?? [];
+
+    // exclude composite indexes
+    const filteredIndexList = indexList.filter((indexObj, i) => {
+      return indexList.every((indexObj2, j) => {
+        if (i === j) return true;
+        return indexObj2.key_name !== indexObj.key_name;
+      });
+    });
+
     await upgradeModelRelationsIndex({
       ncMeta,
       model: new Model(model),
       sqlClient,
-      indexes: indexes.data.list,
+      indexes: filteredIndexList,
     });
     logger.log(`Upgraded model '${model.title}'`);
   }

From 9b20269d08857eec30281c111ca4cae8f3affc7d Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Wed, 6 Sep 2023 16:41:50 +0300
Subject: [PATCH 10/23] fix: warnings in ui

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nc-gui/components/dashboard/settings/DataSources.vue  | 5 ++---
 .../dashboard/settings/data-sources/CreateBase.vue        | 4 ++--
 packages/nc-gui/components/dlg/ViewCreate.vue             | 8 +++++++-
 packages/nc-gui/components/nc/Button.vue                  | 8 +++++++-
 packages/nc-gui/components/nc/Tabs.vue                    | 7 -------
 packages/nc-gui/components/project/AccessSettings.vue     | 2 +-
 packages/nc-gui/components/project/AllTables.vue          | 5 ++++-
 .../components/project/InviteProjectCollabSection.vue     | 8 ++++++++
 .../nc-gui/components/smartsheet/toolbar/GroupByMenu.vue  | 1 -
 .../nc-gui/components/workspace/CollaboratorsList.vue     | 2 +-
 10 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/settings/DataSources.vue b/packages/nc-gui/components/dashboard/settings/DataSources.vue
index 3319fc36a6..fba38d7856 100644
--- a/packages/nc-gui/components/dashboard/settings/DataSources.vue
+++ b/packages/nc-gui/components/dashboard/settings/DataSources.vue
@@ -52,6 +52,7 @@ async function loadBases(changed?: boolean) {
   try {
     if (changed) refreshCommandPalette()
 
+    await until(() => !!project.value.id).toBeTruthy()
     isReloading.value = true
     vReload.value = true
     const baseList = await $api.base.list(project.value.id as string)
@@ -164,8 +165,7 @@ const forceAwaken = () => {
 
 onMounted(async () => {
   if (sources.value.length === 0) {
-    await loadBases()
-    await loadMetaDiff()
+    loadBases()
   }
 })
 
@@ -174,7 +174,6 @@ watch(
   async (reload) => {
     if (reload && !isReloading.value) {
       await loadBases()
-      await loadMetaDiff()
     }
   },
 )
diff --git a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
index 6bb55c0941..9c6e5e5ae2 100644
--- a/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
+++ b/packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue
@@ -350,8 +350,8 @@ onMounted(async () => {
     // todo: replace setTimeout and follow better approach
     setTimeout(() => {
       const input = form.value?.$el?.querySelector('input[type=text]')
-      input.setSelectionRange(0, formState.value.title.length)
-      input.focus()
+      input?.setSelectionRange(0, formState.value.title.length)
+      input?.focus()
     }, 500)
   })
 })
diff --git a/packages/nc-gui/components/dlg/ViewCreate.vue b/packages/nc-gui/components/dlg/ViewCreate.vue
index 86557e85c5..185d5bb2e2 100644
--- a/packages/nc-gui/components/dlg/ViewCreate.vue
+++ b/packages/nc-gui/components/dlg/ViewCreate.vue
@@ -156,7 +156,13 @@ function init() {
 }
 
 async function onSubmit() {
-  const isValid = await formValidator.value?.validateFields()
+  let isValid = null
+
+  try {
+    isValid = await formValidator.value?.validateFields()
+  } catch (e) {
+    console.error(e)
+  }
 
   if (isValid && form.type) {
     const _meta = unref(meta)
diff --git a/packages/nc-gui/components/nc/Button.vue b/packages/nc-gui/components/nc/Button.vue
index b6d594faa1..70cf2ebaee 100644
--- a/packages/nc-gui/components/nc/Button.vue
+++ b/packages/nc-gui/components/nc/Button.vue
@@ -33,6 +33,8 @@ const emits = defineEmits(['update:loading'])
 
 const slots = useSlots()
 
+const NcButton = ref<HTMLElement | null>(null)
+
 const size = computed(() => props.size)
 
 const type = computed(() => props.type)
@@ -63,10 +65,15 @@ const onBlur = () => {
   isFocused.value = false
   isClicked.value = false
 }
+
+useEventListener(NcButton, 'mousedown', () => {
+  isClicked.value = true
+})
 </script>
 
 <template>
   <a-button
+    ref="NcButton"
     :disabled="props.disabled"
     :loading="loading"
     :type="type"
@@ -80,7 +87,6 @@ const onBlur = () => {
     }"
     @focus="onFocus"
     @blur="onBlur"
-    @mousedown="isClicked = true"
   >
     <div
       class="flex flex-row gap-x-2.5 w-full"
diff --git a/packages/nc-gui/components/nc/Tabs.vue b/packages/nc-gui/components/nc/Tabs.vue
index eff2e2ce02..de6d432d98 100644
--- a/packages/nc-gui/components/nc/Tabs.vue
+++ b/packages/nc-gui/components/nc/Tabs.vue
@@ -3,17 +3,10 @@ const props = defineProps<{
   modelValue?: string
   centered?: boolean
 }>()
-
-const emits = defineEmits<{
-  (event: 'update:modelValue', data: string): void
-}>()
-
-const vModel = useVModel(props, 'modelValue', emits)
 </script>
 
 <template>
   <a-tabs
-    v-model:activeKey="vModel"
     class="nc-tabs"
     :class="{
       centered: props.centered,
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index c2b2624630..94975a96b1 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -154,7 +154,7 @@ const accessibleRoles = computed<(typeof ProjectRoles)[keyof typeof ProjectRoles
         v-else-if="!collaborators?.length"
         class="nc-collaborators-list w-full h-full flex flex-col items-center justify-center mt-36"
       >
-        <Empty description="No collaborators found" />
+        <a-empty description="No collaborators found" />
       </div>
       <div v-else class="nc-collaborators-list nc-scrollbar-md">
         <div class="nc-collaborators-list-header">
diff --git a/packages/nc-gui/components/project/AllTables.vue b/packages/nc-gui/components/project/AllTables.vue
index 392c523512..d0aa000a48 100644
--- a/packages/nc-gui/components/project/AllTables.vue
+++ b/packages/nc-gui/components/project/AllTables.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { stringifyRolesObj } from 'nocodb-sdk'
 import type { BaseType, TableType } from 'nocodb-sdk'
 import dayjs from 'dayjs'
 
@@ -8,6 +9,8 @@ const { openedProject } = storeToRefs(useProjects())
 
 const { isUIAllowed } = useUIPermission()
 
+const { allRoles } = useRoles()
+
 const { $e } = useNuxtApp()
 
 const isImportModalOpen = ref(false)
@@ -71,7 +74,7 @@ function openTableCreateDialog(baseIndex?: number | undefined) {
 
 <template>
   <div class="nc-all-tables-view">
-    <div v-if="isUIAllowed('tableCreate', false, roles)" class="flex flex-row gap-x-6 pb-3 pt-6">
+    <div v-if="isUIAllowed('tableCreate', false, stringifyRolesObj(allRoles))" class="flex flex-row gap-x-6 pb-3 pt-6">
       <div class="nc-project-view-all-table-btn" data-testid="proj-view-btn__add-new-table" @click="openTableCreateDialog()">
         <GeneralIcon icon="addOutlineBox" />
         <div class="label">{{ $t('general.new') }} {{ $t('objects.table') }}</div>
diff --git a/packages/nc-gui/components/project/InviteProjectCollabSection.vue b/packages/nc-gui/components/project/InviteProjectCollabSection.vue
index 386d9f34da..7b33eb7242 100644
--- a/packages/nc-gui/components/project/InviteProjectCollabSection.vue
+++ b/packages/nc-gui/components/project/InviteProjectCollabSection.vue
@@ -23,7 +23,13 @@ const usersData = ref<{
   roles?: string
 }>()
 
+const isInvitingCollaborators = ref(false)
+
 const inviteCollaborator = async () => {
+  isInvitingCollaborators.value = true
+
+  if (isInvitingCollaborators.value) return
+
   try {
     usersData.value = await inviteUser(inviteData)
     usersData.roles = inviteData.roles
@@ -35,6 +41,8 @@ const inviteCollaborator = async () => {
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
   }
+
+  isInvitingCollaborators.value = false
 }
 
 const inviteUrl = computed(() =>
diff --git a/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
index ca0cae4ba3..822b7e7a4d 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
@@ -145,7 +145,6 @@ watch(open, () => {
   <NcDropdown
     v-model:visible="open"
     offset-y
-    class=""
     :trigger="['click']"
     overlay-class-name="nc-dropdown-group-by-menu nc-toolbar-dropdown"
   >
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 5233b70030..ba442379e0 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -48,7 +48,7 @@ const accessibleRoles = computed<WorkspaceUserRoles[]>(() => {
       </a-input>
     </div>
     <div v-if="!filterCollaborators?.length" class="w-full h-full flex flex-col items-center justify-center mt-36">
-      <Empty description="No collaborators found" />
+      <a-empty description="No collaborators found" />
     </div>
     <table v-else class="nc-collaborators-list-table !nc-scrollbar-md">
       <thead>

From 1a1e61eb0c843cce1b4f266e4443513d9a07c14b Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Thu, 7 Sep 2023 12:09:13 +0530
Subject: [PATCH 11/23] fix(nocohub): Fixed view scroll not coming and auto
 scroll on active view

---
 .../components/smartsheet/sidebar/MenuTop.vue | 28 ++++++++++++++++++-
 .../components/smartsheet/sidebar/index.vue   |  2 +-
 packages/nc-gui/utils/domUtils.ts             |  5 ++--
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue b/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
index 451577c05f..94031e9ecf 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/MenuTop.vue
@@ -297,13 +297,38 @@ const setIcon = async (icon: string, view: ViewType) => {
     message.error(await extractSdkResponseErrorMsg(e))
   }
 }
+
+const scrollViewNode = () => {
+  const activeViewDom = document.querySelector(`.nc-views-menu [data-view-id="${activeView.value?.id}"]`) as HTMLElement
+  if (!activeViewDom) return
+
+  if (isElementInvisible(activeViewDom)) {
+    // Scroll to the view node
+    activeViewDom?.scrollIntoView({ behavior: 'auto', inline: 'start' })
+  }
+}
+
+watch(
+  () => activeView.value?.id,
+  () => {
+    if (!activeView.value?.id) return
+
+    // TODO: Find a better way to scroll to the view node
+    setTimeout(() => {
+      scrollViewNode()
+    }, 800)
+  },
+  {
+    immediate: true,
+  },
+)
 </script>
 
 <template>
   <a-menu
     ref="menuRef"
     :class="{ dragging }"
-    class="nc-views-menu flex flex-col !ml-3 !mr-2.5 w-full !border-r-0 !bg-inherit nc-scrollbar-md"
+    class="nc-views-menu flex flex-col !ml-3 w-full !border-r-0 !bg-inherit"
     :selected-keys="selected"
   >
     <!-- Lazy load breaks menu item active styles, i.e. styles never change even when active item changes -->
@@ -319,6 +344,7 @@ const setIcon = async (icon: string, view: ViewType) => {
         'active': activeView?.id === view.id,
         [`nc-${view.type ? viewTypeAlias[view.type] : undefined || view.type}-view-item`]: true,
       }"
+      :data-view-id="view.id"
       @change-view="changeView"
       @open-modal="$emit('openModal', $event)"
       @delete="openDeleteDialog"
diff --git a/packages/nc-gui/components/smartsheet/sidebar/index.vue b/packages/nc-gui/components/smartsheet/sidebar/index.vue
index 4c01f34c45..6460697e35 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/index.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/index.vue
@@ -186,7 +186,7 @@ function onOpenModal({
 
     <div class="flex-1 flex flex-col min-h-0">
       <div class="flex flex-col h-full justify-between w-full">
-        <div class="flex flex-grow w-full">
+        <div class="flex flex-grow nc-scrollbar-md pr-1.75 mr-0.5">
           <div v-if="isViewsLoading" class="flex flex-col w-full">
             <div class="flex flex-row items-center w-full mt-1.5 ml-5 gap-x-3">
               <a-skeleton-input :active="true" class="!w-4 !h-4 !rounded overflow-hidden" />
diff --git a/packages/nc-gui/utils/domUtils.ts b/packages/nc-gui/utils/domUtils.ts
index 65065fef03..1e2238a8f4 100644
--- a/packages/nc-gui/utils/domUtils.ts
+++ b/packages/nc-gui/utils/domUtils.ts
@@ -1,6 +1,5 @@
-const isElementInvisible = (el: HTMLElement | Element) => {
-  const rect = el.getBoundingClientRect()
-  return rect.bottom < 0 || rect.right < 0 || rect.left > window.innerWidth || rect.top > window.innerHeight
+const isElementInvisible = (elem: HTMLElement) => {
+  return !!(elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length)
 }
 
 export { isElementInvisible }

From 858d03ed83d3513445bf478b7ba7ec277c39ae55 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 14:14:35 +0530
Subject: [PATCH 12/23] refactor: extract alias properly

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components.d.ts                  | 16 +---------------
 .../version-upgrader/ncXcdbLTARIndexUpgrader.ts  | 10 ++++++----
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index 3f0a87fac6..0ddacb9883 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -50,6 +50,7 @@ declare module '@vue/runtime-core' {
     AMenuItemGroup: typeof import('ant-design-vue/es')['MenuItemGroup']
     AModal: typeof import('ant-design-vue/es')['Modal']
     APagination: typeof import('ant-design-vue/es')['Pagination']
+    APopover: typeof import('ant-design-vue/es')['Popover']
     ARadio: typeof import('ant-design-vue/es')['Radio']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
     ARate: typeof import('ant-design-vue/es')['Rate']
@@ -77,15 +78,12 @@ declare module '@vue/runtime-core' {
     AUploadDragger: typeof import('ant-design-vue/es')['UploadDragger']
     CilFullscreen: typeof import('~icons/cil/fullscreen')['default']
     CilFullscreenExit: typeof import('~icons/cil/fullscreen-exit')['default']
-    ClarityColorPickerSolid: typeof import('~icons/clarity/color-picker-solid')['default']
     ClaritySuccessLine: typeof import('~icons/clarity/success-line')['default']
     IcBaselineMoreVert: typeof import('~icons/ic/baseline-more-vert')['default']
-    IcOutlineAccessTime: typeof import('~icons/ic/outline-access-time')['default']
     IcOutlineInsertDriveFile: typeof import('~icons/ic/outline-insert-drive-file')['default']
     IcRoundEdit: typeof import('~icons/ic/round-edit')['default']
     IcRoundKeyboardArrowDown: typeof import('~icons/ic/round-keyboard-arrow-down')['default']
     IcRoundSearch: typeof import('~icons/ic/round-search')['default']
-    IcRoundStarBorder: typeof import('~icons/ic/round-star-border')['default']
     LogosGoogleGmail: typeof import('~icons/logos/google-gmail')['default']
     MaterialSymbolsArrowCircleLeftRounded: typeof import('~icons/material-symbols/arrow-circle-left-rounded')['default']
     MaterialSymbolsArrowCircleRightRounded: typeof import('~icons/material-symbols/arrow-circle-right-rounded')['default']
@@ -93,10 +91,7 @@ declare module '@vue/runtime-core' {
     MaterialSymbolsChevronRightRounded: typeof import('~icons/material-symbols/chevron-right-rounded')['default']
     MaterialSymbolsCloseRounded: typeof import('~icons/material-symbols/close-rounded')['default']
     MaterialSymbolsDarkModeOutline: typeof import('~icons/material-symbols/dark-mode-outline')['default']
-    MaterialSymbolsDeleteOutlineRounded: typeof import('~icons/material-symbols/delete-outline-rounded')['default']
     MaterialSymbolsFileCopyOutline: typeof import('~icons/material-symbols/file-copy-outline')['default']
-    MaterialSymbolsGroupOutlineRounded: typeof import('~icons/material-symbols/group-outline-rounded')['default']
-    MaterialSymbolsInboxOutlineRounded: typeof import('~icons/material-symbols/inbox-outline-rounded')['default']
     MaterialSymbolsKeyboardArrowDownRounded: typeof import('~icons/material-symbols/keyboard-arrow-down-rounded')['default']
     MaterialSymbolsKeyboardReturn: typeof import('~icons/material-symbols/keyboard-return')['default']
     MaterialSymbolsLightModeOutline: typeof import('~icons/material-symbols/light-mode-outline')['default']
@@ -125,23 +120,16 @@ declare module '@vue/runtime-core' {
     MdiChatProcessingOutline: typeof import('~icons/mdi/chat-processing-outline')['default']
     MdiCheck: typeof import('~icons/mdi/check')['default']
     MdiChevronDown: typeof import('~icons/mdi/chevron-down')['default']
-    MdiChevronLeft: typeof import('~icons/mdi/chevron-left')['default']
     MdiChevronRight: typeof import('~icons/mdi/chevron-right')['default']
     MdiCircleMedium: typeof import('~icons/mdi/circle-medium')['default']
     MdiClose: typeof import('~icons/mdi/close')['default']
-    MdiCloseCircleOutline: typeof import('~icons/mdi/close-circle-outline')['default']
     MdiCodeTags: typeof import('~icons/mdi/code-tags')['default']
     MdiContentCopy: typeof import('~icons/mdi/content-copy')['default']
     MdiCurrencyUsd: typeof import('~icons/mdi/currency-usd')['default']
-    MdiDatabaseOutline: typeof import('~icons/mdi/database-outline')['default']
-    MdiDeleteOutline: typeof import('~icons/mdi/delete-outline')['default']
     MdiDiscord: typeof import('~icons/mdi/discord')['default']
     MdiDotsHorizontal: typeof import('~icons/mdi/dots-horizontal')['default']
-    MdiDotsVertical: typeof import('~icons/mdi/dots-vertical')['default']
-    MdiEditOutline: typeof import('~icons/mdi/edit-outline')['default']
     MdiEye: typeof import('~icons/mdi/eye')['default']
     MdiFlag: typeof import('~icons/mdi/flag')['default']
-    MdiFolder: typeof import('~icons/mdi/folder')['default']
     MdiHeart: typeof import('~icons/mdi/heart')['default']
     MdiKeyStar: typeof import('~icons/mdi/key-star')['default']
     MdiLinkVariant: typeof import('~icons/mdi/link-variant')['default']
@@ -152,8 +140,6 @@ declare module '@vue/runtime-core' {
     MdiMicrosoftTeams: typeof import('~icons/mdi/microsoft-teams')['default']
     MdiMoonFull: typeof import('~icons/mdi/moon-full')['default']
     MdiPlus: typeof import('~icons/mdi/plus')['default']
-    MdiPlusOutline: typeof import('~icons/mdi/plus-outline')['default']
-    MdiRefresh: typeof import('~icons/mdi/refresh')['default']
     MdiReload: typeof import('~icons/mdi/reload')['default']
     MdiRocketLaunchOutline: typeof import('~icons/mdi/rocket-launch-outline')['default']
     MdiScriptTextOutline: typeof import('~icons/mdi/script-text-outline')['default']
diff --git a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
index 0cc10f0428..8e40f518ae 100644
--- a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
+++ b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
@@ -143,20 +143,22 @@ export default async function ({ ncMeta }: NcUpgraderCtx) {
   if (!bases.length) return;
 
   // iterate and upgrade each base
-  for (const base of bases) {
+  for (const _base of bases) {
+    const base = new Base(_base)
+
     // skip if not pg, since for other db we don't need to upgrade
     if (ncMeta.knex.clientType() !== 'pg') {
       continue;
     }
 
-    logger.log(`Upgrading base '${base.name}'`);
+    logger.log(`Upgrading base '${base.alias}'`);
 
     await upgradeBaseRelations({
       ncMeta,
-      base: new Base(base),
+      base,
     });
 
-    logger.log(`Upgraded base '${base.name}'`);
+    logger.log(`Upgraded base '${base.alias}'`);
   }
 
   logger.log(

From d85874f6a43d115ddbb8f0d637ba06b55e8ee6b0 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 14:16:21 +0530
Subject: [PATCH 13/23] refactor: include project name as well

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../src/version-upgrader/ncXcdbLTARIndexUpgrader.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
index 8e40f518ae..5f1edf7955 100644
--- a/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
+++ b/packages/nocodb/src/version-upgrader/ncXcdbLTARIndexUpgrader.ts
@@ -90,9 +90,6 @@ async function upgradeBaseRelations({
   ncMeta: MetaService;
   base: Base;
 }) {
-  // skip deleted projects
-  if ((await base.getProject(ncMeta)).deleted) return;
-
   const sqlClient = await NcConnectionMgrv2.getSqlClient(base, ncMeta.knex);
 
   // get models for the base
@@ -144,21 +141,25 @@ export default async function ({ ncMeta }: NcUpgraderCtx) {
 
   // iterate and upgrade each base
   for (const _base of bases) {
-    const base = new Base(_base)
+    const base = new Base(_base);
 
     // skip if not pg, since for other db we don't need to upgrade
     if (ncMeta.knex.clientType() !== 'pg') {
       continue;
     }
+    const project = await base.getProject(ncMeta);
+
+    // skip deleted projects
+    if (!project || project.deleted) continue;
 
-    logger.log(`Upgrading base '${base.alias}'`);
+    logger.log(`Upgrading base '${base.alias}'(${project.title})`);
 
     await upgradeBaseRelations({
       ncMeta,
       base,
     });
 
-    logger.log(`Upgraded base '${base.alias}'`);
+    logger.log(`Upgraded base '${base.alias}'(${project.title})`);
   }
 
   logger.log(

From bd273037a8584fcd483929dd0da1e8a8a000e128 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Thu, 7 Sep 2023 12:02:32 +0300
Subject: [PATCH 14/23] fix: acl for cache apis

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../nocodb/src/controllers/caches.controller.ts     | 13 +++++++++++--
 packages/nocodb/src/utils/acl.ts                    |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/controllers/caches.controller.ts b/packages/nocodb/src/controllers/caches.controller.ts
index cc0eeda981..11ecf6b75c 100644
--- a/packages/nocodb/src/controllers/caches.controller.ts
+++ b/packages/nocodb/src/controllers/caches.controller.ts
@@ -1,4 +1,5 @@
 import { Controller, Delete, Get, UseGuards } from '@nestjs/common';
+import { OrgUserRoles } from 'nocodb-sdk';
 import { CachesService } from '~/services/caches.service';
 import { GlobalGuard } from '~/guards/global/global.guard';
 import { Acl } from '~/middlewares/extract-ids/extract-ids.middleware';
@@ -9,7 +10,11 @@ export class CachesController {
   constructor(private readonly cachesService: CachesService) {}
 
   @Get('/api/v1/db/meta/cache')
-  @Acl('cacheGet')
+  @Acl('cacheGet', {
+    scope: 'org',
+    allowedRoles: [OrgUserRoles.SUPER_ADMIN],
+    blockApiTokenAccess: true,
+  })
   async cacheGet(_, res) {
     const data = await this.cachesService.cacheGet();
     res.set({
@@ -20,7 +25,11 @@ export class CachesController {
   }
 
   @Delete('/api/v1/db/meta/cache')
-  @Acl('cacheDelete')
+  @Acl('cacheDelete', {
+    scope: 'org',
+    allowedRoles: [OrgUserRoles.SUPER_ADMIN],
+    blockApiTokenAccess: true,
+  })
   async cacheDelete() {
     return await this.cachesService.cacheDelete();
   }
diff --git a/packages/nocodb/src/utils/acl.ts b/packages/nocodb/src/utils/acl.ts
index a6737efee8..3bce1cdbef 100644
--- a/packages/nocodb/src/utils/acl.ts
+++ b/packages/nocodb/src/utils/acl.ts
@@ -37,6 +37,10 @@ const permissionScopes = {
     'testConnection',
     'genericGPT',
 
+    // Cache
+    'cacheGet',
+    'cacheDelete',
+
     // TODO: add ACL with project scope
     'upload',
     'uploadViaURL',

From 31de86cbc88a627edc7af84a017a2dc586cb77d4 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 12:46:27 +0530
Subject: [PATCH 15/23] fix: filter tables based on acl

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/controllers/tables.controller.ts | 2 +-
 packages/nocodb/src/services/tables.service.ts       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/controllers/tables.controller.ts b/packages/nocodb/src/controllers/tables.controller.ts
index 5b4969eb76..ea10b4d3c3 100644
--- a/packages/nocodb/src/controllers/tables.controller.ts
+++ b/packages/nocodb/src/controllers/tables.controller.ts
@@ -38,7 +38,7 @@ export class TablesController {
         projectId,
         baseId,
         includeM2M: includeM2M === 'true',
-        roles: extractRolesObj(req.user.roles),
+        roles: extractRolesObj(req.user.project_roles),
       }),
     );
   }
diff --git a/packages/nocodb/src/services/tables.service.ts b/packages/nocodb/src/services/tables.service.ts
index f0d1711d94..f4a5250edd 100644
--- a/packages/nocodb/src/services/tables.service.ts
+++ b/packages/nocodb/src/services/tables.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import DOMPurify from 'isomorphic-dompurify';
-import { isLinksOrLTAR, isVirtualCol, ModelTypes, UITypes } from 'nocodb-sdk';
+import { isLinksOrLTAR, isVirtualCol, ModelTypes, ProjectRoles, UITypes } from 'nocodb-sdk'
 import { AppEvents } from 'nocodb-sdk';
 import { MetaDiffsService } from './meta-diffs.service';
 import { ColumnsService } from './columns.service';
@@ -328,7 +328,7 @@ export class TablesService {
     const tableViewMapping = viewList.reduce((o, view: any) => {
       o[view.fk_model_id] = o[view.fk_model_id] || 0;
       if (
-        Object.keys(param.roles).some(
+        Object.values(ProjectRoles).some(
           (role) => param.roles[role] && !view.disabled[role],
         )
       ) {

From 502dd01765dd2c7f051c18646e5f41a7607a0a0a Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 12:48:50 +0530
Subject: [PATCH 16/23] fix: filter views based on ui acl

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/services/views.service.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/services/views.service.ts b/packages/nocodb/src/services/views.service.ts
index ef201c7499..88be2372c1 100644
--- a/packages/nocodb/src/services/views.service.ts
+++ b/packages/nocodb/src/services/views.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { AppEvents } from 'nocodb-sdk';
+import { AppEvents, ProjectRoles } from 'nocodb-sdk';
 import type {
   SharedViewReqType,
   UserType,
@@ -82,8 +82,9 @@ export class ViewsService {
     // todo: user roles
     //await View.list(param.tableId)
     const filteredViewList = viewList.filter((view: any) => {
-      return Object.keys(param?.user?.roles).some(
-        (role) => param?.user?.roles[role] && !view.disabled[role],
+      return Object.values(ProjectRoles).some(
+        (role) =>
+          param?.user?.['project_roles']?.[role] && !view.disabled[role],
       );
     });
 

From a310faac4d4a79b354fd002178c79f93a8fafe39 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 12:58:54 +0530
Subject: [PATCH 17/23] fix: cache acl entry on insert

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/models/ModelRoleVisibility.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/models/ModelRoleVisibility.ts b/packages/nocodb/src/models/ModelRoleVisibility.ts
index d0bfbad80f..fdfed4b27d 100644
--- a/packages/nocodb/src/models/ModelRoleVisibility.ts
+++ b/packages/nocodb/src/models/ModelRoleVisibility.ts
@@ -147,17 +147,23 @@ export default class ModelRoleVisibility implements ModelRoleVisibilityType {
       insertObj.base_id = view.base_id;
     }
 
-    await ncMeta.metaInsert2(
+    const result = await ncMeta.metaInsert2(
       null,
       null,
       MetaTable.MODEL_ROLE_VISIBILITY,
       insertObj,
     );
 
+    const key = `${CacheScope.MODEL_ROLE_VISIBILITY}:${body.fk_view_id}:${body.role}`;
+
+    insertObj.id = result.id;
+
+    await NocoCache.set(key, insertObj);
+
     await NocoCache.appendToList(
       CacheScope.MODEL_ROLE_VISIBILITY,
       [insertObj.project_id],
-      `${CacheScope.MODEL_ROLE_VISIBILITY}:${body.fk_view_id}:${body.role}`,
+      key,
     );
 
     return this.get(

From f24b8b50c92b54f31b00e6af484216aace5c60b2 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 13:38:13 +0530
Subject: [PATCH 18/23] fix: use view id when setting ui acl cache

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nocodb/src/cache/RedisCacheMgr.ts        | 2 +-
 packages/nocodb/src/cache/RedisMockCacheMgr.ts    | 2 +-
 packages/nocodb/src/models/ModelRoleVisibility.ts | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/nocodb/src/cache/RedisCacheMgr.ts b/packages/nocodb/src/cache/RedisCacheMgr.ts
index c079229a63..763ca8c9d7 100644
--- a/packages/nocodb/src/cache/RedisCacheMgr.ts
+++ b/packages/nocodb/src/cache/RedisCacheMgr.ts
@@ -178,7 +178,7 @@ export default class RedisCacheMgr extends CacheMgr {
       let getKey = `${this.prefix}:${scope}:${o.id}`;
       // special case - MODEL_ROLE_VISIBILITY
       if (scope === CacheScope.MODEL_ROLE_VISIBILITY) {
-        getKey = `${this.prefix}:${scope}:${o.id}:${o.role}`;
+        getKey = `${this.prefix}:${scope}:${o.fk_view_id}:${o.role}`;
       }
       // set Get Key
       log(`RedisCacheMgr::setList: setting key ${getKey}`);
diff --git a/packages/nocodb/src/cache/RedisMockCacheMgr.ts b/packages/nocodb/src/cache/RedisMockCacheMgr.ts
index d2105a9979..ebba8eba33 100644
--- a/packages/nocodb/src/cache/RedisMockCacheMgr.ts
+++ b/packages/nocodb/src/cache/RedisMockCacheMgr.ts
@@ -174,7 +174,7 @@ export default class RedisMockCacheMgr extends CacheMgr {
       let getKey = `${this.prefix}:${scope}:${o.id}`;
       // special case - MODEL_ROLE_VISIBILITY
       if (scope === CacheScope.MODEL_ROLE_VISIBILITY) {
-        getKey = `${this.prefix}:${scope}:${o.id}:${o.role}`;
+        getKey = `${this.prefix}:${scope}:${o.fk_view_id}:${o.role}`;
       }
       // set Get Key
       log(`RedisMockCacheMgr::setList: setting key ${getKey}`);
diff --git a/packages/nocodb/src/models/ModelRoleVisibility.ts b/packages/nocodb/src/models/ModelRoleVisibility.ts
index fdfed4b27d..67890f85f6 100644
--- a/packages/nocodb/src/models/ModelRoleVisibility.ts
+++ b/packages/nocodb/src/models/ModelRoleVisibility.ts
@@ -158,8 +158,6 @@ export default class ModelRoleVisibility implements ModelRoleVisibilityType {
 
     insertObj.id = result.id;
 
-    await NocoCache.set(key, insertObj);
-
     await NocoCache.appendToList(
       CacheScope.MODEL_ROLE_VISIBILITY,
       [insertObj.project_id],

From b11f48f1cf1b0d0832239dd924728b74b2acac69 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 14:11:05 +0530
Subject: [PATCH 19/23] fix: pass project role as owner in airtable import

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../jobs/jobs/at-import/at-import.processor.ts       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
index 914f193e4e..473c553878 100644
--- a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
@@ -745,7 +745,7 @@ export class AtImportProcessor {
               const srcTbl: any =
                 await this.tablesService.getTableWithAccessibleViews({
                   tableId: srcTableId,
-                  user: syncDB.user,
+                  user: { ...syncDB.user, project_roles: { owner: true } },
                 });
               recordPerfStats(_perfStart, 'dbTable.read');
 
@@ -829,7 +829,7 @@ export class AtImportProcessor {
               const childTblSchema: any =
                 await this.tablesService.getTableWithAccessibleViews({
                   tableId: ncLinkMappingTable[x].nc.childId,
-                  user: syncDB.user,
+                  user: { ...syncDB.user, project_roles: { owner: true } }
                 });
               recordPerfStats(_perfStart, 'dbTable.read');
 
@@ -837,7 +837,7 @@ export class AtImportProcessor {
               const parentTblSchema: any =
                 await this.tablesService.getTableWithAccessibleViews({
                   tableId: ncLinkMappingTable[x].nc.parentId,
-                  user: syncDB.user,
+                  user: { ...syncDB.user, project_roles: { owner: true } },
                 });
               recordPerfStats(_perfStart, 'dbTable.read');
 
@@ -1854,7 +1854,7 @@ export class AtImportProcessor {
       const _perfStart = recordPerfStart();
       const ncTbl: any = await this.tablesService.getTableWithAccessibleViews({
         tableId: tblId,
-        user: syncDB.user,
+        user: { ...syncDB.user, project_roles: { owner: true } },
       });
       recordPerfStats(_perfStart, 'dbTable.read');
 
@@ -2348,7 +2348,7 @@ export class AtImportProcessor {
             const ncTbl: any =
               await this.tablesService.getTableWithAccessibleViews({
                 tableId: ncTblList.list[i].id,
-                user: syncDB.user,
+                user: { ...syncDB.user, project_roles: { owner: true } },
               });
             recordPerfStats(_perfStart, 'dbTable.read');
 
@@ -2383,7 +2383,7 @@ export class AtImportProcessor {
             const ncTbl: any =
               await this.tablesService.getTableWithAccessibleViews({
                 tableId: ncTblList.list[i].id,
-                user: syncDB.user,
+                user: { ...syncDB.user, project_roles: { owner: true } },
               });
 
             rtc.data.nestedLinks += await importLTARData({

From d1e9c4261b1f4194e24a4414e158c95865082563 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 14:48:36 +0530
Subject: [PATCH 20/23] fix: airtable import corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../jobs/at-import/at-import.processor.ts     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
index 473c553878..6c7c9b260a 100644
--- a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
@@ -113,7 +113,7 @@ export class AtImportProcessor {
     await sMapEM.init();
     const userRole = syncDB.user.roles
       .split(',')
-      .reduce((rolesObj, role) => ({ [role]: true, ...rolesObj }), {});
+      .reduce((rolesObj, role) => ({ [role]: true, ...rolesObj }));
 
     const sMap = {
       // static mapping records between aTblId && ncId
@@ -666,7 +666,12 @@ export class AtImportProcessor {
         const view = { list: [] };
         view['list'] = await this.viewsService.viewList({
           tableId: table.id,
-          user: { roles: userRole },
+          user: {
+            roles: userRole,
+            project_roles: {
+              owner: true,
+            },
+          },
         });
         recordPerfStats(_perfStart, 'dbView.list');
 
@@ -829,7 +834,7 @@ export class AtImportProcessor {
               const childTblSchema: any =
                 await this.tablesService.getTableWithAccessibleViews({
                   tableId: ncLinkMappingTable[x].nc.childId,
-                  user: { ...syncDB.user, project_roles: { owner: true } }
+                  user: { ...syncDB.user, project_roles: { owner: true } },
                 });
               recordPerfStats(_perfStart, 'dbTable.read');
 
@@ -1734,7 +1739,12 @@ export class AtImportProcessor {
           const viewList = { list: [] };
           viewList['list'] = await this.viewsService.viewList({
             tableId: tblId,
-            user: { roles: userRole },
+            user: {
+              roles: userRole,
+              project_roles: {
+                owner: true,
+              },
+            },
           });
           recordPerfStats(_perfStart, 'dbView.list');
 
@@ -2328,7 +2338,7 @@ export class AtImportProcessor {
           ncTblList['list'] = await this.tablesService.getAccessibleTables({
             projectId: ncCreatedProjectSchema.id,
             baseId: syncDB.baseId,
-            roles: userRole,
+            roles: { ...userRole, owner: true },
           });
           recordPerfStats(_perfStart, 'base.tableList');
 

From fda7c43073f1705eae75baff91d7b74f8b6c9f8d Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 14:51:25 +0530
Subject: [PATCH 21/23] fix: type correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../src/modules/jobs/jobs/at-import/at-import.processor.ts      | 2 +-
 packages/nocodb/src/services/views.service.ts                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
index 6c7c9b260a..94fff49840 100644
--- a/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
+++ b/packages/nocodb/src/modules/jobs/jobs/at-import/at-import.processor.ts
@@ -1744,7 +1744,7 @@ export class AtImportProcessor {
               project_roles: {
                 owner: true,
               },
-            },
+            } as any,
           });
           recordPerfStats(_perfStart, 'dbView.list');
 
diff --git a/packages/nocodb/src/services/views.service.ts b/packages/nocodb/src/services/views.service.ts
index 88be2372c1..c021e37c70 100644
--- a/packages/nocodb/src/services/views.service.ts
+++ b/packages/nocodb/src/services/views.service.ts
@@ -70,6 +70,7 @@ export class ViewsService {
     tableId: string;
     user: {
       roles: Record<string, boolean>;
+      project_roles: Record<string, boolean>;
     };
   }) {
     const model = await Model.get(param.tableId);

From d4def66ed80a220731c6903c89aa131f6b64e114 Mon Sep 17 00:00:00 2001
From: pranavxc <pranavxc@users.noreply.github.com>
Date: Thu, 7 Sep 2023 10:05:10 +0000
Subject: [PATCH 22/23] [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>
---
 packages/nc-gui/package-lock.json | 56 ++++++++++++++++++-------------
 packages/nc-gui/package.json      |  2 +-
 packages/nc-lib-gui/package.json  |  2 +-
 packages/nocodb-sdk/package.json  |  2 +-
 packages/nocodb/package-lock.json | 52 +++++++++++++---------------
 packages/nocodb/package.json      |  6 ++--
 6 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index 6bd80b0ba3..9e56f2c68c 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -37,7 +37,7 @@
         "locale-codes": "^1.3.1",
         "monaco-editor": "^0.33.0",
         "monaco-sql-languages": "^0.11.0",
-        "nocodb-sdk": "file:../nocodb-sdk",
+        "nocodb-sdk": "0.111.2",
         "papaparse": "^5.3.2",
         "parse-github-url": "^1.0.2",
         "pinia": "^2.1.4",
@@ -130,7 +130,8 @@
       }
     },
     "../nocodb-sdk": {
-      "version": "0.111.1",
+      "version": "0.111.2",
+      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -8943,7 +8944,6 @@
       "version": "1.15.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
       "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "devOptional": true,
       "funding": [
         {
           "type": "individual",
@@ -11680,8 +11680,21 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "resolved": "../nocodb-sdk",
-      "link": true
+      "version": "0.111.2",
+      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.2.tgz",
+      "integrity": "sha512-daL3VKOzklL9AYhWfIOJeUDYUBdlPaW0xUmcCYzEJX/q/Ca3Jhk3/5o5XjJIneT11s/UaQ6dPv8boD36tEabhA==",
+      "dependencies": {
+        "axios": "^0.21.1",
+        "jsep": "^1.3.6"
+      }
+    },
+    "node_modules/nocodb-sdk/node_modules/axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
     },
     "node_modules/node-abi": {
       "version": "3.45.0",
@@ -23598,8 +23611,7 @@
     "follow-redirects": {
       "version": "1.15.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "devOptional": true
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
     "for-each": {
       "version": "0.3.3",
@@ -25619,24 +25631,22 @@
       }
     },
     "nocodb-sdk": {
-      "version": "file:../nocodb-sdk",
+      "version": "0.111.2",
+      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.2.tgz",
+      "integrity": "sha512-daL3VKOzklL9AYhWfIOJeUDYUBdlPaW0xUmcCYzEJX/q/Ca3Jhk3/5o5XjJIneT11s/UaQ6dPv8boD36tEabhA==",
       "requires": {
-        "@typescript-eslint/eslint-plugin": "^4.0.1",
-        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "cspell": "^4.1.0",
-        "eslint": "^7.8.0",
-        "eslint-config-prettier": "^6.11.0",
-        "eslint-plugin-eslint-comments": "^3.2.0",
-        "eslint-plugin-functional": "^3.0.2",
-        "eslint-plugin-import": "^2.22.0",
-        "eslint-plugin-prettier": "^4.0.0",
-        "jsep": "^1.3.6",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.1.1",
-        "rimraf": "^5.0.1",
-        "tsc-alias": "^1.8.7",
-        "typescript": "^4.7.4"
+        "jsep": "^1.3.6"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.21.4",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+          "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+          "requires": {
+            "follow-redirects": "^1.14.0"
+          }
+        }
       }
     },
     "node-abi": {
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 8ca6674267..1cf665537c 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -60,7 +60,7 @@
     "locale-codes": "^1.3.1",
     "monaco-editor": "^0.33.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "file:../nocodb-sdk",
+    "nocodb-sdk": "0.111.2",
     "papaparse": "^5.3.2",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.4",
diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json
index a490c3474e..b2f3ce853c 100644
--- a/packages/nc-lib-gui/package.json
+++ b/packages/nc-lib-gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nc-lib-gui",
-  "version": "0.111.1",
+  "version": "0.111.2",
   "description": "NocoDB GUI",
   "author": {
     "name": "NocoDB",
diff --git a/packages/nocodb-sdk/package.json b/packages/nocodb-sdk/package.json
index b69c8ad76e..048d217322 100644
--- a/packages/nocodb-sdk/package.json
+++ b/packages/nocodb-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.111.1",
+  "version": "0.111.2",
   "description": "NocoDB SDK",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index 36c3e2a559..99d9ccf213 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nocodb",
-  "version": "0.111.1",
+  "version": "0.111.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nocodb",
-      "version": "0.111.1",
+      "version": "0.111.2",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@aws-sdk/client-kafka": "^3.332.0",
@@ -93,12 +93,12 @@
         "mysql2": "^3.2.0",
         "nanoid": "^3.1.20",
         "nc-help": "0.2.92",
-        "nc-lib-gui": "0.111.1",
+        "nc-lib-gui": "0.111.2",
         "nc-plugin": "^0.1.3",
         "ncp": "^2.0.0",
         "nestjs-kafka": "^1.0.6",
         "nestjs-throttler-storage-redis": "^0.3.0",
-        "nocodb-sdk": "file:../nocodb-sdk",
+        "nocodb-sdk": "0.111.2",
         "nodemailer": "^6.4.10",
         "object-hash": "^3.0.0",
         "object-sizeof": "^2.6.1",
@@ -210,7 +210,8 @@
       }
     },
     "../nocodb-sdk": {
-      "version": "0.111.1",
+      "version": "0.111.2",
+      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -14257,9 +14258,9 @@
       }
     },
     "node_modules/nc-lib-gui": {
-      "version": "0.111.1",
-      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.111.1.tgz",
-      "integrity": "sha512-aN9wjLDxoLP2q3hyiB2zqbkLXj8Rf+mojen+AA/Wo6kFuXaB8LwLSrJpNSWrYpOJhNyBTFAm+3K1UPrOf1Te7Q==",
+      "version": "0.111.2",
+      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.111.2.tgz",
+      "integrity": "sha512-ajsnQ2pmgaJ6juytuwZMcmR4gPMmi6yupXba+QiN2sO2JcxHWhXETApLiv354vvS6adh7ePOtaYgvgA0x5hw+g==",
       "dependencies": {
         "express": "^4.17.1"
       }
@@ -14382,8 +14383,13 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "resolved": "../nocodb-sdk",
-      "link": true
+      "version": "0.111.2",
+      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.2.tgz",
+      "integrity": "sha512-daL3VKOzklL9AYhWfIOJeUDYUBdlPaW0xUmcCYzEJX/q/Ca3Jhk3/5o5XjJIneT11s/UaQ6dPv8boD36tEabhA==",
+      "dependencies": {
+        "axios": "^0.21.1",
+        "jsep": "^1.3.6"
+      }
     },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
@@ -30822,9 +30828,9 @@
       }
     },
     "nc-lib-gui": {
-      "version": "0.111.1",
-      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.111.1.tgz",
-      "integrity": "sha512-aN9wjLDxoLP2q3hyiB2zqbkLXj8Rf+mojen+AA/Wo6kFuXaB8LwLSrJpNSWrYpOJhNyBTFAm+3K1UPrOf1Te7Q==",
+      "version": "0.111.2",
+      "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.111.2.tgz",
+      "integrity": "sha512-ajsnQ2pmgaJ6juytuwZMcmR4gPMmi6yupXba+QiN2sO2JcxHWhXETApLiv354vvS6adh7ePOtaYgvgA0x5hw+g==",
       "requires": {
         "express": "^4.17.1"
       }
@@ -30902,24 +30908,12 @@
       "requires": {}
     },
     "nocodb-sdk": {
-      "version": "file:../nocodb-sdk",
+      "version": "0.111.2",
+      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.2.tgz",
+      "integrity": "sha512-daL3VKOzklL9AYhWfIOJeUDYUBdlPaW0xUmcCYzEJX/q/Ca3Jhk3/5o5XjJIneT11s/UaQ6dPv8boD36tEabhA==",
       "requires": {
-        "@typescript-eslint/eslint-plugin": "^4.0.1",
-        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "cspell": "^4.1.0",
-        "eslint": "^7.8.0",
-        "eslint-config-prettier": "^6.11.0",
-        "eslint-plugin-eslint-comments": "^3.2.0",
-        "eslint-plugin-functional": "^3.0.2",
-        "eslint-plugin-import": "^2.22.0",
-        "eslint-plugin-prettier": "^4.0.0",
-        "jsep": "^1.3.6",
-        "npm-run-all": "^4.1.5",
-        "prettier": "^2.1.1",
-        "rimraf": "^5.0.1",
-        "tsc-alias": "^1.8.7",
-        "typescript": "^4.7.4"
+        "jsep": "^1.3.6"
       }
     },
     "node-abort-controller": {
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index c804232d97..d25ff0f7ae 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nocodb",
-  "version": "0.111.1",
+  "version": "0.111.2",
   "description": "NocoDB Backend",
   "main": "dist/bundle.js",
   "author": {
@@ -126,12 +126,12 @@
     "mysql2": "^3.2.0",
     "nanoid": "^3.1.20",
     "nc-help": "0.2.92",
-    "nc-lib-gui": "0.111.1",
+    "nc-lib-gui": "0.111.2",
     "nc-plugin": "^0.1.3",
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.3.0",
-    "nocodb-sdk": "file:../nocodb-sdk",
+    "nocodb-sdk": "0.111.2",
     "nodemailer": "^6.4.10",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.1",

From 3ce6ad405aaeddae70f3c94f4f7f4c552b386ff4 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 7 Sep 2023 16:25:53 +0530
Subject: [PATCH 23/23] chore: update sdk reference

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/package-lock.json     | 54 +++++++++++----------------
 packages/nc-gui/package.json          |  2 +-
 packages/nocodb-sdk/package-lock.json |  4 +-
 packages/nocodb/package-lock.json     | 32 +++++++++-------
 packages/nocodb/package.json          |  4 +-
 5 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/packages/nc-gui/package-lock.json b/packages/nc-gui/package-lock.json
index 9e56f2c68c..5201dd68a8 100644
--- a/packages/nc-gui/package-lock.json
+++ b/packages/nc-gui/package-lock.json
@@ -37,7 +37,7 @@
         "locale-codes": "^1.3.1",
         "monaco-editor": "^0.33.0",
         "monaco-sql-languages": "^0.11.0",
-        "nocodb-sdk": "0.111.2",
+        "nocodb-sdk": "file:../nocodb-sdk",
         "papaparse": "^5.3.2",
         "parse-github-url": "^1.0.2",
         "pinia": "^2.1.4",
@@ -131,7 +131,6 @@
     },
     "../nocodb-sdk": {
       "version": "0.111.2",
-      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -8944,6 +8943,7 @@
       "version": "1.15.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
       "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "devOptional": true,
       "funding": [
         {
           "type": "individual",
@@ -11680,21 +11680,8 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "version": "0.111.2",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.2.tgz",
-      "integrity": "sha512-daL3VKOzklL9AYhWfIOJeUDYUBdlPaW0xUmcCYzEJX/q/Ca3Jhk3/5o5XjJIneT11s/UaQ6dPv8boD36tEabhA==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      }
-    },
-    "node_modules/nocodb-sdk/node_modules/axios": {
-      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-      "dependencies": {
-        "follow-redirects": "^1.14.0"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
     },
     "node_modules/node-abi": {
       "version": "3.45.0",
@@ -23611,7 +23598,8 @@
     "follow-redirects": {
       "version": "1.15.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "devOptional": true
     },
     "for-each": {
       "version": "0.3.3",
@@ -25631,22 +25619,24 @@
       }
     },
     "nocodb-sdk": {
-      "version": "0.111.2",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.2.tgz",
-      "integrity": "sha512-daL3VKOzklL9AYhWfIOJeUDYUBdlPaW0xUmcCYzEJX/q/Ca3Jhk3/5o5XjJIneT11s/UaQ6dPv8boD36tEabhA==",
+      "version": "file:../nocodb-sdk",
       "requires": {
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.21.4",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-          "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
-          "requires": {
-            "follow-redirects": "^1.14.0"
-          }
-        }
+        "cspell": "^4.1.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^2.1.1",
+        "rimraf": "^5.0.1",
+        "tsc-alias": "^1.8.7",
+        "typescript": "^4.7.4"
       }
     },
     "node-abi": {
diff --git a/packages/nc-gui/package.json b/packages/nc-gui/package.json
index 1cf665537c..8ca6674267 100644
--- a/packages/nc-gui/package.json
+++ b/packages/nc-gui/package.json
@@ -60,7 +60,7 @@
     "locale-codes": "^1.3.1",
     "monaco-editor": "^0.33.0",
     "monaco-sql-languages": "^0.11.0",
-    "nocodb-sdk": "0.111.2",
+    "nocodb-sdk": "file:../nocodb-sdk",
     "papaparse": "^5.3.2",
     "parse-github-url": "^1.0.2",
     "pinia": "^2.1.4",
diff --git a/packages/nocodb-sdk/package-lock.json b/packages/nocodb-sdk/package-lock.json
index 9aa87deff5..8f349820d0 100644
--- a/packages/nocodb-sdk/package-lock.json
+++ b/packages/nocodb-sdk/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "nocodb-sdk",
-  "version": "0.111.0",
+  "version": "0.111.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "nocodb-sdk",
-      "version": "0.111.0",
+      "version": "0.111.2",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json
index 99d9ccf213..ba465660aa 100644
--- a/packages/nocodb/package-lock.json
+++ b/packages/nocodb/package-lock.json
@@ -98,7 +98,7 @@
         "ncp": "^2.0.0",
         "nestjs-kafka": "^1.0.6",
         "nestjs-throttler-storage-redis": "^0.3.0",
-        "nocodb-sdk": "0.111.2",
+        "nocodb-sdk": "file:../nocodb-sdk",
         "nodemailer": "^6.4.10",
         "object-hash": "^3.0.0",
         "object-sizeof": "^2.6.1",
@@ -211,7 +211,6 @@
     },
     "../nocodb-sdk": {
       "version": "0.111.2",
-      "extraneous": true,
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "axios": "^0.21.1",
@@ -14383,13 +14382,8 @@
       }
     },
     "node_modules/nocodb-sdk": {
-      "version": "0.111.2",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.2.tgz",
-      "integrity": "sha512-daL3VKOzklL9AYhWfIOJeUDYUBdlPaW0xUmcCYzEJX/q/Ca3Jhk3/5o5XjJIneT11s/UaQ6dPv8boD36tEabhA==",
-      "dependencies": {
-        "axios": "^0.21.1",
-        "jsep": "^1.3.6"
-      }
+      "resolved": "../nocodb-sdk",
+      "link": true
     },
     "node_modules/node-abort-controller": {
       "version": "3.1.1",
@@ -30908,12 +30902,24 @@
       "requires": {}
     },
     "nocodb-sdk": {
-      "version": "0.111.2",
-      "resolved": "https://registry.npmjs.org/nocodb-sdk/-/nocodb-sdk-0.111.2.tgz",
-      "integrity": "sha512-daL3VKOzklL9AYhWfIOJeUDYUBdlPaW0xUmcCYzEJX/q/Ca3Jhk3/5o5XjJIneT11s/UaQ6dPv8boD36tEabhA==",
+      "version": "file:../nocodb-sdk",
       "requires": {
+        "@typescript-eslint/eslint-plugin": "^4.0.1",
+        "@typescript-eslint/parser": "^4.0.1",
         "axios": "^0.21.1",
-        "jsep": "^1.3.6"
+        "cspell": "^4.1.0",
+        "eslint": "^7.8.0",
+        "eslint-config-prettier": "^6.11.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-functional": "^3.0.2",
+        "eslint-plugin-import": "^2.22.0",
+        "eslint-plugin-prettier": "^4.0.0",
+        "jsep": "^1.3.6",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^2.1.1",
+        "rimraf": "^5.0.1",
+        "tsc-alias": "^1.8.7",
+        "typescript": "^4.7.4"
       }
     },
     "node-abort-controller": {
diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json
index d25ff0f7ae..2bffa6bbba 100644
--- a/packages/nocodb/package.json
+++ b/packages/nocodb/package.json
@@ -131,7 +131,7 @@
     "ncp": "^2.0.0",
     "nestjs-kafka": "^1.0.6",
     "nestjs-throttler-storage-redis": "^0.3.0",
-    "nocodb-sdk": "0.111.2",
+    "nocodb-sdk": "file:../nocodb-sdk",
     "nodemailer": "^6.4.10",
     "object-hash": "^3.0.0",
     "object-sizeof": "^2.6.1",
@@ -223,4 +223,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
\ No newline at end of file
+}