From 258476876a24ee7c8dd22241ddde5c69f0527897 Mon Sep 17 00:00:00 2001
From: Yiya Chen <yiya.chen@suse.com>
Date: Wed, 14 May 2025 15:27:06 +0800
Subject: [PATCH] refactor: the promptRemove.confirmRelatedResource message
 needs to be refactored (#293)

* feat: change dialog wordings

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>

* refactor: update protip wording

Co-authored-by: Jillian Maroket <67180770+jillian-maroket@users.noreply.github.com>
Signed-off-by: Yiya Chen <yiya.chen@suse.com>

---------

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
Signed-off-by: Yiya Chen <yiya.chen@suse.com>
Co-authored-by: Jillian Maroket <67180770+jillian-maroket@users.noreply.github.com>
---
 .../dialog/ConfirmRelatedToRemoveDialog.vue   | 32 +++++++++++++++----
 pkg/harvester/l10n/en-us.yaml                 |  7 +++-
 pkg/harvester/models/harvester/namespace.js   |  3 +-
 pkg/harvester/models/harvester/node.js        |  3 +-
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/pkg/harvester/dialog/ConfirmRelatedToRemoveDialog.vue b/pkg/harvester/dialog/ConfirmRelatedToRemoveDialog.vue
index 13258eaf..fbf43660 100644
--- a/pkg/harvester/dialog/ConfirmRelatedToRemoveDialog.vue
+++ b/pkg/harvester/dialog/ConfirmRelatedToRemoveDialog.vue
@@ -42,8 +42,25 @@ export default {
   computed: {
     ...mapState('action-menu', ['modalData']),
 
-    warningMessageKey() {
-      return this.modalData.warningMessageKey;
+    title() {
+      return this.modalData.title || 'dialog.promptRemove.title';
+    },
+
+    formattedType() {
+      return this.type.toLowerCase();
+    },
+
+    warningMessage() {
+      if (this.modalData.warningMessage) return this.t(this.modalData.warningMessage);
+
+      const isPlural = this.type.endsWith('s');
+      const thisOrThese = isPlural ? 'these' : 'this';
+      const defaultMessage = this.t('dialog.promptRemove.warningMessage', {
+        type: this.formattedType,
+        thisOrThese,
+      });
+
+      return defaultMessage;
     },
 
     names() {
@@ -101,7 +118,7 @@ export default {
     },
 
     protip() {
-      return this.t('promptRemove.protip', { alternateLabel });
+      return this.t('dialog.promptRemove.protip', { alternateLabel });
     },
   },
 
@@ -137,19 +154,22 @@ export default {
   >
     <template #title>
       <h4 class="text-default-text">
-        {{ t('promptRemove.title') }}
+        {{ t(title, { type }, true) }}
       </h4>
     </template>
 
     <template #body>
       <div class="pl-10 pr-10">
         <span
-          v-clean-html="t(warningMessageKey, { type, names: resourceNames }, true)"
+          v-clean-html="warningMessage"
         ></span>
 
         <div class="mt-10 mb-10">
           <span
-            v-clean-html="t('promptRemove.confirmName', { nameToMatch: escapeHtml(nameToMatch) }, true)"
+            v-clean-html="t('dialog.promptRemove.confirmName', {
+              type: formattedType,
+              nameToMatch: escapeHtml(nameToMatch)
+            }, true)"
           ></span>
         </div>
         <div class="mb-10">
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index ac32d83c..d748aa1e 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -52,6 +52,11 @@ dialog:
       message: "Are you sure you want to continue stop the {type} {names}?"
     pause:
       message: "Are you sure you want to continue pause the {type} {names}?"
+  promptRemove:
+    title: "Delete {type}"
+    warningMessage: "Deleting the selected {type} permanently removes all resources on {thisOrThese} {type}. This action is irreversible. Do you want to continue?"
+    confirmName: "Type <b>{nameToMatch}</b> to delete the {type}:"
+    protip: "Tip: Hold the {alternateLabel} key while clicking Delete to bypass the confirmation step."
 
 harvester:
   branding:
@@ -782,7 +787,7 @@ harvester:
     instanceLabels:
       banner: These labels are automatically synchronized to the virtual machine instance.
     labels:
-      banner: These key values are added as labels to the virtual machine.  
+      banner: These key values are added as labels to the virtual machine.
 
   volume:
     label: Volumes
diff --git a/pkg/harvester/models/harvester/namespace.js b/pkg/harvester/models/harvester/namespace.js
index 57198ef7..e15bedbe 100644
--- a/pkg/harvester/models/harvester/namespace.js
+++ b/pkg/harvester/models/harvester/namespace.js
@@ -67,8 +67,7 @@ export default class HciNamespace extends namespace {
   promptRemove(resources = this) {
     this.$dispatch('promptModal', {
       resources,
-      warningMessageKey: 'promptRemove.confirmRelatedResource',
-      component:         'ConfirmRelatedToRemoveDialog'
+      component: 'ConfirmRelatedToRemoveDialog'
     });
   }
 
diff --git a/pkg/harvester/models/harvester/node.js b/pkg/harvester/models/harvester/node.js
index 5ffbe41b..f71a5798 100644
--- a/pkg/harvester/models/harvester/node.js
+++ b/pkg/harvester/models/harvester/node.js
@@ -115,8 +115,7 @@ export default class HciNode extends HarvesterResource {
   promptRemove(resources = this) {
     this.$dispatch('promptModal', {
       resources,
-      warningMessageKey: 'promptRemove.confirmRelatedResource',
-      component:         'ConfirmRelatedToRemoveDialog'
+      component: 'ConfirmRelatedToRemoveDialog'
     });
   }