From 3c6a3243d310bd13e6d32bfe97580a0c76fd252c Mon Sep 17 00:00:00 2001 From: Erwin Dondorp Date: Wed, 20 Dec 2023 22:24:30 +0100 Subject: [PATCH] show new options in Options panel --- saltgui/static/scripts/panels/Login.js | 6 ++++ saltgui/static/scripts/panels/Options.js | 40 ++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/saltgui/static/scripts/panels/Login.js b/saltgui/static/scripts/panels/Login.js index ce7f0592f..dacc86cbd 100644 --- a/saltgui/static/scripts/panels/Login.js +++ b/saltgui/static/scripts/panels/Login.js @@ -381,6 +381,12 @@ export class LoginPanel extends Panel { const hideJobs = wheelConfigValuesData.saltgui_hide_jobs; Utils.setStorageItem("session", "hide_jobs", JSON.stringify(hideJobs)); + const useCacheForGrains = wheelConfigValuesData.saltgui_use_cache_for_grains; + Utils.setStorageItem("session", "use_cache_for_grains", JSON.stringify(useCacheForGrains)); + + const useCacheForPillars = wheelConfigValuesData.saltgui_use_cache_for_pillars; + Utils.setStorageItem("session", "use_cache_for_pillars", JSON.stringify(useCacheForPillars)); + const syndicMaster = wheelConfigValuesData.syndic_master; Utils.setStorageItem("session", "syndic_master", syndicMaster); diff --git a/saltgui/static/scripts/panels/Options.js b/saltgui/static/scripts/panels/Options.js index a9c693508..75ae37ce3 100644 --- a/saltgui/static/scripts/panels/Options.js +++ b/saltgui/static/scripts/panels/Options.js @@ -88,6 +88,14 @@ export class OptionsPanel extends Panel { ], ["preview-grains", "saltgui", "(none)"], ["public-pillars", "saltgui", "(none)"], + [ + "use-cache-for-grains", "saltgui", "false", + [["grains", "true", "false"]] + ], + [ + "use-cache-for-pillar", "saltgui", "false", + [["pillar", "true", "false"]] + ], ["templates", "saltgui", "(none)"], [ "tooltip-mode", "saltgui", "full", @@ -179,6 +187,14 @@ export class OptionsPanel extends Panel { radio.addEventListener("change", () => { this._newFullReturn(); }); + } else if (pName === "use-cache-for-grains") { + radio.addEventListener("change", () => { + this._newUseCacheForGrains(); + }); + } else if (pName === "use-cache-for-pillar") { + radio.addEventListener("change", () => { + this._newUseCacheForPillar(); + }); } if (pName === "state-output" && itemValue === "full_id") { @@ -460,6 +476,30 @@ export class OptionsPanel extends Panel { Router.currentPage.stats.onShow(); } + _newUseCacheForGrains () { + let value = ""; + /* eslint-disable curly */ + if (this._isSelected("use-cache-for-grains", "grains", "false")) value = "false"; + if (this._isSelected("use-cache-for-grains", "grains", "true")) value = "true"; + value = value.replace(/^,/, ""); + /* eslint-enable curly */ + const useCacheForGrainsTd = this.div.querySelector("#option-use-cache-for-grains-value"); + useCacheForGrainsTd.innerText = value || "(none)"; + Utils.setStorageItem("session", "use_cache_for_grains", value); + } + + _newUseCacheForPillar () { + let value = ""; + /* eslint-disable curly */ + if (this._isSelected("use-cache-for-pillar", "pillar", "false")) value = "false"; + if (this._isSelected("use-cache-for-pillar", "pillar", "true")) value = "true"; + value = value.replace(/^,/, ""); + /* eslint-enable curly */ + const useCacheForPillarTd = this.div.querySelector("#option-use-cache-for-pillar-value"); + useCacheForPillarTd.innerText = value || "(none)"; + Utils.setStorageItem("session", "use_cache_for_pillar", value); + } + _newDatetimeFractionDigits () { let value = ""; /* eslint-disable curly */