From aaa45c36e80d02bf158ffc3c2f7818c817baa657 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Sat, 17 Sep 2022 16:48:38 +0530
Subject: [PATCH] fix(gui): populate record url based on route param and active
 view

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 packages/nc-gui/components/smartsheet/Gallery.vue     |  2 ++
 packages/nc-gui/components/smartsheet/Grid.vue        |  2 ++
 .../components/smartsheet/expanded-form/Header.vue    | 11 +++++++++--
 .../components/smartsheet/expanded-form/index.vue     |  3 ++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Gallery.vue b/packages/nc-gui/components/smartsheet/Gallery.vue
index 4dfb437b99..1ef419e23b 100644
--- a/packages/nc-gui/components/smartsheet/Gallery.vue
+++ b/packages/nc-gui/components/smartsheet/Gallery.vue
@@ -221,6 +221,7 @@ provide(ReloadRowDataHookInj, reloadViewDataHook)
       :row="expandedFormRow"
       :state="expandedFormRowState"
       :meta="meta"
+      :view="view"
     />
 
     <SmartsheetExpandedForm
@@ -230,6 +231,7 @@ provide(ReloadRowDataHookInj, reloadViewDataHook)
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
       :row-id="route.query.rowId"
+      :view="view"
     />
   </div>
 </template>
diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue
index 80d666cf70..354c729a1b 100644
--- a/packages/nc-gui/components/smartsheet/Grid.vue
+++ b/packages/nc-gui/components/smartsheet/Grid.vue
@@ -645,6 +645,7 @@ provide(ReloadRowDataHookInj, reloadViewDataHook)
       :row="expandedFormRow"
       :state="expandedFormRowState"
       :meta="meta"
+      :view="view"
       @update:model-value="
         () => {
           if (!skipRowRemovalOnCancel) removeRowIfNew(expandedFormRow)
@@ -659,6 +660,7 @@ provide(ReloadRowDataHookInj, reloadViewDataHook)
       :row="{ row: {}, oldRow: {}, rowMeta: {} }"
       :meta="meta"
       :row-id="route.query.rowId"
+      :view="view"
     />
   </div>
 </template>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
index 3b9c23098c..acd49bb6fe 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { message } from 'ant-design-vue'
+import type { ViewType } from 'nocodb-sdk'
 import {
   ReloadRowDataHookInj,
   useExpandedFormStoreOrThrow,
@@ -8,9 +9,11 @@ import {
   useUIPermission,
 } from '#imports'
 
+const props = defineProps<{ view?: ViewType }>()
+
 const emit = defineEmits(['cancel'])
 
-const { project } = useProject()
+const route = useRoute()
 
 const { meta, isSqlView } = useSmartsheetStoreOrThrow()
 
@@ -41,7 +44,11 @@ const { dashboardUrl } = useDashboard()
 const { copy } = useClipboard()
 
 const copyRecordUrl = () => {
-  copy(`${dashboardUrl?.value}#/nc/${project.value?.id}/table/${meta.value?.title}?rowId=${primaryKey.value}`)
+  copy(
+    `${dashboardUrl?.value}#/${route.params.projectType}/${route.params.projectId}/${route.params.type}/${meta.value?.title}${
+      props.view ? `/${props.view.title}` : ''
+    }?rowId=${primaryKey.value}`,
+  )
   message.success('Copied to clipboard')
 }
 </script>
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 4a7e4bf652..468ceb3c91 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -32,6 +32,7 @@ interface Props {
   loadRow?: boolean
   useMetaFields?: boolean
   rowId?: string
+  view?: ViewType
 }
 
 const props = defineProps<Props>()
@@ -127,7 +128,7 @@ export default {
     :closable="false"
     class="nc-drawer-expanded-form"
   >
-    <Header @cancel="onClose" />
+    <Header :view="view" @cancel="onClose" />
     <div class="!bg-gray-100 rounded flex-1">
       <div class="flex h-full nc-form-wrapper items-stretch min-h-[max(70vh,100%)]">
         <div class="flex-1 overflow-auto scrollbar-thin-dull">