Skip to content

Commit 8870caf

Browse files
author
Erwin Dondorp
committed
make beacons-list available just after login, closes #647
1 parent 2a07c05 commit 8870caf

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

saltgui/static/scripts/Documentation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ export class Documentation {
416416

417417
static _manualRunMenuBeaconNamePrepare () {
418418
const commandLine = document.querySelector(".run-command #command").value;
419-
if (!commandLine.startsWith("beacons.add ")) {
419+
if (commandLine !== "beacons.add" && !commandLine.startsWith("beacons.add ")) {
420420
return null;
421421
}
422422
return "List standard beacon names";

saltgui/static/scripts/panels/BeaconsMinion.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,14 @@ export class BeaconsMinionPanel extends Panel {
5454
return false;
5555
});
5656

57+
BeaconsMinionPanel.getAvailableBeacons(this.api);
58+
}
59+
60+
static getAvailableBeacons (pApi) {
5761
const beaconsListAvailable = Utils.getStorageItem("session", "beacons_list_available");
5862
if (!beaconsListAvailable) {
5963
// yes, we want the list from *all* minions
60-
const localBeaconsListAvailablePromise = this.api.getLocalBeaconsListAvailable(null);
64+
const localBeaconsListAvailablePromise = pApi.getLocalBeaconsListAvailable(null);
6165

6266
localBeaconsListAvailablePromise.then((pLocalBeaconsListAvailableData) => {
6367
BeaconsMinionPanel._handleBeaconsListAvailable(pLocalBeaconsListAvailableData);

saltgui/static/scripts/panels/Login.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* global */
22

3+
import {BeaconsMinionPanel} from "../panels/BeaconsMinion.js";
34
import {Character} from "../Character.js";
45
import {Panel} from "./Panel.js";
56
import {Router} from "../Router.js";
@@ -345,6 +346,8 @@ export class LoginPanel extends Panel {
345346
}
346347
}
347348
}, 1000);
349+
350+
BeaconsMinionPanel.getAvailableBeacons(this.api);
348351
}
349352

350353
static _handleRunnerStateOrchestrateShowSls (pRunnerStateOrchestrateShowSlsData) {

0 commit comments

Comments
 (0)