From fcfab0199518f5cab448a4969afabd08bef59bd5 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:32:09 +0200
Subject: [PATCH 1/4] chore(nc-gui): fix types and cleanup unused vars

---
 packages/nc-gui/components/cell/MultiSelect.vue        | 10 ++++++++--
 packages/nc-gui/components/cell/TextArea.vue           |  2 +-
 packages/nc-gui/components/general/ShareBaseButton.vue |  2 +-
 packages/nc-gui/components/shared-view/Grid.vue        |  2 +-
 .../smartsheet/sidebar/toolbar/DebugMeta.vue           |  6 +++++-
 .../smartsheet/sidebar/toolbar/DeleteTable.vue         |  4 ++--
 .../components/smartsheet/toolbar/ColumnFilter.vue     |  7 +++++--
 packages/nc-gui/lib/types.ts                           |  7 ++++++-
 packages/nc-gui/utils/viewUtils.ts                     |  2 +-
 9 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index 9c832e9fd3..036ec8dd3d 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -56,8 +56,14 @@ const options = computed<SelectOptionType[]>(() => {
   return []
 })
 
-const vModel = computed({
-  get: () => selectedIds.value.map((el) => options.value.find((op) => op.id === el)?.title) as string[],
+const vModel = computed<string[]>({
+  get: () => selectedIds.value.flatMap((el) => {
+    const title = options.value.find((op) => op.id === el)?.title
+
+    if (title) return [title]
+
+    return [] as string[]
+  }) || [] as string[],
   set: (val) => emit('update:modelValue', val.length === 0 ? null : val.join(',')),
 })
 
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index db3b054bcf..ba76067e5e 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -3,7 +3,7 @@ import type { VNodeRef } from '@vue/runtime-core'
 import { EditModeInj, inject, useVModel } from '#imports'
 
 const props = defineProps<{
-  modelValue?: string | null
+  modelValue?: string
 }>()
 
 const emits = defineEmits(['update:modelValue'])
diff --git a/packages/nc-gui/components/general/ShareBaseButton.vue b/packages/nc-gui/components/general/ShareBaseButton.vue
index b2909677a5..833f0ce511 100644
--- a/packages/nc-gui/components/general/ShareBaseButton.vue
+++ b/packages/nc-gui/components/general/ShareBaseButton.vue
@@ -26,6 +26,6 @@ const { isUIAllowed } = useUIPermission()
       </div>
     </div>
 
-    <LazyTabsAuthUserManagementUsersModal :key="showUserModal" :show="showUserModal" @closed="showUserModal = false" />
+    <LazyTabsAuthUserManagementUsersModal :show="showUserModal" @closed="showUserModal = false" />
   </div>
 </template>
diff --git a/packages/nc-gui/components/shared-view/Grid.vue b/packages/nc-gui/components/shared-view/Grid.vue
index db803fbf24..2d51c958a8 100644
--- a/packages/nc-gui/components/shared-view/Grid.vue
+++ b/packages/nc-gui/components/shared-view/Grid.vue
@@ -21,7 +21,7 @@ const { sharedView, meta, sorts, nestedFilters } = useSharedView()
 
 const { signedIn } = useGlobal()
 
-const { loadProject } = useProject(meta.value?.project_id)
+const { loadProject } = useProject()
 
 useProvideSmartsheetStore(sharedView, meta, true, sorts, nestedFilters)
 
diff --git a/packages/nc-gui/components/smartsheet/sidebar/toolbar/DebugMeta.vue b/packages/nc-gui/components/smartsheet/sidebar/toolbar/DebugMeta.vue
index 8a39e57ffd..41b4e8aaa0 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/toolbar/DebugMeta.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/toolbar/DebugMeta.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { computed, ref, useMetas, useTable } from '#imports'
+
 const editorOpen = ref(false)
 
 const tabKey = ref()
@@ -7,7 +9,9 @@ const { metas } = $(useMetas())
 
 const { tables } = useTable()
 
-const localTables = tables.value.filter((t) => metas[t.id as string])
+const localTables = computed(
+  () => tables.value.filter((t) => metas[t.id as string]) as (typeof tables.value[number] & { id: string })[],
+)
 </script>
 
 <template>
diff --git a/packages/nc-gui/components/smartsheet/sidebar/toolbar/DeleteTable.vue b/packages/nc-gui/components/smartsheet/sidebar/toolbar/DeleteTable.vue
index f360d91e7d..0c8e95e500 100644
--- a/packages/nc-gui/components/smartsheet/sidebar/toolbar/DeleteTable.vue
+++ b/packages/nc-gui/components/smartsheet/sidebar/toolbar/DeleteTable.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { MetaInj, inject, ref, useSidebar, useTable } from '#imports'
+import { MetaInj, inject, useSidebar, useTable } from '#imports'
 
-const meta = inject(MetaInj, ref())
+const meta = inject(MetaInj)!
 
 const { deleteTable } = useTable()
 
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
index 77bc93b27a..1ba631f925 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
@@ -215,10 +215,13 @@ defineExpose({
               </a-select-option>
             </a-select>
 
-            <span v-if="['null', 'notnull', 'empty', 'notempty'].includes(filter.comparison_op)" :key="`span${i}`" />
+            <span
+              v-if="filter.comparison_op && ['null', 'notnull', 'empty', 'notempty'].includes(filter.comparison_op)"
+              :key="`span${i}`"
+            />
 
             <a-checkbox
-              v-else-if="types[filter.field] === 'boolean'"
+              v-else-if="filter.field && types[filter.field] === 'boolean'"
               v-model:checked="filter.value"
               dense
               :disabled="filter.readOnly"
diff --git a/packages/nc-gui/lib/types.ts b/packages/nc-gui/lib/types.ts
index 0b15ea339a..5ec2511ff1 100644
--- a/packages/nc-gui/lib/types.ts
+++ b/packages/nc-gui/lib/types.ts
@@ -35,7 +35,12 @@ export interface Field {
 
 export type Roles<T extends Role | ProjectRole = Role | ProjectRole> = Record<T | string, boolean>
 
-export type Filter = FilterType & { status?: 'update' | 'delete' | 'create'; parentId?: string; readOnly?: boolean }
+export type Filter = FilterType & {
+  field?: string
+  status?: 'update' | 'delete' | 'create'
+  parentId?: string
+  readOnly?: boolean
+}
 
 export type NocoI18n = I18n<{}, unknown, unknown, string, false>
 
diff --git a/packages/nc-gui/utils/viewUtils.ts b/packages/nc-gui/utils/viewUtils.ts
index a0151f94b3..ad5ad1c60d 100644
--- a/packages/nc-gui/utils/viewUtils.ts
+++ b/packages/nc-gui/utils/viewUtils.ts
@@ -8,7 +8,7 @@ import MdiGalleryIcon from '~icons/mdi/camera-image'
 import MdiKanbanIcon from '~icons/mdi/tablet-dashboard'
 import MdiEyeIcon from '~icons/mdi/eye-circle-outline'
 
-export const viewIcons = {
+export const viewIcons: Record<number | string, { icon: any; color: string }> = {
   [ViewTypes.GRID]: { icon: MdiGridIcon, color: '#8f96f2' },
   [ViewTypes.FORM]: { icon: MdiFormIcon, color: themeV2Colors.pink['500'] },
   calendar: { icon: MdiCalendarIcon, color: 'purple' },

From 282d48124477d01d6ceca40c72d31aba1ee4af99 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Wed, 5 Oct 2022 00:11:59 +0200
Subject: [PATCH 2/4] chore(nc-gui): integer prop type

---
 packages/nc-gui/components/cell/Integer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index f89e1d1ebc..e29f8e0903 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -3,7 +3,7 @@ import type { VNodeRef } from '@vue/runtime-core'
 import { EditModeInj, inject, useVModel } from '#imports'
 
 interface Props {
-  modelValue: number | null | undefined
+  modelValue?: number
 }
 
 interface Emits {

From 4df9f2a0c198d428ed36730de4e67d0b7b2918a3 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 13 Oct 2022 13:16:57 +0200
Subject: [PATCH 3/4] chore(nc-gui): lint

---
 packages/nc-gui/components/cell/MultiSelect.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/nc-gui/components/cell/MultiSelect.vue b/packages/nc-gui/components/cell/MultiSelect.vue
index 036ec8dd3d..a5cc692556 100644
--- a/packages/nc-gui/components/cell/MultiSelect.vue
+++ b/packages/nc-gui/components/cell/MultiSelect.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import tinycolor from 'tinycolor2'
 import type { Select as AntSelect } from 'ant-design-vue'
-import { SelectOptionType } from 'nocodb-sdk'
-import type { SelectOptionsType } from 'nocodb-sdk'
+import type { SelectOptionType, SelectOptionsType } from 'nocodb-sdk'
 import {
   ActiveCellInj,
   ColumnInj,
@@ -56,14 +55,15 @@ const options = computed<SelectOptionType[]>(() => {
   return []
 })
 
-const vModel = computed<string[]>({
-  get: () => selectedIds.value.flatMap((el) => {
-    const title = options.value.find((op) => op.id === el)?.title
+const vModel = computed({
+  get: () =>
+    selectedIds.value.reduce((acc, id) => {
+      const title = options.value.find((op) => op.id === id)?.title
 
-    if (title) return [title]
+      if (title) acc.push(title)
 
-    return [] as string[]
-  }) || [] as string[],
+      return acc
+    }, [] as string[]),
   set: (val) => emit('update:modelValue', val.length === 0 ? null : val.join(',')),
 })
 

From 3631aa1b7e64b295ff7cc83eb170cafa1d7006d3 Mon Sep 17 00:00:00 2001
From: braks <78412429+bcakmakoglu@users.noreply.github.com>
Date: Thu, 13 Oct 2022 16:38:02 +0200
Subject: [PATCH 4/4] chore(nc-gui): correct prop types

---
 packages/nc-gui/components/cell/Decimal.vue  | 2 +-
 packages/nc-gui/components/cell/Float.vue    | 2 +-
 packages/nc-gui/components/cell/Integer.vue  | 2 +-
 packages/nc-gui/components/cell/Percent.vue  | 2 +-
 packages/nc-gui/components/cell/TextArea.vue | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/Decimal.vue b/packages/nc-gui/components/cell/Decimal.vue
index 9ba13183c1..9581665304 100644
--- a/packages/nc-gui/components/cell/Decimal.vue
+++ b/packages/nc-gui/components/cell/Decimal.vue
@@ -3,7 +3,7 @@ import type { VNodeRef } from '@vue/runtime-core'
 import { EditModeInj, inject, useVModel } from '#imports'
 
 interface Props {
-  modelValue: number | null | string | undefined
+  modelValue?: number | null | string
 }
 
 interface Emits {
diff --git a/packages/nc-gui/components/cell/Float.vue b/packages/nc-gui/components/cell/Float.vue
index 20d55cdb30..111f7beb72 100644
--- a/packages/nc-gui/components/cell/Float.vue
+++ b/packages/nc-gui/components/cell/Float.vue
@@ -3,7 +3,7 @@ import type { VNodeRef } from '@vue/runtime-core'
 import { EditModeInj, inject, useVModel } from '#imports'
 
 interface Props {
-  modelValue: number | null | undefined
+  modelValue?: number | null
 }
 
 interface Emits {
diff --git a/packages/nc-gui/components/cell/Integer.vue b/packages/nc-gui/components/cell/Integer.vue
index e29f8e0903..63c15a5546 100644
--- a/packages/nc-gui/components/cell/Integer.vue
+++ b/packages/nc-gui/components/cell/Integer.vue
@@ -3,7 +3,7 @@ import type { VNodeRef } from '@vue/runtime-core'
 import { EditModeInj, inject, useVModel } from '#imports'
 
 interface Props {
-  modelValue?: number
+  modelValue?: number | null
 }
 
 interface Emits {
diff --git a/packages/nc-gui/components/cell/Percent.vue b/packages/nc-gui/components/cell/Percent.vue
index d9fe77c127..2af77d9095 100644
--- a/packages/nc-gui/components/cell/Percent.vue
+++ b/packages/nc-gui/components/cell/Percent.vue
@@ -2,7 +2,7 @@
 import { EditModeInj, inject, useVModel } from '#imports'
 
 interface Props {
-  modelValue: number | string | null | undefined
+  modelValue?: number | string | null
 }
 
 const props = defineProps<Props>()
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index ba76067e5e..db3b054bcf 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -3,7 +3,7 @@ import type { VNodeRef } from '@vue/runtime-core'
 import { EditModeInj, inject, useVModel } from '#imports'
 
 const props = defineProps<{
-  modelValue?: string
+  modelValue?: string | null
 }>()
 
 const emits = defineEmits(['update:modelValue'])