diff --git a/ui/src/config/section/network.js b/ui/src/config/section/network.js index 657a3f5ddb4..03aa388b4ae 100644 --- a/ui/src/config/section/network.js +++ b/ui/src/config/section/network.js @@ -114,9 +114,9 @@ export default { label: 'label.restart.network', message: 'message.restart.network', dataView: true, - args: (record) => { + args: (record, store, isGroupAction) => { var fields = [] - if (record.vpcid == null) { + if (isGroupAction || record.vpcid == null) { fields.push('cleanup') } fields.push('livepatch') diff --git a/ui/src/utils/plugins.js b/ui/src/utils/plugins.js index 6a8cc1b5d2b..63a0e609c5d 100644 --- a/ui/src/utils/plugins.js +++ b/ui/src/utils/plugins.js @@ -133,23 +133,25 @@ export const pollJobPlugin = { if (name) { desc = `(${name}) ${desc}` } + let onClose = () => {} if (!bulkAction) { let countNotify = store.getters.countNotify countNotify++ store.commit('SET_COUNT_NOTIFY', countNotify) - notification.error({ - top: '65px', - message: errMessage, - description: desc, - key: jobId, - duration: 0, - onClose: () => { - let countNotify = store.getters.countNotify - countNotify > 0 ? countNotify-- : countNotify = 0 - store.commit('SET_COUNT_NOTIFY', countNotify) - } - }) + onClose = () => { + let countNotify = store.getters.countNotify + countNotify > 0 ? countNotify-- : countNotify = 0 + store.commit('SET_COUNT_NOTIFY', countNotify) + } } + notification.error({ + top: '65px', + message: errMessage, + description: desc, + key: jobId, + duration: 0, + onClose: onClose + }) store.dispatch('AddHeaderNotice', { key: jobId, title,