From 2de23bde9b9ffca19e0a9c4e8e379f67cd261500 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:12 +0000
Subject: [PATCH 01/20] fix(nc-gui): invalid prop type check failed for prop
 `direction`

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

diff --git a/packages/nc-gui/components/account/UserMenu.vue b/packages/nc-gui/components/account/UserMenu.vue
index f125eeae3b..7fb5e180aa 100644
--- a/packages/nc-gui/components/account/UserMenu.vue
+++ b/packages/nc-gui/components/account/UserMenu.vue
@@ -4,7 +4,7 @@ import type { UsersSortType } from '~/lib'
 
 const { field, direction, handleUserSort } = defineProps<{
   field: UsersSortType['field']
-  direction: UsersSortType['direction']
+  direction?: UsersSortType['direction']
   handleUserSort: Function
 }>()
 

From e27be408b4070646205b4eec559443fdeed6fa34 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:12 +0000
Subject: [PATCH 02/20] fix(nc-gui): Property `workspaceRole` was accessed
 during render but is not defined on instance

---
 packages/nc-gui/components/workspace/CollaboratorsList.vue | 2 +-
 packages/nc-gui/store/workspace.ts                         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index f40602c2d2..4815dcb5df 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -8,7 +8,7 @@ const workspaceStore = useWorkspace()
 
 const { removeCollaborator, updateCollaborator: _updateCollaborator } = workspaceStore
 
-const { collaborators } = storeToRefs(workspaceStore)
+const { collaborators, workspaceRole } = storeToRefs(workspaceStore)
 
 const { sorts, sortDirection, loadSorts, saveOrUpdate, handleGetSortedData } = useUserSorts('Workspace')
 
diff --git a/packages/nc-gui/store/workspace.ts b/packages/nc-gui/store/workspace.ts
index 36f6d1df16..3d5751c8c2 100644
--- a/packages/nc-gui/store/workspace.ts
+++ b/packages/nc-gui/store/workspace.ts
@@ -48,6 +48,8 @@ export const useWorkspace = defineStore('workspaceStore', () => {
     return { id: 'default', title: 'default', meta: {}, roles: '' } as any
   })
 
