Skip to content

Commit bc28ae4

Browse files
author
Hoang Nguyen
authored
ui: Add storage name to delete primary/secondary storage dialog (#5359)
* Add storage name to delete primary/secondary storage dialog * show display name in alert message * Update AutogenView.vue
1 parent 74b6332 commit bc28ae4

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

ui/src/config/section/infra/primaryStorages.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ export default {
111111
label: 'label.action.delete.primary.storage',
112112
dataView: true,
113113
args: ['forced'],
114-
show: (record) => { return (record.state === 'Down' || record.state === 'Maintenance' || record.state === 'Disconnected') }
114+
show: (record) => { return (record.state === 'Down' || record.state === 'Maintenance' || record.state === 'Disconnected') },
115+
displayName: (record) => { return record.name || record.displayName || record.id }
115116
}
116117
]
117118
}

ui/src/config/section/infra/secondaryStorages.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ export default {
8484
icon: 'delete',
8585
label: 'label.action.delete.secondary.storage',
8686
message: 'message.action.delete.secondary.storage',
87-
dataView: true
87+
dataView: true,
88+
displayName: (record) => { return record.name || record.displayName || record.id }
8889
}
8990
]
9091
}

ui/src/views/AutogenView.vue

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,14 @@
143143
</a>
144144
</span>
145145
<a-spin :spinning="actionLoading">
146-
<span v-if="currentAction.message">
146+
<span v-if="currentAction.message || 'displayName' in currentAction">
147147
<a-alert type="warning">
148-
<span slot="message" v-html="$t(currentAction.message)" />
148+
<span slot="message">
149+
<div v-if="currentAction.message" v-html="$t(currentAction.message)"></div>
150+
<div v-if="'displayName' in currentAction">
151+
<strong>{{ currentAction.displayName(resource) }}</strong>
152+
</div>
153+
</span>
149154
</a-alert>
150155
<br v-if="currentAction.paramFields.length > 0"/>
151156
</span>

0 commit comments

Comments
 (0)