upgrade to ES2017

Author: Erwin Dondorp

docs/README.md

@@ -1,6 +1,6 @@
 # SaltGUI
 
-SaltGUI is an open source web interface for managing a SaltStack server and its minions. Built using plain ES2016 and implemented as a wrapper around the rest_cherrypy server a.k.a. salt-api.
+SaltGUI is an open source web interface for managing a SaltStack server and its minions. Built using plain ES2017 and implemented as a wrapper around the rest_cherrypy server a.k.a. salt-api.
 
 **Security Note**: For production deployments, TLS encryption is strongly recommended. See [TLS Configuration](#tls-configuration) for complete setup instructions.
 

saltgui/static/scripts/output/OutputDocumentation.js

@@ -58,9 +58,7 @@ export class OutputDocumentation {
     // reduce the search key to match the data in the response
     const commandArg = OutputDocumentation._reduceFilterKey(pCommandArg);
 
-    for (const minionId of Object.keys(pResponse)) {
-
-      const output = pResponse[minionId];
+    for (const output of Object.values(pResponse)) {
 
       if (!output) {
         // some commands do not have help-text
@@ -79,14 +77,14 @@ export class OutputDocumentation {
         return false;
       }
 
-      for (const key of Object.keys(output)) {
+      for (const [key,out] of Object.entries(output)) {
         // e.g. for "test.rand_str"
-        if (output[key] === null) {
+        if (out === null) {
           continue;
         }
 
         // but otherwise it must be a (documentation)string
-        if (typeof output[key] !== "string") {
+        if (typeof out !== "string") {
           return false;
         }
 
@@ -147,7 +145,7 @@ export class OutputDocumentation {
     pFilterKey = OutputDocumentation._reduceFilterKey(pFilterKey);
 
     let selectedMinion = null;
-    for (const minionId of Object.keys(pResponse)) {
+    for (const [minionId,minionResponse] of Object.entries(pResponse)) {
 
       // When we already found the documentation ignore all others
       if (selectedMinion) {
@@ -157,15 +155,14 @@ export class OutputDocumentation {
 
       // make sure it is an object (instead of e.g. "false" for an offline minion)
       // when it is not, the whole entry is ignored
-      if (!pResponse[minionId] || typeof pResponse[minionId] !== "object") {
+      if (!minionResponse || typeof minionResponse !== "object") {
         delete pResponse[minionId];
         continue;
       }
 
       // make sure that the entry matches with the requested command or prefix
       // that's always the case for SYS.DOC output, but not for RUNNERS.DOC.RUNNER
       // and/or RUNNERS.DOC.WHEEL.
-      const minionResponse = pResponse[minionId];
       for (const key of Object.keys(minionResponse)) {
 
         // is this what we were looking for?
@@ -205,13 +202,10 @@ export class OutputDocumentation {
 
     // we expect no minionIds present
     // as it should have been reduced already
-    for (const minionId of Object.keys(pResponse)) {
-
-      const minionResponse = pResponse[minionId];
+    for (const minionResponse of Object.values(pResponse)) {
 
-      for (const key of Object.keys(minionResponse).sort()) {
+      for (let [key,out] of Object.entries(minionResponse).sort()) {
 
-        let out = minionResponse[key];
         if (out === null) {
           continue;
         }

saltgui/static/scripts/output/OutputHighstate.js

@@ -46,9 +46,7 @@ export class OutputHighstate {
   static getHighStateLabel (pMinionId, pMinionResponse) {
     let anyFailures = false;
     let anySkips = false;
-    // do not use Object.entries, that is not supported by the test framework as it is ES8/2017
-    for (const taskKey of Object.keys(pMinionResponse)) {
-      const task = pMinionResponse[taskKey];
+    for (const task of Object.values(pMinionResponse)) {
       if (task.result === null) {
         anySkips = true;
       } else if (!task.result) {

saltgui/static/scripts/output/OutputHighstateTaskSaltGui.js

@@ -148,9 +148,7 @@ export class OutputHighstateTaskSaltGui {
     }
 
     // show any unknown attribute of a task
-    // do not use Object.entries, that is not supported by the test framework as it is ES8/2017
-    for (const key of Object.keys(pTask)) {
-      const item = pTask[key];
+    for (const [key,item] of Object.entries(pTask)) {
       /* eslint-disable line-comment-position,no-inline-comments,curly */
       if (key === "___key___") continue; // ignored, generated by us
       if (key === "__id__") continue; // handled

saltgui/static/scripts/output/OutputJson.js

@@ -44,7 +44,6 @@ export class OutputJson {
       return "{ }";
     }
 
-    // do not use Object.values as eslint does understand that because it is ES8/2017
     if (!Array.isArray(pValue) && Object.keys(pValue).length === 1 && typeof pValue[Object.keys(pValue)[0]] !== "object") {
       // show the brackets for a simple object a bit wider apart
       return "{ " + JSON.stringify(Object.keys(pValue)[0]) + ": " + JSON.stringify(pValue[Object.keys(pValue)[0]]) + " }";
@@ -83,7 +82,6 @@ export class OutputJson {
     // put each name+value on its own line
     str = "{";
     let oSeparator = "";
-    // do not use Object.entries, that is not supported by the test framework as it is ES8/2017
     const sortedKeys = Object.keys(pValue).sort((aa, bb) => aa.localeCompare(bb, "en", {"numeric": true}));
     for (const key of sortedKeys) {
       const item = pValue[key];

saltgui/static/scripts/panels/Keys.js

@@ -117,11 +117,10 @@ export class KeysPanel extends Panel {
 
     const allKeys = pWheelKeyFingerData.return[0].data.return;
 
-    for (const property of Object.keys(allKeys)) {
+    for (const [property,hosts] of Object.entries(allKeys)) {
       if (property === "local") {
         continue;
       }
-      const hosts = allKeys[property];
       for (const minionId of Object.keys(hosts)) {
         const item = this.table.querySelector("#" + Utils.getIdFromMinionId(minionId) + " .os");
         if (item) {

saltgui/static/scripts/panels/Orchestrations.js

@@ -66,13 +66,11 @@ export class OrchestrationsPanel extends Panel {
     for (const key of Object.keys(orchestrations)) {
       keys[orchestrations[key].__sls__] = [];
     }
-    for (const key of Object.keys(orchestrations)) {
-      const orchestration = orchestrations[key];
+    for (const [key,orchestration] of Object.entries(orchestrations)) {
       keys[orchestration.__sls__][key] = orchestration;
     }
     let nrOrchestrations = 0;
-    for (const key of Object.keys(keys).sort()) {
-      const orchestration = keys[key];
+    for (const [key,orchestration] of Object.entries(keys).sort()) {
       if (this._addOrchestration(key, orchestration)) {
         nrOrchestrations += 1;
       }
@@ -87,8 +85,7 @@ export class OrchestrationsPanel extends Panel {
 
     const steps = [];
     let ok = false;
-    for (const name of Object.keys(pOrchestrations)) {
-      const step = pOrchestrations[name];
+    for (const [name,step] of Object.entries(pOrchestrations)) {
       // add key-name to object itself
       step.__key__ = name;
       const salt = step.salt || [];