+  const workspaceRole = computed(() => activeWorkspace.value?.roles)
+
   const activeWorkspaceMeta = computed<Record<string, any>>(() => {
     const defaultMeta = {}
     if (!activeWorkspace.value) return defaultMeta
@@ -253,6 +255,7 @@ export const useWorkspace = defineStore('workspaceStore', () => {
     isWorkspaceSettingsPageOpened,
     workspaceUserCount,
     getPlanLimit,
+    workspaceRole,
   }
 })
 

From 5569ff9fb75c58218cfbf555de30e7d02ef64b1a Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:12 +0000
Subject: [PATCH 03/20] fix(nc-gui): Failed to resolve component - Empty

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

diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index fa0516e241..9b004a550c 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -172,7 +172,7 @@ watch(isInviteModalVisible, () => {
         v-else-if="!filteredCollaborators?.length"
         class="nc-collaborators-list w-full h-full flex flex-col items-center justify-center mt-36"
       >
-        <Empty description="$t('title.noMembersFound')" />
+        <a-empty description="$t('title.noMembersFound')" />
       </div>
       <div v-else class="nc-collaborators-list mt-6 h-full">
         <div class="flex flex-col rounded-lg overflow-hidden border-1 max-w-350 max-h-[calc(100%-8rem)]">

From 33d8cba0259ed950ed2d347a012cb7ebbd704e15 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 04/20] fix(nc-gui): rich text switch input warnings

---
 packages/nc-gui/components/nc/Switch.vue                    | 6 ++++--
 .../nc-gui/components/smartsheet/column/LongTextOptions.vue | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/nc/Switch.vue b/packages/nc-gui/components/nc/Switch.vue
index 7551b87b83..9f50ce0d38 100644
--- a/packages/nc-gui/components/nc/Switch.vue
+++ b/packages/nc-gui/components/nc/Switch.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
-const props = defineProps<{ checked: boolean; disabled?: boolean }>()
+const props = withDefaults(defineProps<{ checked: boolean; disabled?: boolean; size?: 'default' | 'small' }>(), {
+  size: 'small',
+})
 
 const emit = defineEmits(['change', 'update:checked'])
 
@@ -11,7 +13,7 @@ const onChange = (e: boolean) => {
 </script>
 
 <template>
-  <a-switch v-model:checked="checked" :disabled="props.disabled" class="nc-switch" size="small" @change="onChange"> </a-switch>
+  <a-switch v-model:checked="checked" :disabled="disabled" class="nc-switch" :size="size" @change="onChange"> </a-switch>
   <span v-if="$slots.default" class="cursor-pointer pl-2" @click="checked = !checked">
     <slot />
   </span>
diff --git a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
index 0c506fb002..1e56b6c5d2 100644
--- a/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LongTextOptions.vue
@@ -12,7 +12,7 @@ const emit = defineEmits(['update:value'])
 const vModel = useVModel(props, 'value', emit)
 
 const richMode = computed({
-  get: () => vModel.value.meta?.richMode,
+  get: () => !!vModel.value.meta?.richMode,
   set: (value) => {
     if (!vModel.value.meta) vModel.value.meta = {}
 
@@ -29,7 +29,7 @@ watch(richMode, () => {
   <div class="flex flex-col mt-2 gap-2">
     <a-form-item>
       <div class="flex flex-row items-center">
-        <NcSwitch v-model:checked="richMode" :name="$t('labels.enableRichText')" size="small">
+        <NcSwitch v-model:checked="richMode">
           <div class="text-xs">{{ $t('labels.enableRichText') }}</div>
         </NcSwitch>
       </div>

From d0790d329de9a817c1f08479ae70cf1f650c423c Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 05/20] fix(nc-gui): Invalid prop: type check failed for prop
 "gutter"

---
 .../nc-gui/components/smartsheet/column/AttachmentOptions.vue   | 2 +-
 .../nc-gui/components/smartsheet/column/CurrencyOptions.vue     | 2 +-
 packages/nc-gui/components/smartsheet/column/LinkOptions.vue    | 2 +-
 .../nc-gui/components/smartsheet/column/PgBinaryOptions.vue     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue b/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue
index 7dd3884cb7..414849058e 100644
--- a/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/AttachmentOptions.vue
@@ -82,7 +82,7 @@ watch(searchValue, (value) => {
 </script>
 
 <template>
-  <a-row class="my-2" gutter="8">
+  <a-row class="my-2" :gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.maxNumberOfAttachments']" label="Max Number of Attachments">
         <a-input-number v-model:value="vModel.meta.maxNumberOfAttachments" :min="1" class="!w-full nc-attachment-max-count" />
diff --git a/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue b/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
index 24b72e5924..bd326156d9 100644
--- a/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/CurrencyOptions.vue
@@ -77,7 +77,7 @@ currencyLocales().then((locales) => {
 </script>
 
 <template>
-  <a-row gutter="8">
+  <a-row :gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.currency_locale']" :label="$t('title.currencyLocale')">
         <a-select
diff --git a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
index 195f36c017..2847e352a5 100644
--- a/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/LinkOptions.vue
@@ -49,7 +49,7 @@ vModel.value.meta = {
 </script>
 
 <template>
-  <a-row class="my-2" gutter="8">
+  <a-row class="my-2" :gutter="8">
     <a-col :span="12">
       <a-form-item v-bind="validateInfos['meta.singular']" :label="$t('labels.singularLabel')">
         <a-input
diff --git a/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue b/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
index 925ac2a00a..b1696cdd35 100644
--- a/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/PgBinaryOptions.vue
@@ -21,7 +21,7 @@ vModel.value.meta = {
 </script>
 
 <template>
-  <a-row class="my-2" gutter="8">
+  <a-row class="my-2" :gutter="8">
     <a-col :span="24">
       <a-form-item v-bind="validateInfos['meta.format']" :label="$t('labels.binaryEncodingFormat')">
         <a-select

From 747ff6652842e1ff5e2546824bdfb4eebe2f5dd7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 06/20] fix(nc-gui): Invalid prop: type check failed for prop
 "value". Expected Number with value 0, got String with value "0"

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

diff --git a/packages/nc-gui/components/cell/Rating.vue b/packages/nc-gui/components/cell/Rating.vue
index 8d4553b081..fdba44d773 100644
--- a/packages/nc-gui/components/cell/Rating.vue
+++ b/packages/nc-gui/components/cell/Rating.vue
@@ -37,7 +37,7 @@ const ratingMeta = computed(() => {
 })
 
 const vModel = computed({
-  get: () => modelValue ?? NaN,
+  get: () => Number(modelValue),
   set: (val) => emits('update:modelValue', val),
 })
 

From 642d5ed61fd8f762f7884d0908d7d30c693dc021 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 07/20] fix(nc-gui): Missing required prop: "isEdit"

---
 packages/nc-gui/components/smartsheet/column/PercentOptions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/column/PercentOptions.vue b/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
index ef0108e3a7..485d484803 100644
--- a/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/PercentOptions.vue
@@ -3,7 +3,7 @@ import { useVModel } from '#imports'
 
 const props = defineProps<{
   value: any
-  isEdit: boolean
+  isEdit?: boolean
 }>()
 
 const emit = defineEmits(['update:value'])

From 5e0c842ae33479a4fd147ac7c6b936a638b8d9c0 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 08/20] fix(nc-gui): monaco editor, Invalid prop: type check
 failed for prop "modelValue"

---
 packages/nc-gui/components/monaco/Editor.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 706f700e9a..66420b4bfb 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -16,6 +16,7 @@ interface Props {
 }
 
 const props = withDefaults(defineProps<Props>(), {
+  modelValue: '',
   lang: 'json',
   validate: true,
   disableDeepCompare: false,
@@ -24,7 +25,9 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emits = defineEmits(['update:modelValue'])
 
-const { hideMinimap, lang, validate, disableDeepCompare, modelValue, readOnly, autoFocus } = props
+const { modelValue } = toRefs(props)
+
+const { hideMinimap, lang, validate, disableDeepCompare, readOnly, autoFocus } = props
 
 const vModel = computed<string>({
   get: () => {

From 67801754c0ac6d1a265bd95308666ec0b04f4999 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 09/20] fix(nc-gui): some browser console warnings

---
 packages/nc-gui/components/account/Profile.vue    |  2 +-
 packages/nc-gui/components/account/Token.vue      |  6 +++---
 packages/nc-gui/components/account/UserList.vue   |  4 ++--
 packages/nc-gui/components/nc/Switch.vue          |  3 ++-
 .../nc-gui/components/project/AccessSettings.vue  |  2 +-
 packages/nc-gui/components/roles/Selector.vue     |  4 ++--
 packages/nc-gui/components/smartsheet/Form.vue    |  2 +-
 .../smartsheet/toolbar/ViewActionMenu.vue         | 15 ++++++++++-----
 .../components/workspace/CollaboratorsList.vue    |  2 +-
 .../nc-gui/components/workspace/InviteSection.vue |  2 +-
 10 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/packages/nc-gui/components/account/Profile.vue b/packages/nc-gui/components/account/Profile.vue
index 30fbc61c7d..8aeaed23a5 100644
--- a/packages/nc-gui/components/account/Profile.vue
+++ b/packages/nc-gui/components/account/Profile.vue
@@ -94,7 +94,7 @@ const onValidate = async (_: any, valid: boolean) => {
             <a-input
               v-model:value="email"
               class="w-full !rounded-md !py-1.5"
-              :placeholder="$t('general.email')"
+              :placeholder="$t('labels.email')"
               disabled
               data-testid="nc-account-settings-email-input"
             />
diff --git a/packages/nc-gui/components/account/Token.vue b/packages/nc-gui/components/account/Token.vue
index 9c3d612fb0..70ede150e8 100644
--- a/packages/nc-gui/components/account/Token.vue
+++ b/packages/nc-gui/components/account/Token.vue
@@ -312,17 +312,17 @@ const handleCancel = () => {
               class="flex pl-5 py-3 justify-between token items-center border-l-1 border-r-1 border-b-1"
             >
               <span class="text-black font-bold text-3.5 text-start w-2/9">
-                <GeneralTruncateText placement="top" length="20">
+                <GeneralTruncateText placement="top" :length="20">
                   {{ el.description }}
                 </GeneralTruncateText>
               </span>
               <span class="text-gray-500 font-medium text-3.5 text-start w-2/9">
-                <GeneralTruncateText placement="top" length="20">
+                <GeneralTruncateText placement="top" :length="20">
                   {{ el.created_by }}
                 </GeneralTruncateText>
               </span>
               <span class="text-gray-500 font-medium text-3.5 text-start w-3/9">
-                <GeneralTruncateText v-if="el.token === selectedToken.id && selectedToken.isShow" placement="top" length="29">
+                <GeneralTruncateText v-if="el.token === selectedToken.id && selectedToken.isShow" placement="top" :length="29">
                   {{ el.token }}
                 </GeneralTruncateText>
                 <span v-else>************************************</span>
diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue
index 410e23e820..87458a8467 100644
--- a/packages/nc-gui/components/account/UserList.vue
+++ b/packages/nc-gui/components/account/UserList.vue
@@ -239,11 +239,11 @@ const openDeleteModal = (user: UserType) => {
                 <template #title>
                   {{ el.email }}
                 </template>
-                <GeneralTruncateText length="29">
+                <GeneralTruncateText :length="29">
                   {{ el.display_name }}
                 </GeneralTruncateText>
               </NcTooltip>
-              <GeneralTruncateText v-else length="29">
+              <GeneralTruncateText v-else :length="29">
                 {{ el.email }}
               </GeneralTruncateText>
             </div>
diff --git a/packages/nc-gui/components/nc/Switch.vue b/packages/nc-gui/components/nc/Switch.vue
index 9f50ce0d38..f5d9af077e 100644
--- a/packages/nc-gui/components/nc/Switch.vue
+++ b/packages/nc-gui/components/nc/Switch.vue
@@ -13,7 +13,8 @@ const onChange = (e: boolean) => {
 </script>
 
 <template>
-  <a-switch v-model:checked="checked" :disabled="disabled" class="nc-switch" :size="size" @change="onChange"> </a-switch>
+  <a-switch v-model:checked="checked" :disabled="disabled" class="nc-switch" v-bind="$attrs" :size="size" @change="onChange">
+  </a-switch>
   <span v-if="$slots.default" class="cursor-pointer pl-2" @click="checked = !checked">
     <slot />
   </span>
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 9b004a550c..6c5b16f420 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -224,7 +224,7 @@ watch(isInviteModalVisible, () => {
                         : null
                     "
                     :description="false"
-                    :on-role-change="(role: ProjectRoles) => updateCollaborator(collab, role)"
+                    :on-role-change="(role) => updateCollaborator(collab, role as ProjectRoles)"
                   />
                 </template>
                 <template v-else>
diff --git a/packages/nc-gui/components/roles/Selector.vue b/packages/nc-gui/components/roles/Selector.vue
index 79308fb1ef..f3ba95290e 100644
--- a/packages/nc-gui/components/roles/Selector.vue
+++ b/packages/nc-gui/components/roles/Selector.vue
@@ -11,7 +11,7 @@ const props = withDefaults(
     description?: boolean
     inherit?: string
     onRoleChange: (role: keyof typeof RoleLabels) => void
-    size: 'sm' | 'md' | 'lg'
+    size?: 'sm' | 'md' | 'lg'
   }>(),
   {
     description: true,
@@ -38,7 +38,7 @@ function onChangeRole(val: SelectValue) {
   <div ref="dropdownRef" size="lg" class="nc-roles-selector relative" @click="isDropdownOpen = !isDropdownOpen">
     <RolesBadge data-testid="roles" :role="roleRef" :inherit="inheritRef === role" :size="sizeRef" clickable />
     <a-select
-      v-model:value="roleRef"
+      :value="roleRef"
       :open="isDropdownOpen"
       :dropdown-match-select-width="false"
       dropdown-class-name="!rounded-lg !h-fit max-w-[350px] nc-role-selector-dropdown"
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 59ad63bfa0..33b6c275cf 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -456,7 +456,7 @@ async function submitCallback() {
 }
 
 const updateColMeta = useDebounceFn(async (col: Record<string, any>) => {
-  if (col.id) {
+  if (col.id && isEditable) {
     try {
       await $api.dbView.formColumnUpdate(col.id, col)
     } catch (e: any) {
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
index b171b0c9c1..65a0efd5bc 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
@@ -3,11 +3,16 @@ import type { TableType, ViewType } from 'nocodb-sdk'
 import { ViewTypes } from 'nocodb-sdk'
 import { LockType } from '~/lib'
 
-const props = defineProps<{
-  view: ViewType
-  table: TableType
-  inSidebar: boolean
-}>()
+const props = withDefaults(
+  defineProps<{
+    view: ViewType
+    table: TableType
+    inSidebar?: boolean
+  }>(),
+  {
+    inSidebar: false,
+  },
+)
 
 const emits = defineEmits(['rename', 'closeModal', 'delete'])
 
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 4815dcb5df..32292bdd62 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -118,7 +118,7 @@ onMounted(async () => {
                     :roles="accessibleRoles"
                     :description="false"
                     class="cursor-pointer"
-                    :on-role-change="(role: WorkspaceUserRoles) => updateCollaborator(collab, role)"
+                    :on-role-change="(role) => updateCollaborator(collab, role as WorkspaceUserRoles)"
                   />
                 </div>
               </template>
diff --git a/packages/nc-gui/components/workspace/InviteSection.vue b/packages/nc-gui/components/workspace/InviteSection.vue
index 0f88e387ed..6b8ab2710d 100644
--- a/packages/nc-gui/components/workspace/InviteSection.vue
+++ b/packages/nc-gui/components/workspace/InviteSection.vue
@@ -242,7 +242,7 @@ const onPaste = (e: ClipboardEvent) => {
         class="px-1 min-w-[152px] nc-invite-role-selector"
         :role="inviteData.roles"
         :roles="allowedRoles"
-        :on-role-change="(role: WorkspaceUserRoles) => (inviteData.roles = role)"
+        :on-role-change="(role) => (inviteData.roles = role as WorkspaceUserRoles)"
         :description="true"
       />
 

From c01458ee5171803815d93f14e0b134c7339be140 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH 10/20] fix(nc-gui): pr review changes

---
 packages/nc-gui/components/monaco/Editor.vue | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 66420b4bfb..49831adebf 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -15,20 +15,18 @@ interface Props {
   autoFocus?: boolean
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  modelValue: '',
-  lang: 'json',
-  validate: true,
-  disableDeepCompare: false,
-  autoFocus: true,
-})
+const {
+  hideMinimap,
+  lang = 'json',
+  validate = true,
+  disableDeepCompare = false,
+  readOnly,
+  autoFocus = true,
+  modelValue = '',
+} = defineProps<Props>()
 
 const emits = defineEmits(['update:modelValue'])
 
-const { modelValue } = toRefs(props)
-
-const { hideMinimap, lang, validate, disableDeepCompare, readOnly, autoFocus } = props
-
 const vModel = computed<string>({
   get: () => {
     if (typeof modelValue === 'object') {

From 5695241e59c317e1bf1212d3004042f444fdf7cc Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 11/20] fix(nc-gui): Type '"sm"' is not assignable to type
 'NcButtonSize

---
 packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index 4c5a444300..3a2dbcc6ae 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -470,7 +470,7 @@ useMenuCloseOnEsc(open)
           <NcButton
             v-if="!filterQuery"
             class="nc-fields-show-all-fields !text-gray-500 !w-1/2"
-            size="sm"
+            size="small"
             type="ghost"
             @click="showAllColumns = !showAllColumns"
           >
@@ -479,7 +479,7 @@ useMenuCloseOnEsc(open)
           <NcButton
             v-if="!isPublic && !filterQuery"
             class="nc-fields-show-system-fields !text-gray-500 !w-1/2"
-            size="sm"
+            size="small"
             type="ghost"
             @click="showSystemField = !showSystemField"
           >

From d89eee8bb72085cfe7c3bdce0e57e7bc2b5fe9ca Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 12/20] fix(nc-gui):  Invalid prop: type check failed for prop
 "baseRole".

---
 .../dashboard/TreeView/ProjectWrapper.vue         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
index 1d1a6930f8..36ee2a4267 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
@@ -2,15 +2,20 @@
 import type { BaseType } from 'nocodb-sdk'
 import { ProjectInj, ProjectRoleInj } from '#imports'
 
-const props = defineProps<{
-  baseRole: string | string[]
-  base: BaseType
-}>()
+const props = withDefaults(
+  defineProps<{
+    baseRole: string | string[]
+    base: BaseType
+  }>(),
+  {
+    baseRole: '',
+  },
+)
 
 const baseRole = toRef(props, 'baseRole')
 const base = toRef(props, 'base')
 
-provide(ProjectRoleInj, baseRole)
+provide(ProjectRoleInj, baseRole ?? '')
 provide(ProjectInj, base)
 </script>
 

From 1d0edbd48e9ce99bef84e3d0afc425dc64f9cff7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 13/20] fix(nc-gui): Failed to resolve component:
 AccountUserManagement

---
 packages/nc-gui/pages/account/index/[page].vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/pages/account/index/[page].vue b/packages/nc-gui/pages/account/index/[page].vue
index 9650cb5152..f957e10fbb 100644
--- a/packages/nc-gui/pages/account/index/[page].vue
+++ b/packages/nc-gui/pages/account/index/[page].vue
@@ -3,9 +3,10 @@ const { appInfo } = useGlobal()
 </script>
 
 <template>
-  <AccountUserManagement v-if="$route.params.page === 'users'" />
-  <AccountToken v-else-if="$route.params.page === 'tokens'" />
-  <AccountProfile v-else-if="$route.params.page === 'profile'" />
-  <AccountAppStore v-else-if="$route.params.page === 'apps' && !appInfo.isCloud" />
-  <span v-else></span>
+  <div>
+    <AccountToken v-if="$route.params.page === 'tokens'" />
+    <AccountProfile v-else-if="$route.params.page === 'profile'" />
+    <AccountAppStore v-else-if="$route.params.page === 'apps' && !appInfo.isCloud" />
+    <span v-else></span>
+  </div>
 </template>

From cb7a7ec84fcd4c205cc5bdd284b92effc5f1e4a8 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 14/20] fix(nc-gui): Type '"sm"

---
 packages/nc-gui/components/roles/Badge.vue                  | 2 +-
 packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/roles/Badge.vue b/packages/nc-gui/components/roles/Badge.vue
index 863afd9b64..8da82c3c19 100644
--- a/packages/nc-gui/components/roles/Badge.vue
+++ b/packages/nc-gui/components/roles/Badge.vue
@@ -8,7 +8,7 @@ const props = withDefaults(
     clickable?: boolean
     inherit?: boolean
     border?: boolean
-    size?: 'sm' | 'md'
+    size?: 'sm' | 'md' | 'lg'
   }>(),
   {
     clickable: false,
diff --git a/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue b/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
index 8caed6f502..7f60d6c14c 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
@@ -99,7 +99,7 @@ useMenuCloseOnEsc(open)
       >
         <div class="flex flex-col w-full text-sm" @click.stop>
           <div class="text-xs text-gray-500 px-3 pt-2 pb-1 select-none">{{ $t('objects.rowHeight') }}</div>
-          <div v-for="(item, i) of rowHeightOptions" class="nc-row-height-option" @click="updateRowHeight(i)">
+          <div v-for="(item, i) of rowHeightOptions" :key="i" class="nc-row-height-option" @click="updateRowHeight(i)">
             <div class="flex items-center gap-2">
               <GeneralIcon :icon="item.icon" class="nc-row-height-icon" />
               {{ $t(`objects.heightClass.${item.heightClass}`) }}

From 68ba6a78e6370702d3c8bceab82daacd16bd30f3 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 15/20] fix(nc-gui): Missing required prop: "baseId"

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

diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/project/ShareBaseDlg.vue
index 82c775172a..192d796efa 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/project/ShareBaseDlg.vue
@@ -3,7 +3,7 @@ import { OrderedProjectRoles, ProjectRoles } from 'nocodb-sdk'
 import type { User } from '#imports'
 const props = defineProps<{
   modelValue: boolean
-  baseId: string
+  baseId?: string
 }>()
 const emit = defineEmits(['update:modelValue'])
 

From c0add74a1f623b3a5ba320a4f157a65436515036 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:14 +0000
Subject: [PATCH 16/20] fix(nc-gui): Invalid prop: type check failed for prop
 "saml". Expected Object, got Undefined

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

diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/project/ShareBaseDlg.vue
index 192d796efa..e44d77678d 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/project/ShareBaseDlg.vue
@@ -269,7 +269,7 @@ const inviteProjectCollaborator = async () => {
             class="nc-invite-role-selector"
             :role="inviteData.roles"
             :roles="allowedRoles"
-            :on-role-change="(role: ProjectRoles) => (inviteData.roles = role)"
+            :on-role-change="(role) => (inviteData.roles = role as ProjectRoles)"
             :description="false"
           />
         </div>

From 47a08e9e60402a0a31d83f2b263434dd8c06b904 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:15 +0000
Subject: [PATCH 17/20] fix(nc-gui): Cannot read properties of undefined
 (reading 'id')

---
 packages/nc-gui/components/smartsheet/Gallery.vue        | 2 +-
 packages/nc-gui/components/smartsheet/Kanban.vue         | 2 +-
 packages/nc-gui/components/smartsheet/Map.vue            | 2 +-
 packages/nc-gui/components/smartsheet/calendar/index.vue | 2 +-
 packages/nc-gui/components/smartsheet/grid/index.vue     | 2 +-
 packages/nc-gui/composables/useExpandedFormStore.ts      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Gallery.vue b/packages/nc-gui/components/smartsheet/Gallery.vue
index 5ad503ed50..bb4e3f7f02 100644
--- a/packages/nc-gui/components/smartsheet/Gallery.vue
+++ b/packages/nc-gui/components/smartsheet/Gallery.vue
@@ -372,7 +372,7 @@ watch(
 
   <Suspense>
     <LazySmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue
index eece578637..943f9c1c39 100644
--- a/packages/nc-gui/components/smartsheet/Kanban.vue
+++ b/packages/nc-gui/components/smartsheet/Kanban.vue
@@ -753,7 +753,7 @@ const getRowId = (row: RowType) => {
 
   <Suspense>
     <LazySmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       :key="route.query.rowId"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 3fc53b12be..05e07a98cd 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -245,7 +245,7 @@ const count = computed(() => paginationData.value.totalRows)
   </Suspense>
   <Suspense v-if="!isPublic">
     <LazySmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
diff --git a/packages/nc-gui/components/smartsheet/calendar/index.vue b/packages/nc-gui/components/smartsheet/calendar/index.vue
index e54d7d5caa..81a3e6ffcb 100644
--- a/packages/nc-gui/components/smartsheet/calendar/index.vue
+++ b/packages/nc-gui/components/smartsheet/calendar/index.vue
@@ -331,7 +331,7 @@ const headerText = computed(() => {
 
   <Suspense>
     <LazySmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       v-model="expandedFormOnRowIdDlg"
       close-after-save
       :meta="meta"
diff --git a/packages/nc-gui/components/smartsheet/grid/index.vue b/packages/nc-gui/components/smartsheet/grid/index.vue
index 15cb8c523b..559bc61726 100644
--- a/packages/nc-gui/components/smartsheet/grid/index.vue
+++ b/packages/nc-gui/components/smartsheet/grid/index.vue
@@ -267,7 +267,7 @@ const goToPreviousRow = () => {
       />
     </Suspense>
     <SmartsheetExpandedForm
-      v-if="expandedFormOnRowIdDlg"
+      v-if="expandedFormOnRowIdDlg && meta?.id"
       v-model="expandedFormOnRowIdDlg"
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
diff --git a/packages/nc-gui/composables/useExpandedFormStore.ts b/packages/nc-gui/composables/useExpandedFormStore.ts
index 43236a7743..96cf8e78ff 100644
--- a/packages/nc-gui/composables/useExpandedFormStore.ts
+++ b/packages/nc-gui/composables/useExpandedFormStore.ts
@@ -304,7 +304,7 @@ const [useProvideExpandedFormStore, useExpandedFormStore] = useInjectionState((m
   }
 
   const loadRow = async (rowId?: string, onlyVirtual = false) => {
-    if (isPublic.value) return
+    if (isPublic.value || !meta.value?.id) return
     let record = await $api.dbTableRow.read(
       NOCO,
       // todo: base_id missing on view type

From 4551d1c620a9ebdb0b9ab98c072ff5d5edc1fa3e Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:15 +0000
Subject: [PATCH 18/20] fix(nc-gui): small changes

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

diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
index 36ee2a4267..0242136ce5 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectWrapper.vue
@@ -15,7 +15,7 @@ const props = withDefaults(
 const baseRole = toRef(props, 'baseRole')
 const base = toRef(props, 'base')
 
-provide(ProjectRoleInj, baseRole ?? '')
+provide(ProjectRoleInj, baseRole)
 provide(ProjectInj, base)
 </script>
 

From 491e8f3cac75d28cb84d9a7e6268bace5f6fd952 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:15 +0000
Subject: [PATCH 19/20] fix(nc-gui): pr review changes

---
 packages/nc-gui/components/project/ShareBaseDlg.vue        | 5 ++++-
 packages/nc-gui/components/workspace/CollaboratorsList.vue | 2 +-
 packages/nc-gui/components/workspace/InviteSection.vue     | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/project/ShareBaseDlg.vue
index e44d77678d..7ab942402a 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/project/ShareBaseDlg.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { RoleLabels } from 'nocodb-sdk'
 import { OrderedProjectRoles, ProjectRoles } from 'nocodb-sdk'
 import type { User } from '#imports'
 const props = defineProps<{
@@ -211,6 +212,8 @@ const inviteProjectCollaborator = async () => {
     singleEmailValue.value = ''
   }
 }
+
+const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role as ProjectRoles)
 </script>
 
 <template>
@@ -269,7 +272,7 @@ const inviteProjectCollaborator = async () => {
             class="nc-invite-role-selector"
             :role="inviteData.roles"
             :roles="allowedRoles"
-            :on-role-change="(role) => (inviteData.roles = role as ProjectRoles)"
+            :on-role-change="onRoleChange"
             :description="false"
           />
         </div>
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 32292bdd62..cdd342a7b9 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -118,7 +118,7 @@ onMounted(async () => {
                     :roles="accessibleRoles"
                     :description="false"
                     class="cursor-pointer"
-                    :on-role-change="(role) => updateCollaborator(collab, role as WorkspaceUserRoles)"
+                    :on-role-change="(role) => updateCollaborator(collab, role)"
                   />
                 </div>
               </template>
diff --git a/packages/nc-gui/components/workspace/InviteSection.vue b/packages/nc-gui/components/workspace/InviteSection.vue
index 6b8ab2710d..48b2fbe87a 100644
--- a/packages/nc-gui/components/workspace/InviteSection.vue
+++ b/packages/nc-gui/components/workspace/InviteSection.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { onKeyStroke } from '@vueuse/core'
+import type { RoleLabels } from 'nocodb-sdk'
 import { OrderedWorkspaceRoles, WorkspaceUserRoles } from 'nocodb-sdk'
 import { extractSdkResponseErrorMsg, useWorkspace } from '#imports'
 import { validateEmail } from '~/utils/validation'
@@ -192,6 +193,8 @@ const onPaste = (e: ClipboardEvent) => {
   })
   inviteData.email = ''
 }
+
+const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role as WorkspaceUserRoles)
 </script>
 
 <template>
@@ -242,7 +245,7 @@ const onPaste = (e: ClipboardEvent) => {
         class="px-1 min-w-[152px] nc-invite-role-selector"
         :role="inviteData.roles"
         :roles="allowedRoles"
-        :on-role-change="(role) => (inviteData.roles = role as WorkspaceUserRoles)"
+        :on-role-change="onRoleChange"
         :description="true"
       />
 

From 4058f34dc2e2c99d26e16b717d752d55569bcdd4 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:15 +0000
Subject: [PATCH 20/20] fix(nc-gui): use withDefaults insted of directly
 assigning default props value in defineProps call

---
 packages/nc-gui/components/monaco/Editor.vue | 28 +++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 49831adebf..63203a7149 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -15,28 +15,30 @@ interface Props {
   autoFocus?: boolean
 }
 
-const {
-  hideMinimap,
-  lang = 'json',
-  validate = true,
-  disableDeepCompare = false,
-  readOnly,
-  autoFocus = true,
-  modelValue = '',
-} = defineProps<Props>()
+const props = withDefaults(defineProps<Props>(), {
+  modelValue: '',
+  lang: 'json',
+  validate: true,
+  disableDeepCompare: false,
+  autoFocus: true,
+})
+
+const { modelValue } = toRefs(props)
+
+const { hideMinimap, lang, validate, disableDeepCompare, readOnly, autoFocus } = props
 
 const emits = defineEmits(['update:modelValue'])
 
 const vModel = computed<string>({
   get: () => {
-    if (typeof modelValue === 'object') {
-      return JSON.stringify(modelValue, null, 2)
+    if (typeof modelValue.value === 'object') {
+      return JSON.stringify(modelValue.value, null, 2)
     } else {
-      return modelValue
+      return modelValue.value ?? ''
     }
   },
   set: (newVal: string | Record<string, any>) => {
-    if (typeof modelValue === 'object') {
+    if (typeof modelValue.value === 'object') {
       try {
         emits('update:modelValue', typeof newVal === 'object' ? newVal : JSON.parse(newVal))
       } catch (e) {