100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Added applyConfigToAdmin option to manager_config.json, which defaults to true (#1289)
Martin Peeterscbada17d622e
diff --git a/model/src/main/java/org/openremote/model/manager/ManagerConfig.java b/model/src/main/java/org/openremote/model/manager/ManagerConfig.javaindex 4a85fab19..2a7ddab4c 100644--- a/model/src/main/java/org/openremote/model/manager/ManagerConfig.java+++ b/model/src/main/java/org/openremote/model/manager/ManagerConfig.java@@ -35,6 +35,7 @@ public class ManagerConfig {protected boolean loadDescriptors;protected String translationsLoadPath;protected boolean skipFallbackToBasicAuth;+ protected boolean applyConfigToAdmin;protected Auth auth;protected UsernamePassword credentials;protected EventProviderType eventProviderType;diff --git a/ui/app/manager/src/index.ts b/ui/app/manager/src/index.tsindex 9ed9c4fa3..2882c0605 100644--- a/ui/app/manager/src/index.ts+++ b/ui/app/manager/src/index.ts@@ -157,8 +157,10 @@ fetch(configURL).then(async (result) => {// Build pageslet pages: PageProvider<any>[] = [...DefaultPagesConfig];+ const isAdmin = manager.isSuperUser() && manager.username === "admin";+ const applyConfigToAdmin = appConfig.manager.applyConfigToAdmin !== undefined ? appConfig.manager.applyConfigToAdmin : true;- if (!(manager.isSuperUser() && manager.username === "admin") && appConfig.pages) {+ if ((!isAdmin || applyConfigToAdmin) && appConfig.pages) {// Replace any supplied page configspages = pages.map(pageProvider => {diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.tsindex 8efd2c920..3ec94ac7f 100644--- a/ui/component/core/src/index.ts+++ b/ui/component/core/src/index.ts@@ -102,6 +102,10 @@ export function normaliseConfig(config: ManagerConfig): ManagerConfig {normalisedConfig.consoleAutoEnable = true;}+ if (normalisedConfig.applyConfigToAdmin === undefined) {+ normalisedConfig.applyConfigToAdmin = true;+ }+if (!normalisedConfig.eventProviderType) {normalisedConfig.eventProviderType = EventProviderType.WEBSOCKET;}