From 9e5222bccb19018b54a66ceea6cabcd9bbf397c7 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Mon, 25 Nov 2024 16:27:34 +0000
Subject: [PATCH] fix: custom url is part of ee only

---
 .../dlg/share-and-collaborate/CustomUrl.vue   |  16 ++
 .../dlg/share-and-collaborate/SharePage.vue   | 138 +++---------------
 packages/nc-gui/lang/en.json                  |   1 +
 packages/nocodb/src/models/CustomUrl.ts       |   3 +-
 packages/nocodb/src/models/View.ts            |  31 ----
 packages/nocodb/src/schema/swagger-v2.json    |  34 +++++
 6 files changed, 71 insertions(+), 152 deletions(-)
 create mode 100644 packages/nc-gui/components/dlg/share-and-collaborate/CustomUrl.vue

diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/CustomUrl.vue b/packages/nc-gui/components/dlg/share-and-collaborate/CustomUrl.vue
new file mode 100644
index 0000000000..213bb06b3b
--- /dev/null
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/CustomUrl.vue
@@ -0,0 +1,16 @@
+<script lang="ts" setup>
+import type { ViewType } from 'nocodb-sdk'
+
+interface Props {
+  view: ViewType & { meta: object & Record<string, any> }
+  dashboardUrl: string
+}
+
+const emits = defineEmits(['updateSharedView', 'copyCustomUrl'])
+</script>
+
+<template>
+  <span class="hidden"></span>
+</template>
+
+<style lang="scss" scoped></style>
diff --git a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
index ed8215f6bb..547a5f2463 100644
--- a/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
+++ b/packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
@@ -281,7 +281,7 @@ async function saveTheme() {
   $e(`a:view:share:${viewTheme.value ? 'enable' : 'disable'}-theme`)
 }
 
