Skip to content

Commit ee9c05b

Browse files
author
Hoang Nguyen
authored
UI - Added option to allow users to select volumes when doing destroy the list of VMs (apache#5893)
* added option to allow users to select volumes when doing destroy list of VMs * fixes
1 parent 065847e commit ee9c05b

2 files changed

Lines changed: 318 additions & 76 deletions

File tree

ui/src/views/AutogenView.vue

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
</a-affix>
104104

105105
<div v-show="showAction">
106-
<keep-alive v-if="currentAction.component && (!currentAction.groupAction || this.selectedRowKeys.length === 0)">
106+
<keep-alive v-if="currentAction.component && (!currentAction.groupAction || this.selectedRowKeys.length === 0 || (this.selectedRowKeys.length > 0 && currentAction.api === 'destroyVirtualMachine'))">
107107
<a-modal
108108
:visible="showAction"
109109
:closable="true"
@@ -131,10 +131,14 @@
131131
:resource="resource"
132132
:loading="loading"
133133
:action="{currentAction}"
134+
:selectedRowKeys="selectedRowKeys"
135+
:selectedItems="selectedItems"
136+
:chosenColumns="chosenColumns"
134137
v-bind="{currentAction}"
135138
@refresh-data="fetchData"
136139
@poll-action="pollActionCompletion"
137-
@close-action="closeAction"/>
140+
@close-action="closeAction"
141+
@cancel-bulk-action="handleCancel"/>
138142
</a-modal>
139143
</keep-alive>
140144
<a-modal
@@ -1596,4 +1600,9 @@ export default {
15961600
.ant-breadcrumb {
15971601
vertical-align: text-bottom;
15981602
}
1603+
1604+
/deep/.ant-alert-message {
1605+
display: flex;
1606+
align-items: center;
1607+
}
15991608
</style>

0 commit comments

Comments
 (0)