ui: Fix groupaction for nw cleanup and Notify when groupaction fails (apache#6333)

davidjumani · web-flow · commit b85d5e491a15 · 2022-04-28T09:21:43.000-03:00
diff --git 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
@@ -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,