-async function updateSharedView() {
+async function updateSharedView(custUrl = undefined) {
   try {
     if (!activeView.value?.meta) return
     const meta = activeView.value.meta
@@ -289,10 +289,13 @@ async function updateSharedView() {
     await $api.dbViewShare.update(activeView.value.id!, {
       meta,
       password: activeView.value.password,
-      custom_url_path: customUrl.value ?? null,
+      ...(custUrl !== undefined ? { custom_url_path: custUrl ?? null } : {}),
       original_url: sharedViewUrl(false),
     })
-    activeView.value.custom_url_path = customUrl.value ?? null
+
+    if (custUrl !== undefined) {
+      activeView.value.custom_url_path = custUrl ?? null
+    }
   } catch (e: any) {
     message.error(await extractSdkResponseErrorMsg(e))
   }
@@ -300,29 +303,11 @@ async function updateSharedView() {
   return true
 }
 
-const updateSharedViewWithDebounce = useDebounceFn(
-  async () => {
-    await updateSharedView()
-  },
-  250,
-  { maxWait: 2000 },
-)
-
 async function savePreFilledMode() {
   await updateSharedView()
 }
 
-const isOpenCustomUrlLocal = ref(false)
-
-const isOpenCustomUrl = computed(() => {
-  return !!activeView.value?.custom_url_path || isOpenCustomUrlLocal.value
-})
-
-const customUrlInputRef = ref()
-
-const customUrl = ref()
-
-const dashboardUrl1 = computed(() => {
+const dashboardBaseUrl = computed(() => {
   // get base url for workspace
   const baseUrl = getBaseUrl(workspaceStore.activeWorkspaceId)
 
@@ -333,59 +318,13 @@ const dashboardUrl1 = computed(() => {
   return dashboardUrl.value
 })
 
-const copyCustomUrl = () => {
-  copy(
-    `${dashboardUrl1.value}#/p/${customUrl.value}${
+const copyCustomUrl = async (custUrl = '') => {
+  return await copy(
+    `${dashboardBaseUrl.value}#/p/${encodeURIComponent(custUrl || activeView.value?.custom_url_path || '')}${
       preFillFormSearchParams.value && activeView.value?.type === ViewTypes.FORM ? `?${preFillFormSearchParams.value}` : ''
     }`,
   )
 }
-
-const toggleCustomUrl = async () => {
-  isOpenCustomUrlLocal.value = !isOpenCustomUrl.value
-  if (!activeView.value) return
-  if (isUpdating.value.customUrl) return
-
-  isUpdating.value.customUrl = true
-  try {
-    if (isOpenCustomUrl.value) {
-      customUrl.value = null
-    } else {
-      customUrl.value = null
-    }
-    await updateSharedView()
-  } finally {
-    isUpdating.value.customUrl = false
-
-    if (isOpenCustomUrl.value) {
-      customUrlInputRef.value?.focus()
-    }
-  }
-}
-
-const isCustomUrlAvailable = ref(true)
-
-const checkAvailability = async () => {
-  try {
-    const res = await $api.customUrl.checkAvailability({ id: activeView.value?.fk_custom_url_id!, custom_path: customUrl.value })
-    console.log('res', res)
-  } catch (e: any) {
-    console.error(e)
-    // message.error(await extractSdkResponseErrorMsg(e))
-  }
-}
-
-const checkAvailabilityWithDebounce = useDebounceFn(
-  async () => {
-    await checkAvailability()
-  },
-  250,
-  { maxWait: 2000 },
-)
-
-onMounted(() => {
-  customUrl.value = activeView.value?.custom_url_path
-})
 </script>
 
 <template>
@@ -407,55 +346,14 @@ onMounted(() => {
         <div class="mt-0.5 border-t-1 border-gray-100 pt-3">
           <GeneralCopyUrl v-model:url="url" />
         </div>
-        <div class="flex flex-col justify-between mt-1 py-2 px-3 bg-gray-50 rounded-md">
-          <div class="flex flex-row items-center justify-between">
-            <div class="flex text-black">Custom url</div>
-            <a-switch
-              v-e="['c:share:view:custom-url:toggle']"
-              :checked="isOpenCustomUrl"
-              :loading="isUpdating.customUrl"
-              class="share-custom-url-toggle !mt-0.25"
-              data-testid="share-custom-url-toggle"
-              size="small"
-              @click="toggleCustomUrl"
-            />
-          </div>
-          <Transition mode="out-in" name="layout">
-            <div
-              v-if="isOpenCustomUrl"
-              class="flex items-center mt-2 pl-2 pr-1 w-full border-1 rounded-lg focus-within:(border-1 border-nc-border-brand shadow-selected)"
-            >
-              <div class="text-nc-content-gray-muted">{{ dashboardUrl1 }}#/p/</div>
-              <a-input
-                ref="customUrlInputRef"
-                v-model:value="customUrl"
-                placeholder="Enter custom url"
-                class="!rounded-lg !py-1 h-8"
-                data-testid="nc-modal-share-view__custom-url"
-                size="small"
-                :bordered="false"
-                autocomplete="off"
-                @update:value="checkAvailabilityWithDebounce"
-              />
-              <div>
-                <NcButton
-                  v-if="customUrl && customUrl === activeView?.custom_url_path"
-                  size="xs"
-                  type="secondary"
-                  @click="copyCustomUrl"
-                >
-                  <template #icon>
-                    <MdiContentCopy class="h-3.5" />
-                  </template>
-                  {{ $t('general.copy') }}
-                </NcButton>
-                <NcButton v-else size="xs" :disabled="!customUrl" @click.stop="updateSharedView">
-                  {{ $t('general.save') }}
-                </NcButton>
-              </div>
-            </div>
-          </Transition>
-        </div>
+
+        <DlgShareAndCollaborateCustomUrl
+          v-if="activeView"
+          v-model:view="activeView"
+          :dashboard-url="dashboardBaseUrl"
+          :copy-custom-url="copyCustomUrl"
+          @update-shared-view="updateSharedView"
+        />
         <div class="flex flex-col justify-between mt-1 py-2 px-3 bg-gray-50 rounded-md">
           <div class="flex flex-row items-center justify-between">
             <div class="flex text-black">{{ $t('activity.restrictAccessWithPassword') }}</div>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 3d700d172f..6343d26cf0 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -630,6 +630,7 @@
     "categories": "Categories",
     "fieldInaccessible": "Field inaccessible",
     "noConditionsAdded": "No conditions added",
+    "thisCustomUrlIsAlreadyUsed": "This custom URL is already in use.",
     "noAiIntegrationAvailable": "No AI Integrations available.",
     "nocoAiBaseBuilder": "Noco AI Base Builder",
     "additionalDetails": "Additional Details",
diff --git a/packages/nocodb/src/models/CustomUrl.ts b/packages/nocodb/src/models/CustomUrl.ts
index 6eb9117139..0e053a14e2 100644
--- a/packages/nocodb/src/models/CustomUrl.ts
+++ b/packages/nocodb/src/models/CustomUrl.ts
@@ -1,6 +1,7 @@
+import { CustomUrlType } from 'nocodb-sdk';
 import Noco from '~/Noco';
 
-export default class CustomUrl {
+export default class CustomUrl implements CustomUrlType {
   id?: string;
   fk_workspace_id?: string;
   base_id?: string;
diff --git a/packages/nocodb/src/models/View.ts b/packages/nocodb/src/models/View.ts
index a94d39db58..f64399ac09 100644
--- a/packages/nocodb/src/models/View.ts
+++ b/packages/nocodb/src/models/View.ts
@@ -130,14 +130,6 @@ export default class View implements ViewType {
       if (view) {
         view.meta = parseMetaProp(view);
 
-        if (view.fk_custom_url_id) {
-          const customUrl = await CustomUrl.get({
-            id: view.fk_custom_url_id,
-          });
-
-          view.custom_url_path = customUrl.custom_path || null;
-        }
-
         await NocoCache.set(`${CacheScope.VIEW}:${view.id}`, view);
       }
     }
@@ -180,14 +172,6 @@ export default class View implements ViewType {
       );
 
       if (view) {
-        if (view.fk_custom_url_id) {
-          const customUrl = await CustomUrl.get({
-            id: view.fk_custom_url_id,
-          });
-
-          view.custom_url_path = customUrl.custom_path || null;
-        }
-
         await NocoCache.set(
           `${CacheScope.VIEW}:${fk_model_id}:${view.id}`,
           view,
@@ -228,13 +212,6 @@ export default class View implements ViewType {
       );
       if (view) {
         view.meta = parseMetaProp(view);
-        if (view.fk_custom_url_id) {
-          const customUrl = await CustomUrl.get({
-            id: view.fk_custom_url_id,
-          });
-
-          view.custom_url_path = customUrl.custom_path || null;
-        }
 
         await NocoCache.set(`${CacheScope.VIEW}:${fk_model_id}:default`, view);
       }
@@ -266,14 +243,6 @@ export default class View implements ViewType {
       );
       for (const view of viewsList) {
         view.meta = parseMetaProp(view);
-
-        if (view.fk_custom_url_id) {
-          const customUrl = await CustomUrl.get({
-            id: view.fk_custom_url_id,
-          });
-
-          view.custom_url_path = customUrl.custom_path || null;
-        }
       }
       await NocoCache.setList(CacheScope.VIEW, [modelId], viewsList);
     }
diff --git a/packages/nocodb/src/schema/swagger-v2.json b/packages/nocodb/src/schema/swagger-v2.json
index c4f943010e..6db88eb21c 100644
--- a/packages/nocodb/src/schema/swagger-v2.json
+++ b/packages/nocodb/src/schema/swagger-v2.json
@@ -22132,6 +22132,40 @@
           }
         },
         "type": "object"
+      },
+      "CustomUrl": {
+        "description": "Model for Custom Url",
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "description": "Id associated to the Custom url"
+          },
+          "fk_workspace_id": {
+            "type": "string",
+            "description": "Workspace ID"
+          },
+          "base_id": {
+            "type": "string",
+            "description": "Base ID"
+          },
+          "fk_model_id": {
+            "type": "string",
+            "description": "Model ID"
+          },
+          "view_id": {
+            "type": "string",
+            "description": "View ID"
+          },
+          "original_path": {
+            "type": "string",
+            "description": "Original url used for redirection purpose"
+          },
+          "custom_path": {
+            "type": "string",
+            "description": "Custom url path"
+          }
+        }
       }
     },
     "responses": {