Skip to content

extend selections with KEYS and NODEGROUPS #856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
erwindon wants to merge 1 commit into from
Closed

extend selections with KEYS and NODEGROUPS #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 94 additions & 10 deletions saltgui/static/scripts/CommandBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,24 +423,89 @@
button.disabled = false;
}

static getSelectedMinionList () {
static _getNodegroupsSelection () {
const allNodeGroups = Utils.getStorageItemObject("session", "nodegroups");
const allNodeGroupsKeys = Object.keys(allNodeGroups);

let ret = "";
const lst_nodegroups = Utils.getStorageItem("session", "select_nodegroups", null);
if (lst_nodegroups) {
for (const nodegroup of lst_nodegroups.split(",")) {
if (nodegroup === "null") {
ret += " or not("
let grplst = "";
for (const grp of allNodeGroupsKeys) {
grplst += " or N@" + grp;
}
ret += grplst.substring(4) + ")";
} else if (nodegroup) {
ret += " or N@" + nodegroup;
}
}
}
return ret;
}

static _getMinionSelection () {
let ret = "";
const lst_minions = Utils.getStorageItem("session", "select_minions", null);
if (lst_minions) {
let minionlist = "";
for (const minion of lst_minions.split(",")) {
if (minion) {
minionlist += "," + minion;
}
}
if (minionlist) {
// substring removes the extra ","
ret += " or L@" + minionlist.substring(1);
}
}
return ret;
}

static getSelectedItemList (pSessionKeys) {
const selectVisible = Utils.getStorageItemBoolean("session", "select_visible", false);
if (!selectVisible) {
return null;
}

// only when the selection is visible
const selectMinions = Utils.getStorageItem("session", "select_minions", "");
const lst = selectMinions.split(",").sort();
while (lst.length > 0 && lst[0] === "") {
lst.shift();
let target = "";

if (pSessionKeys.includes("select_nodegroups")) {
target += CommandBox._getNodegroupsSelection();
}
// and only when there is a selection
if (lst.length == 0) {

if (pSessionKeys.includes("select_minions")) {
target += CommandBox._getMinionSelection();
}

if (pSessionKeys.includes("select_keys")) {
const lst_keys = Utils.getStorageItem("session", "select_keys", null);
if (lst_keys) {
let keylist = "";
for (const key of lst_keys.split(",")) {
if (key) {
keylist += "," + key;
}
}
// substring removes the extra ","
target += " or " + keylist.substring(1);
}
}

// remove the extra " or "
target = target.substring(4);
if (target.startsWith("L@")) {
// simplify when we only have the list of minions
target = target.substring(2);
}

if (target === "") {
return null;
}

return lst.join(",");
return target;
}

static showManualRun (pApi) {
Expand Down Expand Up @@ -498,7 +563,26 @@
CommandBox._populateTemplateTmplMenu();
CommandBox._populateTestProviders(pApi);

const lst = CommandBox.getSelectedMinionList()
let lst = null;
// different pages have different selection-types
// but run-command is available from every page
switch (window.location.hash) {

Check warning on line 569 in saltgui/static/scripts/CommandBox.js

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Prefer `globalThis` over `window`. 


See more on https://sonarcloud.io/project/issues?id=erwindon_SaltGUI&issues=AZ15qtF9-rAd27ODa7qm&open=AZ15qtF9-rAd27ODa7qm&pullRequest=856
case "#minions":
case "#grains":
case "#schedules":
case "#pillars":
case "#beacons":
case "#highstate":
lst = CommandBox.getSelectedItemList(["select_minions"]);
break;
case "#keys":
lst = CommandBox.getSelectedItemList(["select_keys"]);
break;
case "#nodegroups":
lst = CommandBox.getSelectedItemList(["select_minions", "select_nodegroups"]);
break;
}

if (lst) {
const targetField = document.getElementById("target");
targetField.value = lst;
Expand Down
11 changes: 5 additions & 6 deletions saltgui/static/scripts/panels/Beacons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {Utils} from "../Utils.js";
export class BeaconsPanel extends Panel {

constructor () {
super("beacons");
super("beacons", ["select_minions"]);

this.addTitle("Beacons");
this.addSearchButton();
Expand All @@ -18,12 +18,11 @@ export class BeaconsPanel extends Panel {
}

onShow () {
super.onShow();

const wheelKeyListAllPromise = this.api.getWheelKeyListAll();
const localBeaconsListPromise = this.api.getLocalBeaconsList(null);

const selectVisible = Utils.getStorageItemBoolean("session", "select_visible", false);
this.showSelectColumn(selectVisible);

this.nrMinions = 0;

wheelKeyListAllPromise.then((pWheelKeyListAllData) => {
Expand Down Expand Up @@ -108,7 +107,7 @@ export class BeaconsPanel extends Panel {
}

updateOfflineMinion (pMinionId, pMinionsDict) {
super.updateOfflineMinion(pMinionId, pMinionsDict, true);
super.updateOfflineMinion(pMinionId, pMinionsDict);

const minionTr = this.table.querySelector("#" + Utils.getIdFromMinionId(pMinionId));

Expand All @@ -120,7 +119,7 @@ export class BeaconsPanel extends Panel {

pMinionData = BeaconsPanel.fixBeaconsMinion(pMinionData);

super.updateMinion(null, pMinionId, pAllMinionsGrains, true);
super.updateMinion(null, pMinionId, pAllMinionsGrains);

const minionTr = this.table.querySelector("#" + Utils.getIdFromMinionId(pMinionId));

Expand Down
11 changes: 5 additions & 6 deletions saltgui/static/scripts/panels/Grains.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Utils} from "../Utils.js";
export class GrainsPanel extends Panel {

constructor () {
super("grains");
super("grains", ["select_minions"]);

this.addTitle("Grains");
this.addSearchButton();
Expand All @@ -27,8 +27,7 @@ export class GrainsPanel extends Panel {
}

onShow () {
const selectVisible = Utils.getStorageItemBoolean("session", "select_visible", false);
this.showSelectColumn(selectVisible);
super.onShow();

if (this.previewColumsAdded !== true) {
// collect the list of displayed extra grains
Expand Down Expand Up @@ -86,7 +85,7 @@ export class GrainsPanel extends Panel {

const minionIds = keys.minions.sort();
for (const minionId of minionIds) {
const minionTr = this.addMinion(minionId, true, this.previewGrains.length);
const minionTr = this.addMinion(minionId, this.previewGrains.length);

// preliminary dropdown menu
this._addMenuItemShowGrains(minionTr.dropdownmenu, minionId);
Expand All @@ -105,7 +104,7 @@ export class GrainsPanel extends Panel {
}

updateOfflineMinion (pMinionId, pMinionsDict) {
super.updateOfflineMinion(pMinionId, pMinionsDict, true);
super.updateOfflineMinion(pMinionId, pMinionsDict);

const minionTr = this.table.querySelector("#" + Utils.getIdFromMinionId(pMinionId));

Expand All @@ -119,7 +118,7 @@ export class GrainsPanel extends Panel {
}

updateMinion (pMinionData, pMinionId, pAllMinionsGrains) {
super.updateMinion(pMinionData, pMinionId, pAllMinionsGrains, true);
super.updateMinion(pMinionData, pMinionId, pAllMinionsGrains);

const minionTr = this.table.querySelector("#" + Utils.getIdFromMinionId(pMinionId));

Expand Down
13 changes: 6 additions & 7 deletions saltgui/static/scripts/panels/HighState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {Utils} from "../Utils.js";
export class HighStatePanel extends Panel {

constructor () {
super("highstate");
super("highstate", ["select_minions"]);

// only consider this number of latest highstate jobs
this._maxShowHighstates = Utils.getStorageItem("session", "max_show_highstates", 10);
Expand Down Expand Up @@ -47,10 +47,9 @@ export class HighStatePanel extends Panel {
}

onShow () {
const wheelKeyListAllPromise = this.api.getWheelKeyListAll();
super.onShow();

const selectVisible = Utils.getStorageItemBoolean("session", "select_visible", false);
this.showSelectColumn(selectVisible);
const wheelKeyListAllPromise = this.api.getWheelKeyListAll();

this.nrMinions = 0;

Expand Down Expand Up @@ -100,14 +99,14 @@ export class HighStatePanel extends Panel {
_addMenuItemStateApply (pMenu, pMinionId) {
pMenu.addMenuItem("Apply state...", () => {
const cmdArr = ["state.apply"];
this.runCommand("", pMinionId, cmdArr, true);
this.runCommand("", pMinionId, cmdArr, ["select_minions"]);
});
}

_addMenuItemStateApplyTest (pMenu, pMinionId) {
pMenu.addMenuItem("Test state...", () => {
const cmdArr = ["state.apply", "test=", true];
this.runCommand("", pMinionId, cmdArr, true);
this.runCommand("", pMinionId, cmdArr, ["select_minions"]);
});
}

Expand Down Expand Up @@ -366,7 +365,7 @@ export class HighStatePanel extends Panel {

// we already have the TR
// but this function also clears the row
this.getElement(trId, true);
this.getElement(trId, "select_minions", minionId);

// mark the TR as populated
minionTr.jid = pJobId;
Expand Down
Loading
Loading