From ec460685540954968a97f7603c3edc63bbb49701 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Tue, 26 Nov 2024 05:46:57 +0000
Subject: [PATCH] fix(nc-gui): show page does not exist if shared url is
 invalid

---
 packages/nc-gui/assets/style.scss             |   8 ++
 .../components/general/PageDoesNotExist.vue   |   2 +-
 packages/nc-gui/composables/useSharedView.ts  |  13 +++
 packages/nc-gui/layouts/shared-view.vue       | 109 +++++++++---------
 .../[typeOrId]/calendar/[viewId]/index.vue    |   4 +-
 .../pages/index/[typeOrId]/form/[viewId].vue  |   7 +-
 .../[typeOrId]/gallery/[viewId]/index.vue     |   4 +-
 .../[typeOrId]/kanban/[viewId]/index.vue      |   4 +-
 .../index/[typeOrId]/map/[viewId]/index.vue   |   4 +-
 .../pages/index/[typeOrId]/view/[viewId].vue  |   4 +-
 10 files changed, 97 insertions(+), 62 deletions(-)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index f65a6f68f2..ff109c5c11 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -14,6 +14,14 @@
       scrollbar-width: none; /* Firefox */
     }
   }
+
+  .nc-h-screen {
+    height: 100vh;
+
+    @supports (height: 100dvh) {
+      height: 100dvh;
+    }
+  }
 }
 
 * {
diff --git a/packages/nc-gui/components/general/PageDoesNotExist.vue b/packages/nc-gui/components/general/PageDoesNotExist.vue
index 969f136361..d8980aa0ff 100644
--- a/packages/nc-gui/components/general/PageDoesNotExist.vue
+++ b/packages/nc-gui/components/general/PageDoesNotExist.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-full grid place-items-center text-center">
+  <div class="nc-h-screen grid place-items-center text-center">
     <div class="flex flex-col items-center gap-6">
       <slot name="icon">
         <img width="48" alt="NocoDB" src="~/assets/img/icons/256x256.png" />
diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts
index c50d0d9ad3..8ffde1c53f 100644
--- a/packages/nc-gui/composables/useSharedView.ts
+++ b/packages/nc-gui/composables/useSharedView.ts
@@ -13,6 +13,8 @@ import type {
 import { UITypes, ViewTypes } from 'nocodb-sdk'
 
 export function useSharedView() {
+  const router = useRouter()
+
   const nestedFilters = ref<(FilterType & { status?: 'update' | 'delete' | 'create'; parentId?: string })[]>([])
 
   const { appInfo } = useGlobal()
@@ -70,6 +72,7 @@ export function useSharedView() {
         'xc-password': localPassword ?? password.value,
       },
     })
+
     try {
       allowCSVDownload.value = parseProp(viewMeta.meta)?.allowCSVDownload
     } catch {
@@ -421,6 +424,15 @@ export function useSharedView() {
     } as RequestParams)
   }
 
+  const triggerNotFound = () => {
+    const currentQuery = { ...router.currentRoute.value.query, ncNotFound: 'true' }
+
+    router.push({
+      path: router.currentRoute.value.path,
+      query: currentQuery,
+    })
+  }
+
   return {
     sharedView,
     loadSharedView,
@@ -441,5 +453,6 @@ export function useSharedView() {
     formColumns,
     allowCSVDownload,
     fetchCount,
+    triggerNotFound,
   }
 }
diff --git a/packages/nc-gui/layouts/shared-view.vue b/packages/nc-gui/layouts/shared-view.vue
index c3c6ba7479..bc82eb64d0 100644
--- a/packages/nc-gui/layouts/shared-view.vue
+++ b/packages/nc-gui/layouts/shared-view.vue
@@ -11,6 +11,8 @@ const route = router.currentRoute
 
 const disableTopbar = computed(() => route.value.query?.disableTopbar === 'true')
 
