From 4f4c36c94a0a9daaa7400f1ab961dc21e6a29e98 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 11 Oct 2021 11:25:14 +0530
Subject: [PATCH] fix: show shared view url based on current browser url

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../project/spreadsheet/components/sharedViewsList.vue      | 2 +-
 .../project/spreadsheet/components/spreadsheetNavDrawer.vue | 6 +++---
 packages/nc-gui/mixins/device.js                            | 3 +++
 packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts              | 2 +-
 packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts            | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/sharedViewsList.vue b/packages/nc-gui/components/project/spreadsheet/components/sharedViewsList.vue
index d30e298318..494076a526 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/sharedViewsList.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/sharedViewsList.vue
@@ -19,7 +19,7 @@
           <tr v-for="link of viewsList" :key="link.id">
             <td class="caption">
               <nuxt-link :to="`/nc/${link.view_type || 'view'}/${link.view_id}`">
-                {{ `${origin}/dashboard#/xc/${link.view_type || 'view'}/${link.view_id}` }}
+                {{ `${dashboardUrl}#/nc/${link.view_type || 'view'}/${link.view_id}` }}
               </nuxt-link>
             </td>
             <td class="caption">
diff --git a/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue b/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
index 442b2febf8..74f4344c30 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
@@ -434,9 +434,9 @@
             <!-- People with private link can only see cells visible in this view -->
           </p>
           <div style="border-radius: 4px" class="share-link-box body-2 pa-2 d-flex align-center">
-            {{ shareLink.url }}
+            {{ `${dashboardUrl}#/nc/${shareLink.view_type || 'view'}/${shareLink.view_id}` }}
             <v-spacer />
-            <a :href="shareLink.url" style="text-decoration: none" target="_blank">
+            <a :href=" `${dashboardUrl}#/nc/${shareLink.view_type || 'view'}/${shareLink.view_id}`" style="text-decoration: none" target="_blank">
               <v-icon small class="mx-2">mdi-open-in-new</v-icon>
             </a>
             <v-icon
@@ -791,7 +791,7 @@ export default {
       this.$toast.info('Copied to clipboard').goAway(1000)
     },
     copyShareUrlToClipboard() {
-      this.clipboard(this.shareLink.url)
+      this.clipboard(`${this.dashboardUrl}#/nc/${this.shareLink.view_type || 'view'}/${this.shareLink.view_id}`)
       this.clipboardSuccessHandler()
     }
   }
diff --git a/packages/nc-gui/mixins/device.js b/packages/nc-gui/mixins/device.js
index 3a782e0168..08e135c359 100644
--- a/packages/nc-gui/mixins/device.js
+++ b/packages/nc-gui/mixins/device.js
@@ -9,6 +9,9 @@ export default {
     }
   },
   computed: {
+    dashboardUrl() {
+      return `${location.origin}${location.path || ''}`
+    },
     isDark() {
       return this.$vuetify && this.$vuetify.theme && this.$vuetify.theme.dark
     },
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
index 79ac5a0625..f7e7f4b56b 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
@@ -3318,7 +3318,7 @@ export default class NcMetaMgr {
         this.getDbAlias(args),
         'nc_shared_views',
         insertData,
-        ['id', 'view_id']
+        ['id', 'view_id', 'view_type']
       );
       res.url = `${req.ncSiteUrl}${this.config.dashboardPath}#/nc/view/${res.view_id}`;
       Tele.emit('evt', { evt_type: 'sharedView:generated-link' });
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
index 3794d133f2..24f28b9d36 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
@@ -202,7 +202,7 @@ export default class NcMetaMgrEE extends NcMetaMgr {
         this.getDbAlias(args),
         'nc_shared_views',
         insertData,
-        ['id', 'view_id']
+        ['id', 'view_id', 'view_type']
       );
       if (args.args.show_as === 'form') {
         res.url = `${req.ncSiteUrl}${this.config.dashboardPath}#/nc/form/${res.view_id}`;