From 6504900d4399e68781a8ec4d86060731d7f25e2b Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Mon, 23 Aug 2021 08:42:01 +0700
Subject: [PATCH 1/3] Add storage name to delete primary/secondary storage
 dialog

---
 ui/src/config/section/infra/primaryStorages.js   |  3 ++-
 ui/src/config/section/infra/secondaryStorages.js |  3 ++-
 ui/src/views/AutogenView.vue                     | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ui/src/config/section/infra/primaryStorages.js b/ui/src/config/section/infra/primaryStorages.js
index eda571766681..dc1880007022 100644
--- a/ui/src/config/section/infra/primaryStorages.js
+++ b/ui/src/config/section/infra/primaryStorages.js
@@ -111,7 +111,8 @@ export default {
       label: 'label.action.delete.primary.storage',
       dataView: true,
       args: ['forced'],
-      show: (record) => { return (record.state === 'Down' || record.state === 'Maintenance' || record.state === 'Disconnected') }
+      show: (record) => { return (record.state === 'Down' || record.state === 'Maintenance' || record.state === 'Disconnected') },
+      displayName: (record) => { return record.name || record.displayName || record.id }
     }
   ]
 }
diff --git a/ui/src/config/section/infra/secondaryStorages.js b/ui/src/config/section/infra/secondaryStorages.js
index 17600aaa17bc..450db7316969 100644
--- a/ui/src/config/section/infra/secondaryStorages.js
+++ b/ui/src/config/section/infra/secondaryStorages.js
@@ -84,7 +84,8 @@ export default {
       icon: 'delete',
       label: 'label.action.delete.secondary.storage',
       message: 'message.action.delete.secondary.storage',
-      dataView: true
+      dataView: true,
+      displayName: (record) => { return record.name || record.displayName || record.id }
     }
   ]
 }
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 5f408c757608..6e33c6aa372f 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -153,6 +153,17 @@
             :form="form"
             @submit="handleSubmit"
             layout="vertical" >
+            <a-form-item
+              v-if="'displayName' in currentAction"
+              :class="[currentAction.paramFields.length > 0 ? '' : 'custom-form-input']">
+              <span slot="label">
+                {{ $t('label.name') }}
+                <a-tooltip :title="$t('label.name')">
+                  <a-icon type="info-circle" />
+                </a-tooltip>
+              </span>
+              <a-alert type="info" :message="currentAction.displayName(resource)"></a-alert>
+            </a-form-item>
             <a-form-item
               v-for="(field, fieldIndex) in currentAction.paramFields"
               :key="fieldIndex"
@@ -1234,4 +1245,8 @@ export default {
 .ant-breadcrumb {
   vertical-align: text-bottom;
 }
+
+.custom-form-input {
+  margin-top: 10px;
+}
 </style>

From 45effff82235235f1f96bc4edd73b91ead3a139c Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Tue, 24 Aug 2021 13:13:23 +0700
Subject: [PATCH 2/3] show display name in alert message

---
 ui/src/views/AutogenView.vue | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 6e33c6aa372f..1c5033bd6529 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -143,9 +143,14 @@
           </a>
         </span>
         <a-spin :spinning="actionLoading">
-          <span v-if="currentAction.message">
+          <span v-if="currentAction.message || 'displayName' in currentAction">
             <a-alert type="warning">
-              <span slot="message" v-html="$t(currentAction.message)" />
+              <span slot="message">
+                <div v-if="currentAction.message" v-html="$t(currentAction.message)"></div>
+                <div v-if="'displayName' in currentAction">
+                  <strong>{{ $t('label.name') + ': ' + currentAction.displayName(resource) }}</strong>
+                </div>
+              </span>
             </a-alert>
             <br v-if="currentAction.paramFields.length > 0"/>
           </span>
@@ -153,17 +158,6 @@
             :form="form"
             @submit="handleSubmit"
             layout="vertical" >
-            <a-form-item
-              v-if="'displayName' in currentAction"
-              :class="[currentAction.paramFields.length > 0 ? '' : 'custom-form-input']">
-              <span slot="label">
-                {{ $t('label.name') }}
-                <a-tooltip :title="$t('label.name')">
-                  <a-icon type="info-circle" />
-                </a-tooltip>
-              </span>
-              <a-alert type="info" :message="currentAction.displayName(resource)"></a-alert>
-            </a-form-item>
             <a-form-item
               v-for="(field, fieldIndex) in currentAction.paramFields"
               :key="fieldIndex"
@@ -1245,8 +1239,4 @@ export default {
 .ant-breadcrumb {
   vertical-align: text-bottom;
 }
-
-.custom-form-input {
-  margin-top: 10px;
-}
 </style>

From 4195792f701a77ccfd463c34bb1e450376c8106a Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit@apache.org>
Date: Tue, 24 Aug 2021 12:39:26 +0530
Subject: [PATCH 3/3] Update AutogenView.vue

---
 ui/src/views/AutogenView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 1c5033bd6529..f691cf952d55 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -148,7 +148,7 @@
               <span slot="message">
                 <div v-if="currentAction.message" v-html="$t(currentAction.message)"></div>
                 <div v-if="'displayName' in currentAction">
-                  <strong>{{ $t('label.name') + ': ' + currentAction.displayName(resource) }}</strong>
+                  <strong>{{ currentAction.displayName(resource) }}</strong>
                 </div>
               </span>
             </a-alert>