use only one helper function for cmdbox; and simplified calling it

Author: Erwin Dondorp

saltgui/static/scripts/panels/BeaconsMinion.js

@@ -179,7 +179,8 @@ export class BeaconsMinionPanel extends Panel {
       // run the command with the original beacon definition
       tr.addEventListener("click", (pClickEvent) => {
         const beacon0 = beacons0[beaconName];
-        this.runCommand(pMinionId, ["beacons.modify", beaconName, beacon0]);
+        const cmdArr = ["beacons.modify", beaconName, beacon0];
+        this.runCommand("", pMinionId, cmdArr);
         pClickEvent.stopPropagation();
       });
 
@@ -204,7 +205,8 @@ export class BeaconsMinionPanel extends Panel {
       return "Disable beacons...";
     }, () => {
       const minionId = decodeURIComponent(Utils.getQueryParam("minionid"));
-      this.runCommand(minionId, ["beacons.disable"]);
+      const cmdArr = ["beacons.disable"];
+      this.runCommand("", minionId, cmdArr);
     });
   }
 
@@ -216,28 +218,32 @@ export class BeaconsMinionPanel extends Panel {
       return "Enable beacons...";
     }, () => {
       const minionId = decodeURIComponent(Utils.getQueryParam("minionid"));
-      this.runCommand(minionId, ["beacons.enable"]);
+      const cmdArr = ["beacons.enable"];
+      this.runCommand("", minionId, cmdArr);
     });
   }
 
   _addPanelMenuItemBeaconsAdd () {
     this.panelMenu.addMenuItem("Add beacon...", () => {
       const minionId = decodeURIComponent(Utils.getQueryParam("minionid"));
-      this.runCommand(minionId, ["beacons.add", "<name>", "<data>"]);
+      const cmdArr = ["beacons.add", "<name>", "<data>"];
+      this.runCommand("", minionId, cmdArr);
     });
   }
 
   _addPanelMenuItemBeaconsReset () {
     this.panelMenu.addMenuItem("Reset beacons...", () => {
       const minionId = decodeURIComponent(Utils.getQueryParam("minionid"));
-      this.runCommand(minionId, ["beacons.reset"]);
+      const cmdArr = ["beacons.reset"];
+      this.runCommand("", minionId, cmdArr);
     });
   }
 
   _addPanelMenuItemBeaconsSave () {
     this.panelMenu.addMenuItem("Save beacons...", () => {
       const minionId = decodeURIComponent(Utils.getQueryParam("minionid"));
-      this.runCommand(minionId, ["beacons.save"]);
+      const cmdArr = ["beacons.save"];
+      this.runCommand("", minionId, cmdArr);
     });
   }
 
