select menu items by keyboard (cmdbox->'c')

Author: Erwin Dondorp

saltgui/static/scripts/Router.js

@@ -77,7 +77,13 @@ export class Router {
     /* eslint-enable compat/compat */
   }
 
-  _registerMenuItem (pParentId, pButtonId, pUrl) {
+  _registerMenuItem (pParentId, pButtonId, pUrl, pKey) {
+
+    // shortcut
+
+    if (pKey) {
+      Utils.setStorageItem("session", "menu_" + pKey, pUrl);
+    }
 
     // full menu
 
@@ -177,19 +183,20 @@ export class Router {
       /* eslint-enable compat/compat */
     });
 
-    this._registerMenuItem(null, "minions", "minions");
-    this._registerMenuItem("minions", "grains", "grains");
-    this._registerMenuItem("minions", "schedules", "schedules");
-    this._registerMenuItem("minions", "pillars", "pillars");
-    this._registerMenuItem("minions", "beacons", "beacons");
-    this._registerMenuItem("minions", "nodegroups", "nodegroups");
-    this._registerMenuItem(null, "keys", "keys");
-    this._registerMenuItem(null, "jobs", "jobs");
-    this._registerMenuItem("jobs", "highstate", "highstate");
-    this._registerMenuItem("jobs", "templates", "templates");
-    this._registerMenuItem(null, "events", "events");
-    this._registerMenuItem("events", "reactors", "reactors");
-    this._registerMenuItem(null, "issues", "issues");
+    this._registerMenuItem(null, "minions", "minions", "m");
+    this._registerMenuItem("minions", "grains", "grains", "g");
+    this._registerMenuItem("minions", "schedules", "schedules", "s");
+    this._registerMenuItem("minions", "pillars", "pillars", "p");
+    this._registerMenuItem("minions", "beacons", "beacons", "b");
+    this._registerMenuItem("minions", "nodegroups", "nodegroups", "n");
+    this._registerMenuItem(null, "keys", "keys", "k");
+    this._registerMenuItem(null, "jobs", "jobs", "j");
+    this._registerMenuItem("jobs", "highstate", "highstate", "h");
+    this._registerMenuItem("jobs", "templates", "templates", "t");
+    this._registerMenuItem(null, "events", "events", "e");
+    this._registerMenuItem("events", "reactors", "reactors", "r");
+    this._registerMenuItem(null, "issues", "issues", "i");
+    // no shortcut for logout
     this._registerMenuItem(null, "logout", "logout");
   }
 

saltgui/static/scripts/Utils.js

@@ -663,9 +663,13 @@ export class Utils {
     if (pKeyUpEvent.isComposing) {
       return false;
     }
+    if (pKeyUpEvent.target !== document.body) {
+      // not when focus is in a text field
+      return false;
+    }
     if (pKeyUpEvent.key.length > 1) {
       // not a simple key
-      // return false;
+      return false;
     }
     return true;
   }

saltgui/static/scripts/pages/Page.js

@@ -1,6 +1,7 @@
 /* global */
 
 import {CommandBox} from "../CommandBox.js";
+import {Router} from "../Router.js";
 import {Utils} from "../Utils.js";
 
 export class Page {
@@ -33,27 +34,23 @@ export class Page {
 
     const body = document.querySelector("body");
     body.onkeyup = (keyUpEvent) => {
+      if (!Utils.isValidKeyUpEvent(keyUpEvent)) {
+        return;
+      }
+
       if (this._handleTemplateKey(keyUpEvent)) {
         keyUpEvent.stopPropagation();
         return;
       }
-      if (Page._handleMenuKey(keyUpEvent)) {
+
+      if (this._handleMenuKey(keyUpEvent)) {
         keyUpEvent.stopPropagation();
         // return;
       }
     };
   }
 
   _handleTemplateKey (keyUpEvent) {
-    if (!Utils.isValidKeyUpEvent(keyUpEvent)) {
-      return false;
-    }
-
-    if (keyUpEvent.target !== document.body) {
-      // not when focus is in a text field
-      return false;
-    }
-
     const templateName = Utils.getStorageItem("session", "template_" + keyUpEvent.key, "");
     if (templateName === "") {
       // key not bound to a template
@@ -66,6 +63,23 @@ export class Page {
     return true;
   }
 
+  _handleMenuKey (keyUpEvent) {
+    if (keyUpEvent.key === "c") {
+      CommandBox.showManualRun(this.api);
+      return true;
+    }
+
+    const pages = Router._getPagesList();
+    const page = Utils.getStorageItem("session", "menu_" + keyUpEvent.key, "");
+    // Arrays.includes() is only available from ES7/2016
+    if (page && (pages.length === 0 || pages.indexOf(page) >= 0)) {
+      this.router.goTo(page);
+      return true;
+    }
+
+    return false;
+  }
+
   addPanel (pPanel) {
     pPanel.route = this;
     pPanel.router = this.router;