Merge pull request #536 from spankywetfish/master

Make runtype switch from "normal" to "async" a sticky setting
erwindon · Aug 16, 2023 · 33e2c9e · 33e2c9e
2 parents 442cc51 + 35a5e95
commit 33e2c9e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/saltgui/static/scripts/Api.js b/saltgui/static/scripts/Api.js
@@ -41,10 +41,12 @@ export class API {
   }
 
   static _cleanStorage () {
-    // clear local storage except key 'eauth'
+    // clear local storage except key 'eauth' and 'runtype'
     const eauth = Utils.getStorageItem("local", "eauth");
+    const runtype = Utils.getStorageItem("local", "runtype");
     Utils.clearStorage("local");
     Utils.setStorageItem("local", "eauth", eauth);
+    Utils.setStorageItem("local", "runtype", runtype);
 
     // clear all of session storage
     Utils.clearStorage("session");

diff --git a/saltgui/static/scripts/RunType.js b/saltgui/static/scripts/RunType.js
@@ -31,6 +31,9 @@ export class RunType {
       Utils.error("runType", runType);
     }
 
+    // Store last used runType
+    Utils.setStorageItem("local", "runtype", runType);
+
     const menuItems = RunType.menuRunType.menuDropdownContent.children;
     for (const menuItem of menuItems) {
       let menuItemText = menuItem.innerText;
@@ -43,17 +46,22 @@ export class RunType {
   }
 
   static setRunTypeDefault () {
-    RunType.menuRunType._value = "normal";
+    // Retrieve last used runType
+    let runType = Utils.getStorageItem("local", "runtype");
+    // Set default if previous runtype not stored
+    if (runType !== "normal" && runType !== "async") {
+      runType = "normal";
+    }
     RunType._updateRunTypeText();
     // reset the title to the absolute minimum
     // so that the menu does not stand out in trivial situations
     RunType.menuRunType.setTitle("");
   }
 
   static getRunType () {
-    const runType = RunType.menuRunType._value;
+    let runType = RunType.menuRunType._value;
     if (runType === undefined || runType === "") {
-      return "normal";
+      runType = Utils.getStorageItem("local", "runtype", "normal");
     }
     return runType;
   }