@@ -246,7 +252,8 @@ export class BeaconsMinionPanel extends Panel {
       return;
     }
     pMenu.addMenuItem("Disable beacon...", () => {
-      this.runCommand(pMinionId, ["beacons.disable_beacon", key]);
+      const cmdArr = ["beacons.disable_beacon", key];
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 
@@ -255,13 +262,15 @@ export class BeaconsMinionPanel extends Panel {
       return;
     }
     pMenu.addMenuItem("Enable beacon...", () => {
-      this.runCommand(pMinionId, ["beacons.enable_beacon", key]);
+      const cmdArr = ["beacons.enable_beacon", key];
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 
   _addMenuItemBeaconsDelete (pMenu, pMinionId, key) {
     pMenu.addMenuItem("Delete beacon...", () => {
-      this.runCommand(pMinionId, ["beacons.delete", key]);
+      const cmdArr = ["beacons.delete", key];
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 

saltgui/static/scripts/panels/GrainsMinion.js

@@ -78,7 +78,8 @@ export class GrainsMinionPanel extends Panel {
       tbody.appendChild(grainTr);
 
       grainTr.addEventListener("click", (pClickEvent) => {
-        this.runCommand(pMinionId, ["grains.setval", grainName, grains[grainName]]);
+        const cmdArr = ["grains.setval", grainName, grains[grainName]];
+        this.runCommand("", pMinionId, cmdArr);
         pClickEvent.stopPropagation();
       });
     }
@@ -92,20 +93,23 @@ export class GrainsMinionPanel extends Panel {
     this.panelMenu.addMenuItem("Add grain...", () => {
       // use placeholders for name and value
       const minionId = decodeURIComponent(Utils.getQueryParam("minionid"));
-      this.runCommand(minionId, ["grains.setval", "<name>", "<value>"]);
+      const cmdArr = ["grains.setval", "<name>", "<value>"];
+      this.runCommand("", minionId, cmdArr);
     });
   }
 
   _addPanelMenuItemSaltUtilRefreshGrains () {
     this.panelMenu.addMenuItem("Refresh grains...", () => {
       const minionId = decodeURIComponent(Utils.getQueryParam("minionid"));
-      this.runCommand(minionId, ["saltutil.refresh_grains"]);
+      const cmdArr = ["saltutil.refresh_grains"];
+      this.runCommand("", minionId, cmdArr);
     });
   }
 
   _addMenuItemGrainsSetValUpdate (pMenu, pMinionId, key, grains) {
     pMenu.addMenuItem("Edit grain...", () => {
-      this.runCommand(pMinionId, ["grains.setval", key, grains[key]]);
+      const cmdArr = ["grains.setval", key, grains[key]];
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 
@@ -114,7 +118,8 @@ export class GrainsMinionPanel extends Panel {
       return;
     }
     pMenu.addMenuItem("Add value...", () => {
-      this.runCommand(pMinionId, ["grains.append", key, "<value>"]);
+      const cmdArr = ["grains.append", key, "<value>"];
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 
@@ -125,7 +130,7 @@ export class GrainsMinionPanel extends Panel {
     }
     cmdArr.push(pKey);
     pMenu.addMenuItem("Delete key...", () => {
-      this.runCommand(pMinionId, cmdArr);
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 
@@ -136,7 +141,7 @@ export class GrainsMinionPanel extends Panel {
     }
     cmdArr.push(pKey);
     pMenu.addMenuItem("Delete value...", () => {
-      this.runCommand(pMinionId, cmdArr);
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 }

saltgui/static/scripts/panels/HighState.js

@@ -56,13 +56,15 @@ export class HighStatePanel extends Panel {
 
   _addMenuItemStateApply (pMenu, pMinionId) {
     pMenu.addMenuItem("Apply state...", () => {
-      this.runCommand(pMinionId, ["state.apply"]);
+      const cmdArr = ["state.apply"];
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 
   _addMenuItemStateApplyTest (pMenu, pMinionId) {
     pMenu.addMenuItem("Test state...", () => {
-      this.runCommand(pMinionId, ["state.apply", "test=", true]);
+      const cmdArr = ["state.apply", "test=", true];
+      this.runCommand("", pMinionId, cmdArr);
     });
   }
 
@@ -88,9 +90,10 @@ export class HighStatePanel extends Panel {
       minionTr.addEventListener("click", (pClickEvent) => {
         const functionField = minionTr.querySelector(".function");
         if (functionField && functionField.cmd) {
-          this.runFullCommand("", minionId, functionField.cmd);
+          this.runCommand("", minionId, functionField.cmd);
         } else {
-          this.runCommand(minionId, ["state.apply"]);
+          const cmdArr = ["state.apply"];
+          this.runCommand("", minionId, cmdArr);
         }
         pClickEvent.stopPropagation();
       });
@@ -308,7 +311,8 @@ export class HighStatePanel extends Panel {
             continue;
           }
           span.addEventListener("click", (pClickEvent) => {
-            this.runCommand(minionId, ["state.sls_id", data.__id__, "mods=", data.__sls__]);
+            const cmdArr = ["state.sls_id", data.__id__, "mods=", data.__sls__];
+            this.runCommand("", minionId, cmdArr);
             pClickEvent.stopPropagation();
           });
           Output._setTaskToolTip(span, data);

saltgui/static/scripts/panels/Job.js

@@ -104,7 +104,7 @@ export class JobPanel extends Panel {
       return pObj;
     }
     if (pObj.match(/^[a-z_][a-z0-9_]*(?:[.][a-z0-9_]+)*$/i)) {
-      // simple string that cannot be confuses with
+      // simple string that cannot be confused with
       // another object type
       return pObj;
     }
@@ -267,7 +267,7 @@ export class JobPanel extends Panel {
       }
       return "Re-run job...";
     }, () => {
-      this.runFullCommand(this.targettype, this.target, this.commandtext);
+      this.runCommand(this.targettype, this.target, this.commandtext);
     });
   }
 
@@ -303,7 +303,7 @@ export class JobPanel extends Panel {
       return "Re-run job on all minions...";
     }, () => {
       const lst = this._listForRerunJobOnAllMinions();
-      this.runFullCommand("list", lst, this.commandtext);
+      this.runCommand("list", lst, this.commandtext);
     });
   }
 
@@ -350,7 +350,7 @@ export class JobPanel extends Panel {
       return "Re-run job on unsuccessful minions...";
     }, () => {
       const lst = this._listForRerunJobOnUnsuccessfulMinions();
-      this.runFullCommand("list", lst, this.commandtext);
+      this.runCommand("list", lst, this.commandtext);
     });
   }
 
@@ -383,7 +383,7 @@ export class JobPanel extends Panel {
       return "Re-run job on failed minions...";
     }, () => {
       const lst = this._listForRerunJobOnFailedMinions();
-      this.runFullCommand("list", lst, this.commandtext);
+      this.runCommand("list", lst, this.commandtext);
     });
   }
 
@@ -416,7 +416,7 @@ export class JobPanel extends Panel {
       return "Re-run job on non responding minions...";
     }, () => {
       const lst = this._listForRerunJobOnNonRespondingMinions();
-      this.runFullCommand("list", lst, this.commandtext);
+      this.runCommand("list", lst, this.commandtext);
     });
   }
 
@@ -427,7 +427,8 @@ export class JobPanel extends Panel {
       }
       return "Terminate job...";
     }, () => {
-      this.runFullCommand(this.targettype, this.target, "saltutil.term_job " + this.jobid);
+      const cmdArr = ["saltutil.term_job", this.jobid];
+      this.runCommand(this.targettype, this.target, cmdArr);
     });
   }
 
@@ -438,7 +439,8 @@ export class JobPanel extends Panel {
       }
       return "Kill job...";
     }, () => {
-      this.runFullCommand(this.targettype, this.target, "saltutil.kill_job " + this.jobid);
+      const cmdArr = ["saltutil.kill_job", this.jobid];
+      this.runCommand(this.targettype, this.target, cmdArr);
     });
   }
 
@@ -449,7 +451,8 @@ export class JobPanel extends Panel {
       }
       return "Signal job...";
     }, () => {
-      this.runFullCommand(this.targettype, this.target, "saltutil.signal_job " + this.jobid + " signal=<signalnumber>");
+      const cmdArr = ["saltutil.signal_job", this.jobid, "signal=", "<signalnumber>"];
+      this.runCommand(this.targettype, this.target, cmdArr);
     });
   }
 