+const ncNotFound = computed(() => route.value.query?.ncNotFound === 'true')
+
 onMounted(() => {
   // check if we are inside an iframe
   // if we are, communicate to the parent page whenever we navigate to a new url,
@@ -53,63 +55,66 @@ export default {
 <template>
   <a-layout id="nc-app">
     <a-layout class="!flex-col bg-white">
-      <a-layout-header
-        v-if="!disableTopbar"
-        class="nc-table-topbar flex items-center justify-between !bg-transparent !px-3 !py-2 border-b-1 border-gray-200 !h-[46px]"
-      >
-        <div class="flex items-center gap-6 h-7 max-w-[calc(100%_-_280px)] xs:max-w-[calc(100%_-_90px)]">
-          <a
-            class="transition-all duration-200 cursor-pointer transform hover:scale-105"
-            href="https://github.com/nocodb/nocodb"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            <img width="96" alt="NocoDB" src="~/assets/img/brand/nocodb.png" class="flex-none min-w-[96px]" />
-          </a>
-
-          <div class="flex items-center gap-2 text-gray-900 text-sm truncate">
-            <template v-if="isLoading">
-              <span data-testid="nc-loading">{{ $t('general.loading') }}</span>
-
-              <component :is="iconMap.reload" :class="{ 'animate-infinite animate-spin ': isLoading }" />
-            </template>
-
-            <div v-else class="text-sm font-semibold truncate nc-shared-view-title flex gap-2 items-center">
-              <GeneralViewIcon v-if="sharedView" class="h-4 w-4 ml-0.5" :meta="sharedView" />
-
-              <span class="truncate">
-                {{ sharedView?.title }}
-              </span>
-
-              <NcTooltip v-if="sharedView?.description?.length" placement="bottom">
-                <template #title>
-                  {{ sharedView?.description }}
-                </template>
-
-                <NcButton type="text" class="!hover:bg-transparent" size="xsmall">
-                  <GeneralIcon icon="info" class="!w-3.5 !h-3.5 nc-info-icon text-gray-600" />
-                </NcButton>
-              </NcTooltip>
+      <GeneralPageDoesNotExist v-if="ncNotFound" />
+      <template v-else>
+        <a-layout-header
+          v-if="!disableTopbar"
+          class="nc-table-topbar flex items-center justify-between !bg-transparent !px-3 !py-2 border-b-1 border-gray-200 !h-[46px]"
+        >
+          <div class="flex items-center gap-6 h-7 max-w-[calc(100%_-_280px)] xs:max-w-[calc(100%_-_90px)]">
+            <a
+              class="transition-all duration-200 cursor-pointer transform hover:scale-105"
+              href="https://github.com/nocodb/nocodb"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <img width="96" alt="NocoDB" src="~/assets/img/brand/nocodb.png" class="flex-none min-w-[96px]" />
+            </a>
+
+            <div class="flex items-center gap-2 text-gray-900 text-sm truncate">
+              <template v-if="isLoading">
+                <span data-testid="nc-loading">{{ $t('general.loading') }}</span>
+
+                <component :is="iconMap.reload" :class="{ 'animate-infinite animate-spin ': isLoading }" />
+              </template>
+
+              <div v-else class="text-sm font-semibold truncate nc-shared-view-title flex gap-2 items-center">
+                <GeneralViewIcon v-if="sharedView" class="h-4 w-4 ml-0.5" :meta="sharedView" />
+
+                <span class="truncate">
+                  {{ sharedView?.title }}
+                </span>
+
+                <NcTooltip v-if="sharedView?.description?.length" placement="bottom">
+                  <template #title>
+                    {{ sharedView?.description }}
+                  </template>
+
+                  <NcButton type="text" class="!hover:bg-transparent" size="xsmall">
+                    <GeneralIcon icon="info" class="!w-3.5 !h-3.5 nc-info-icon text-gray-600" />
+                  </NcButton>
+                </NcTooltip>
+              </div>
             </div>
           </div>
-        </div>
 
-        <div class="flex items-center gap-3">
-          <LazySmartsheetToolbarExport v-if="allowCSVDownload" />
+          <div class="flex items-center gap-3">
+            <LazySmartsheetToolbarExport v-if="allowCSVDownload" />
 
-          <a href="https://app.nocodb.com/#/signin" target="_blank" class="!no-underline xs:hidden" rel="noopener">
-            <NcButton size="xs"> {{ $t('labels.signUpForFree') }} </NcButton>
-          </a>
+            <a href="https://app.nocodb.com/#/signin" target="_blank" class="!no-underline xs:hidden" rel="noopener">
+              <NcButton size="xs"> {{ $t('labels.signUpForFree') }} </NcButton>
+            </a>
+          </div>
+        </a-layout-header>
+        <div
+          class="nc-shared-view-container w-full overflow-hidden"
+          :class="{
+            'nc-shared-mobile-view': isMobileMode,
+          }"
+        >
+          <slot />
         </div>
-      </a-layout-header>
-      <div
-        class="nc-shared-view-container w-full overflow-hidden"
-        :class="{
-          'nc-shared-mobile-view': isMobileMode,
-        }"
-      >
-        <slot />
-      </div>
+      </template>
     </a-layout>
   </a-layout>
 </template>
diff --git a/packages/nc-gui/pages/index/[typeOrId]/calendar/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/calendar/[viewId]/index.vue
index 210ca98490..6dd6b351e1 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/calendar/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/calendar/[viewId]/index.vue
@@ -11,7 +11,7 @@ definePageMeta({
 
 const route = useRoute()
 
-const { loadSharedView } = useSharedView()
+const { loadSharedView, triggerNotFound } = useSharedView()
 
 const showPassword = ref(false)
 
@@ -20,6 +20,8 @@ try {
 } catch (e: any) {
   if (e?.response?.status === 403) {
     showPassword.value = true
+  } else if (e?.response?.status === 404) {
+    triggerNotFound()
   } else {
     message.error(await extractSdkResponseErrorMsg(e))
   }
diff --git a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
index 3755b30c7e..d5dedfce99 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/form/[viewId].vue
@@ -27,9 +27,6 @@ if (!notFound.value) {
   useProvideSmartsheetStore(sharedView, meta, true)
 
   applyLanguageDirection(sharedViewMeta.value.rtl ? 'rtl' : 'ltr')
-} else {
-  navigateTo('/error/404')
-  throw createError({ statusCode: 404, statusMessage: t('msg.pageNotFound') })
 }
 
 const form = reactive({
@@ -51,7 +48,9 @@ const focus: VNodeRef = (el: typeof InputPassword) => {
 <template>
   <div>
     <NuxtLayout>
-      <NuxtPage v-if="!passwordDlg" />
+      <NuxtPage v-if="!passwordDlg && !notFound" />
+
+      <GeneralPageDoesNotExist v-if="notFound" />
 
       <a-modal
         v-model:visible="passwordDlg"
diff --git a/packages/nc-gui/pages/index/[typeOrId]/gallery/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/gallery/[viewId]/index.vue
index cf58a6f8fb..2949636a56 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/gallery/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/gallery/[viewId]/index.vue
@@ -10,7 +10,7 @@ definePageMeta({
 
 const route = useRoute()
 
-const { loadSharedView } = useSharedView()
+const { loadSharedView, triggerNotFound } = useSharedView()
 
 const showPassword = ref(false)
 
@@ -19,6 +19,8 @@ try {
 } catch (e: any) {
   if (e?.response?.status === 403) {
     showPassword.value = true
+  } else if (e?.response?.status === 404) {
+    triggerNotFound()
   } else {
     message.error(await extractSdkResponseErrorMsg(e))
   }
diff --git a/packages/nc-gui/pages/index/[typeOrId]/kanban/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/kanban/[viewId]/index.vue
index dc883c24c9..6a7cce511a 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/kanban/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/kanban/[viewId]/index.vue
@@ -11,7 +11,7 @@ definePageMeta({
 
 const route = useRoute()
 
-const { loadSharedView } = useSharedView()
+const { loadSharedView, triggerNotFound } = useSharedView()
 
 const showPassword = ref(false)
 
@@ -20,6 +20,8 @@ try {
 } catch (e: any) {
   if (e?.response?.status === 403) {
     showPassword.value = true
+  } else if (e?.response?.status === 404) {
+    triggerNotFound()
   } else {
     message.error(await extractSdkResponseErrorMsg(e))
   }
diff --git a/packages/nc-gui/pages/index/[typeOrId]/map/[viewId]/index.vue b/packages/nc-gui/pages/index/[typeOrId]/map/[viewId]/index.vue
index 7636896c51..c7978e0308 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/map/[viewId]/index.vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/map/[viewId]/index.vue
@@ -10,7 +10,7 @@ definePageMeta({
 
 const route = useRoute()
 
-const { loadSharedView } = useSharedView()
+const { loadSharedView , triggerNotFound} = useSharedView()
 
 const showPassword = ref(false)
 
@@ -19,6 +19,8 @@ try {
 } catch (e: any) {
   if (e?.response?.status === 403) {
     showPassword.value = true
+  } else if (e?.response?.status === 404) {
+    triggerNotFound()
   } else {
     message.error(await extractSdkResponseErrorMsg(e))
   }
diff --git a/packages/nc-gui/pages/index/[typeOrId]/view/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/view/[viewId].vue
index 73300f3fa0..143becaad6 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/view/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/view/[viewId].vue
@@ -10,7 +10,7 @@ definePageMeta({
 
 const route = useRoute()
 
-const { loadSharedView, meta } = useSharedView()
+const { loadSharedView, meta, triggerNotFound } = useSharedView()
 const { isViewDataLoading } = storeToRefs(useViewsStore())
 
 provide(MetaInj, meta)
@@ -24,6 +24,8 @@ onMounted(async () => {
   } catch (e: any) {
     if (e?.response?.status === 403) {
       showPassword.value = true
+    } else if (e?.response?.status === 404) {
+      triggerNotFound()
     } else {
       console.error(e)
       message.error(await extractSdkResponseErrorMsg(e))