Refactor: the promptRemove.confirmRelatedResource message needs to be refactored (backport #293) (#343)

* 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>
(cherry picked from commit 258476876a)

# Conflicts:
#	pkg/harvester/dialog/ConfirmRelatedToRemoveDialog.vue

* Resolve conflict

Signed-off-by: Andy Lee <andy.lee@suse.com>

* Fix conflict

Signed-off-by: Andy Lee <andy.lee@suse.com>

---------

Signed-off-by: Andy Lee <andy.lee@suse.com>
Co-authored-by: Yiya Chen <yiya.chen@suse.com>
Co-authored-by: Andy Lee <andy.lee@suse.com>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.5.1-rc2",
+  "version": "1.5.1-rc4",
   "private": false,
   "engines": {
     "node": ">=20.0.0"

pkg/harvester/dialog/ConfirmRelatedToRemoveDialog.vue

@@ -128,7 +128,7 @@ export default {
     },
 
     protip() {
-      return this.t('promptRemove.protip', { alternateLabel });
+      return this.t('dialog.promptRemove.protip', { alternateLabel });
     },
   },
 
@@ -164,7 +164,7 @@ export default {
   >
     <template #title>
       <h4 class="text-default-text">
-        {{ t('promptRemove.title') }}
+        {{ t(title, { type }, true) }}
       </h4>
     </template>
 

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:
@@ -785,7 +790,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

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'
     });
   }
 

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'
     });
   }
 

pkg/harvester/models/harvesterhci.io.setting.js

@@ -32,14 +32,11 @@ export default class HciSetting extends HarvesterResource {
     const hasUpgradeAccess = !!schema?.collectionMethods.find((x) => ['post'].includes(x.toLowerCase()));
 
     if (this.id === HCI_SETTING.SERVER_VERSION && hasUpgradeAccess) {
-      const latestUpgrade = this.$getters['all'](HCI.UPGRADE).find((upgrade) => upgrade.isLatestUpgrade);
-
       out.unshift({
         action:   'goToAirgapUpgrade',
         enabled:  true,
         icon:     'icon icon-refresh',
         label:    this.t('harvester.upgradePage.upgrade'),
-        disabled: !!latestUpgrade && latestUpgrade?.isUpgradeSucceeded
       });
     }
 

pkg/harvester/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.5.1-rc2",
+  "version": "1.5.1-rc4",
   "private": false,
   "rancher": {
     "annotations": {