@@ -501,16 +504,20 @@ export class JobPanel extends Panel {
 
         const menu = new DropDownMenu(noResponseSpan, true);
         menu.addMenuItem("Show process info...", () => {
-          this.runFullCommand("list", minionId, "ps.proc_info " + pid);
+          const cmdArr = ["ps.proc_info", pid];
+          this.runCommand("", minionId, cmdArr);
         });
         menu.addMenuItem("Terminate process...", () => {
-          this.runFullCommand("list", minionId, "ps.kill_pid " + pid + " signal=15");
+          const cmdArr = ["ps.kill_pid", pid, "signal=", 15];
+          this.runCommand("", minionId, cmdArr);
         });
         menu.addMenuItem("Kill process...", () => {
-          this.runFullCommand("list", minionId, "ps.kill_pid " + pid + " signal=9");
+          const cmdArr = ["ps.kill_pid", pid, "signal=", 9];
+          this.runCommand("", minionId, cmdArr);
         });
         menu.addMenuItem("Signal process...", () => {
-          this.runFullCommand("list", minionId, "ps.kill_pid " + pid + " signal=<signalnumber>");
+          const cmdArr = ["ps.kill_pid", pid, "signal=", "<signalnumber>"];
+          this.runCommand("", minionId, cmdArr);
         });
 
         noResponseSpan.classList.remove("noresponse");

saltgui/static/scripts/panels/JobsDetails.js

@@ -380,7 +380,8 @@ export class JobsDetailsPanel extends JobsPanel {
 
   _addMenuItemJobsRerunJob (pMenu, job, argumentsText) {
     pMenu.addMenuItem("Re-run job...", () => {
-      this.runFullCommand(job["Target-type"], job.Target, job.Function + argumentsText);
+      const cmdStr = job.Function + argumentsText;
+      this.runCommand(job["Target-type"], job.Target, cmdStr);
     });
   }