From 647fa9ecf7c98dc9be5291de261649fe93f9e960 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 10 Jan 2024 09:05:29 +0000
Subject: [PATCH 1/5] fix: convert to string before applying trim

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

diff --git a/packages/nc-gui/components/cell/SingleSelect.vue b/packages/nc-gui/components/cell/SingleSelect.vue
index 8ba832c267..2326988f82 100644
--- a/packages/nc-gui/components/cell/SingleSelect.vue
+++ b/packages/nc-gui/components/cell/SingleSelect.vue
@@ -258,7 +258,7 @@ const handleClose = (e: MouseEvent) => {
 useEventListener(document, 'click', handleClose, true)
 
 const selectedOpt = computed(() => {
-  return options.value.find((o) => o.value === vModel.value || o.value === vModel.value?.trim())
+  return options.value.find((o) => o.value === vModel.value || o.value === vModel.value?.toString()?.trim())
 })
 
 const onFocus = () => {

From 3ccf1dfd39e4b8d6000ac4b11bdba9837e109c6f Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 10 Jan 2024 09:05:29 +0000
Subject: [PATCH 2/5] fix: keep the element reference and reset scrollTop on
 that

---
 .../components/smartsheet/expanded-form/index.vue      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 5c8d0c9b4b..7f7f06c6a6 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -469,12 +469,14 @@ const isReadOnlyVirtualCell = (column: ColumnType) => {
 watch([expandedFormScrollWrapper, isLoading], () => {
   if (isMobileMode.value) return
 
-  if (expandedFormScrollWrapper.value && !isLoading.value) {
-    const height = expandedFormScrollWrapper.value.scrollHeight
-    expandedFormScrollWrapper.value.scrollTop = height
+  const expandedFormScrollWrapperEl = expandedFormScrollWrapper.value
+
+  if (expandedFormScrollWrapperEl && !isLoading.value) {
+    const height = expandedFormScrollWrapperEl.scrollHeight
+    expandedFormScrollWrapperEl.scrollTop = height
 
     setTimeout(() => {
-      expandedFormScrollWrapper.value.scrollTop = 0
+      expandedFormScrollWrapperEl.scrollTop = 0
     }, 125)
   }
 })

From 4490919ad63720e7dc11e0b634d386885eedc225 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 10 Jan 2024 09:05:29 +0000
Subject: [PATCH 3/5] fix: render view menu only if view is defined

---
 .../components/smartsheet/toolbar/ViewActionMenu.vue      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
index 82795110c7..05d567e9df 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
@@ -142,7 +142,12 @@ const onDelete = async () => {
 </script>
 
 <template>
-  <NcMenu class="!min-w-70" data-id="toolbar-actions" :data-testid="`view-sidebar-view-actions-${view!.alias || view!.title}`">
+  <NcMenu
+    v-if="view"
+    class="!min-w-70"
+    data-id="toolbar-actions"
+    :data-testid="`view-sidebar-view-actions-${view!.alias || view!.title}`"
+  >
     <NcTooltip>
       <template #title> {{ $t('labels.clickToCopyViewID') }} </template>
       <div class="flex items-center justify-between py-2 px-3 cursor-pointer hover:bg-gray-100 group" @click="onViewIdCopy">
@@ -314,6 +319,7 @@ const onDelete = async () => {
       />
     </template>
   </NcMenu>
+  <span v-else></span>
 </template>
 
 <style lang="scss" scoped>

From aba85d27bfc73e8eb228be621cf705da6fae7322 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 10 Jan 2024 09:05:29 +0000
Subject: [PATCH 4/5] fix: handle 404 in shared base/view

---
 packages/nc-gui/store/bases.ts | 37 ++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/nc-gui/store/bases.ts b/packages/nc-gui/store/bases.ts
index 4f3e82a3e5..bb470a2003 100644
--- a/packages/nc-gui/store/bases.ts
+++ b/packages/nc-gui/store/bases.ts
@@ -92,25 +92,32 @@ export const useBases = defineStore('basesStore', () => {
   const loadProjects = async (page: 'recent' | 'shared' | 'starred' | 'workspace' = 'recent') => {
     // if shared base then get the shared base and create a list
     if (route.value.params.typeOrId === 'base' && route.value.params.baseId) {
-      const { base_id } = await $api.public.sharedBaseGet(route.value.params.baseId as string)
-      const base: BaseType = await $api.base.read(base_id)
+      try {
+        const { base_id } = await $api.public.sharedBaseGet(route.value.params.baseId as string)
+        const base: BaseType = await $api.base.read(base_id)
 
-      if (!base) return
+        if (!base) return
 
-      bases.value = [base].reduce((acc, base) => {
-        acc.set(base.id!, base)
-        return acc
-      }, new Map())
+        bases.value = [base].reduce((acc, base) => {
+          acc.set(base.id!, base)
+          return acc
+        }, new Map())
 
-      bases.value.set(base.id!, {
-        ...(bases.value.get(base.id!) || {}),
-        ...base,
-        sources: [...(base.sources ?? bases.value.get(base.id!)?.sources ?? [])],
-        isExpanded: route.value.params.baseId === base.id || bases.value.get(base.id!)?.isExpanded,
-        isLoading: false,
-      })
+        bases.value.set(base.id!, {
+          ...(bases.value.get(base.id!) || {}),
+          ...base,
+          sources: [...(base.sources ?? bases.value.get(base.id!)?.sources ?? [])],
+          isExpanded: route.value.params.baseId === base.id || bases.value.get(base.id!)?.isExpanded,
+          isLoading: false,
+        })
 
-      return
+        return
+      } catch (e: any) {
+        if (e?.response?.status === 404) {
+          return router.push('/error/404')
+        }
+        throw e
+      }
     }
 
     const activeWorkspace = workspaceStore.activeWorkspace

From 9376fd2c5466e05f911854b5cc60091abcd77e33 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Wed, 10 Jan 2024 09:05:30 +0000
Subject: [PATCH 5/5] fix: ui warning corrections

---
 packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue  | 4 ++--
 packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue | 3 ++-
 packages/nc-gui/components/workspace/CollaboratorsList.vue    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
index 2754c988c7..0316dd1c2e 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FieldsMenu.vue
@@ -387,7 +387,7 @@ useMenuCloseOnEsc(open)
                       <template #default>{{ field.title }}</template>
                     </NcTooltip>
 
-                    <NcSwitch v-e="['a:fields:show-hide']" :checked="field.show" :disabled="field.isViewEssentialField" />
+                    <NcSwitch :checked="field.show" :disabled="field.isViewEssentialField" @change="$t('a:fields:show-hide')" />
                   </div>
 
                   <div class="flex-1" />
@@ -411,7 +411,7 @@ useMenuCloseOnEsc(open)
                     <template #default>{{ filteredFieldList[0].title }}</template>
                   </NcTooltip>
 
-                  <NcSwitch v-e="['a:fields:show-hide']" :checked="true" :disabled="true" />
+                  <NcSwitch :checked="true" :disabled="true" />
                 </div>
               </template>
             </Draggable>
diff --git a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
index e48e4aa054..10855e454d 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/FilterInput.vue
@@ -47,7 +47,8 @@ import Text from '~/components/cell/Text.vue'
 import User from '~/components/cell/User.vue'
 
 interface Props {
-  column: ColumnType
+  // column could be possibly undefined when the filter is created
+  column?: ColumnType
   filter: Filter
 }
 
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index fcc4a781fc..5492ec69b2 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -67,7 +67,7 @@ onMounted(async () => {
     </div>
     <WorkspaceInviteSection v-if="workspaceRole !== WorkspaceUserRoles.VIEWER" />
     <div v-if="!filterCollaborators?.length" class="w-full h-full flex flex-col items-center justify-center mt-36">
-      <Empty description="No members found" />
+      <a-empty description="No members found" />
     </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)]">