Skip to content

Commit c9ce3ce

Browse files
author
Erwin Dondorp
committed
add minion selection button (always visible)
1 parent 7d00f5c commit c9ce3ce

9 files changed

Lines changed: 16 additions & 14 deletions

File tree

‎saltgui/static/scripts/Character.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ export class Character {
2727
Character.WHITE_DOWN_POINTING_TRIANGLE = "\u25BD";
2828
Character.BLACK_DIAMOND = "\u25C6";
2929
Character.BLACK_CIRCLE = "\u25CF";
30+
Character.BALLOT_BOX_UNCHECKED = "\u2610";
31+
Character.BALLOT_BOX_WITH_CHECK = "\u2611";
3032
Character.GEAR = "\u2699";
3133
Character.WARNING_SIGN = "\u26A0" + Character._VARIATION_SELECTOR_16;
3234
Character.HEAVY_CHECK_MARK = "\u2714";

‎saltgui/static/scripts/panels/Beacons.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class BeaconsPanel extends Panel {
1111
this.addTitle("Beacons");
1212
this.addSearchButton();
1313
this.addFilterButton();
14-
this.addTable(["-menu-", "Minion", "Status", "Beacons"]);
14+
this.addTable(["-select-", "-menu-", "Minion", "Status", "Beacons"]);
1515
this.setTableSortable("Minion", "asc");
1616
this.setTableClickable("page");
1717
this.addMsg();
@@ -117,7 +117,7 @@ export class BeaconsPanel extends Panel {
117117

118118
pMinionData = BeaconsPanel.fixBeaconsMinion(pMinionData);
119119

120-
super.updateMinion(null, pMinionId, pAllMinionsGrains);
120+
super.updateMinion(null, pMinionId, pAllMinionsGrains, true);
121121

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

‎saltgui/static/scripts/panels/Grains.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class GrainsPanel extends Panel {
1818
"See README.md for more details."
1919
]);
2020
this.addWarningField();
21-
this.addTable(["-menu-", "Minion", "Status", "Salt version", "OS version", "Grains"]);
21+
this.addTable(["-select-", "-menu-", "Minion", "Status", "Salt version", "OS version", "Grains"]);
2222

2323
// cannot initialize sorting before all columns are present
2424
// this.setTableSortable("Minion", "asc");
@@ -116,7 +116,7 @@ export class GrainsPanel extends Panel {
116116
}
117117

118118
updateMinion (pMinionData, pMinionId, pAllMinionsGrains) {
119-
super.updateMinion(pMinionData, pMinionId, pAllMinionsGrains);
119+
super.updateMinion(pMinionData, pMinionId, pAllMinionsGrains, true);
120120

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

‎saltgui/static/scripts/panels/HighState.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class HighStatePanel extends Panel {
3636
"Click on an individual state to re-apply only that state."
3737
]);
3838
this.addWarningField();
39-
this.addTable(["-menu-", "Minion", "State", "Latest JID", "Target", "Function", "Start Time", "States"]);
39+
this.addTable(["-select-", "-menu-", "Minion", "State", "Latest JID", "Target", "Function", "Start Time", "States"]);
4040
this.setTableSortable("Minion", "asc");
4141
this.setTableClickable("cmd");
4242
this.addMsg();

‎saltgui/static/scripts/panels/Minions.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class MinionsPanel extends Panel {
2323
this.addSearchButton();
2424
this.addFilterButton();
2525
this.addWarningField();
26-
this.addTable(["-menu-", "Minion", "Status", "Salt version", "OS version"]);
26+
this.addTable(["-select-", "-menu-", "Minion", "Status", "Salt version", "OS version"]);
2727
this.setTableSortable("Minion", "asc");
2828
this.setTableClickable("cmd");
2929
this.addMsg();
@@ -191,7 +191,7 @@ export class MinionsPanel extends Panel {
191191
}
192192

193193
updateMinion (pMinionData, pMinionId, pAllMinionsGrains) {
194-
super.updateMinion(pMinionData, pMinionId, pAllMinionsGrains);
194+
super.updateMinion(pMinionData, pMinionId, pAllMinionsGrains, true);
195195

196196
const minionTr = this.table.querySelector("#" + Utils.getIdFromMinionId(pMinionId));
197197
this._addMenuItemStateApply(minionTr.dropdownmenu, pMinionId);

‎saltgui/static/scripts/panels/Nodegroups.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ export class NodegroupsPanel extends Panel {
361361
}
362362

363363
updateMinion (pMinionData, pMinionId, pAllNodegroupsGrains) {
364-
super.updateMinion(pMinionData, pMinionId, pAllNodegroupsGrains);
364+
super.updateMinion(pMinionData, pMinionId, pAllNodegroupsGrains, false);
365365

366366
const minionTr = this.table.querySelector("#" + Utils.getIdFromMinionId(pMinionId));
367367
this._addMenuItemStateApplyMinion(minionTr.dropdownmenu, pMinionId);

‎saltgui/static/scripts/panels/Panel.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,9 +614,9 @@ export class Panel {
614614
}
615615
}
616616

617-
updateMinion (pMinionData, pMinionId, pAllMinionsGrains) {
617+
updateMinion (pMinionData, pMinionId, pAllMinionsGrains, pUseSelect) {
618618

619-
const minionTr = this.getElement(Utils.getIdFromMinionId(pMinionId));
619+
const minionTr = this.getElement(Utils.getIdFromMinionId(pMinionId), pUseSelect);
620620

621621
const minionSpan = Utils.createSpan("minion-id", pMinionId);
622622
const minionTd = Utils.createTd();

‎saltgui/static/scripts/panels/Pillars.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class PillarsPanel extends Panel {
1212
this.addSearchButton();
1313
this.addFilterButton();
1414
this.addWarningField();
15-
this.addTable(["-menu-", "Minion", "Status", "Pillars"]);
15+
this.addTable(["-select-", "-menu-", "Minion", "Status", "Pillars"]);
1616
this.setTableSortable("Minion", "asc");
1717
this.setTableClickable("page");
1818
this.addMsg();
@@ -80,7 +80,7 @@ export class PillarsPanel extends Panel {
8080
}
8181

8282
updateMinion (pMinionData, pMinionId, pAllMinionsGrains) {
83-
super.updateMinion(null, pMinionId, pAllMinionsGrains);
83+
super.updateMinion(null, pMinionId, pAllMinionsGrains, true);
8484

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

‎saltgui/static/scripts/panels/Schedules.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export class SchedulesPanel extends Panel {
1111
this.addTitle("Schedules");
1212
this.addSearchButton();
1313
this.addFilterButton();
14-
this.addTable(["-menu-", "Minion", "Status", "Schedules"]);
14+
this.addTable(["-select-", "-menu-", "Minion", "Status", "Schedules"]);
1515
this.setTableSortable("Minion", "asc");
1616
this.setTableClickable("page");
1717
this.addMsg();
@@ -113,7 +113,7 @@ export class SchedulesPanel extends Panel {
113113

114114
pMinionData = SchedulesPanel.fixSchedulesMinion(pMinionData);
115115

116-
super.updateMinion(pMinionData, pMinionId, pAllMinionsGrains);
116+
super.updateMinion(pMinionData, pMinionId, pAllMinionsGrains, true);
117117

118118
const minionTr = this.getElement(Utils.getIdFromMinionId(pMinionId));
119119

0 commit comments

Comments
 (0)