handle unaccepted/rejected/denied too

erwindon · Aug 3, 2024 · 9417405 · 9417405
1 parent 836cdc9
commit 9417405
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/saltgui/static/scripts/panels/Keys.js b/saltgui/static/scripts/panels/Keys.js
@@ -55,7 +55,14 @@ export class KeysPanel extends Panel {
         this._handleWheelKeyFinger(pWheelKeyFingerData);
         return true;
       }, (pWheelKeyFingerMsg) => {
-        const allMinionsErr = Utils.msgPerMinion(pWheelKeyListAllData.return[0].data.return.minions, JSON.stringify(pWheelKeyFingerMsg));
+        const msg = JSON.stringify(pWheelKeyFingerMsg);
+        const allMinionsErr1 = Utils.msgPerMinion(pWheelKeyListAllData.return[0].data.return.minions, msg);
+        const allMinionsErr2 = Utils.msgPerMinion(pWheelKeyListAllData.return[0].data.return.minions_pre, msg);
+        const allMinionsErr3 = Utils.msgPerMinion(pWheelKeyListAllData.return[0].data.return.minions_rejected, msg);
+        const allMinionsErr4 = Utils.msgPerMinion(pWheelKeyListAllData.return[0].data.return.minions_denied, msg);
+        /* eslint-disable prefer-object-spread */
+        const allMinionsErr = Object.assign({}, allMinionsErr1, allMinionsErr2, allMinionsErr3, allMinionsErr4);
+        /* eslint-enable prefer-object-spread */
         this._handleWheelKeyFinger({"return": [{"data": {"return": {"minions": allMinionsErr}}}]});
         return false;
       });