From c75abaa48ce3273a44b47be928d1f4b33ed3aeac Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa@nocodb.com>
Date: Wed, 8 Nov 2023 10:17:32 +0000
Subject: [PATCH] fix: Renamed delete to remove data source

---
 .../components/dashboard/settings/DataSources.vue |  9 +++++++--
 .../nc-gui/components/general/DeleteModal.vue     | 15 ++++++++++++---
 packages/nc-gui/lang/en.json                      |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/dashboard/settings/DataSources.vue b/packages/nc-gui/components/dashboard/settings/DataSources.vue
index 1f2f76cbcf..2121e965da 100644
--- a/packages/nc-gui/components/dashboard/settings/DataSources.vue
+++ b/packages/nc-gui/components/dashboard/settings/DataSources.vue
@@ -529,7 +529,7 @@ const isEditBaseModalOpen = computed({
                   </NcTooltip>
                   <NcTooltip>
                     <template #title>
-                      {{ $t('general.delete') }}
+                      {{ $t('general.remove') }}
                     </template>
                     <NcButton
                       v-if="!source.is_meta && !source.is_local"
@@ -581,7 +581,12 @@ const isEditBaseModalOpen = computed({
           <LazyDashboardSettingsBaseAudit :source-id="activeBaseId" @close="isBaseAuditModalOpen = false" />
         </div>
       </GeneralModal>
-      <GeneralDeleteModal v-model:visible="isDeleteBaseModalOpen" :entity-name="$t('general.datasource')" :on-delete="deleteBase">
+      <GeneralDeleteModal
+        v-model:visible="isDeleteBaseModalOpen"
+        :entity-name="$t('general.datasource')"
+        :on-delete="deleteBase"
+        :delete-label="$t('general.remove')"
+      >
         <template #entity-preview>
           <div v-if="toBeDeletedBase" class="flex flex-row items-center py-2 px-3.25 bg-gray-50 rounded-lg text-gray-700 mb-4">
             <GeneralBaseLogo :source-type="toBeDeletedBase.type" />
diff --git a/packages/nc-gui/components/general/DeleteModal.vue b/packages/nc-gui/components/general/DeleteModal.vue
index 9de0ca5fd9..1ff37554d4 100644
--- a/packages/nc-gui/components/general/DeleteModal.vue
+++ b/packages/nc-gui/components/general/DeleteModal.vue
@@ -5,6 +5,7 @@ const props = defineProps<{
   visible: boolean
   entityName: string
   onDelete: () => Promise<void>
+  deleteLabel?: string | undefined
 }>()
 
 const emits = defineEmits(['update:visible'])
@@ -12,6 +13,10 @@ const visible = useVModel(props, 'visible', emits)
 
 const isLoading = ref(false)
 
+const { t } = useI18n()
+
+const deleteLabel = computed(() => props.deleteLabel ?? t('general.delete'))
+
 const onDelete = async () => {
   isLoading.value = true
   try {
@@ -43,11 +48,15 @@ onKeyStroke('Enter', () => {
   <GeneralModal v-model:visible="visible" size="small" centered>
     <div class="flex flex-col p-6">
       <div class="flex flex-row pb-2 mb-4 font-medium text-lg border-b-1 border-gray-50 text-gray-800">
-        {{ $t('general.delete') }} {{ props.entityName }}
+        {{ deleteLabel }} {{ props.entityName }}
       </div>
 
       <div class="mb-3 text-gray-800">
-        {{ $t('msg.areYouSureUWantTo') }}<span class="ml-1">{{ props.entityName.toLowerCase() }}?</span>
+        {{
+          $t('msg.areYouSureUWantToDeleteLabel', {
+            deleteLabel: deleteLabel.toLowerCase(),
+          })
+        }}<span class="ml-1">{{ props.entityName.toLowerCase() }}?</span>
       </div>
 
       <slot name="entity-preview"></slot>
@@ -65,7 +74,7 @@ onKeyStroke('Enter', () => {
           data-testid="nc-delete-modal-delete-btn"
           @click="onDelete"
         >
-          {{ `${$t('general.delete')} ${props.entityName}` }}
+          {{ `${deleteLabel} ${props.entityName}` }}
           <template #loading>
             {{ $t('general.deleting') }}
           </template>
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 3eb2933c86..5e82f7cc51 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -994,6 +994,7 @@
     "createWebhookMsg2": "Create web-hooks to power you automations,",
     "createWebhookMsg3": "Get notified as soon as there are changes in your data",
     "areYouSureUWantTo": "Are you sure you want to delete the following",
+    "areYouSureUWantToDeleteLabel": "Are you sure you want to {deleteLabel} the following",
     "idColumnRequired": "ID field is required, you can rename this later if required.",
     "length59Required": "The length exceeds the max 59 characters",
     "noNewNotifications": "You have no new notifications",