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
UI updates
Rich Turner64744117152c
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.javaindex 9aa84fe75..9bee5f3e0 100644--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java@@ -85,10 +85,10 @@ public class ManagerWebService extends WebService {String defaultApp = getString(container.getConfig(), APP_DEFAULT, APP_DEFAULT_DEFAULT);ResteasyDeployment resteasyDeployment = createResteasyDeployment(container, getApiClasses(), getApiSingletons(), true);- // TODO: Remove this once all apps updated to new structure// Serve REST APIHttpHandler apiHandler = createApiHandler(identityService, resteasyDeployment);// Serve JavaScript API+ // TODO: Remove this once all apps updated to new structureHttpHandler jsApiHandler = createJsApiHandler(identityService, resteasyDeployment);if (apiHandler != null) {diff --git a/ui/component/core/src/core.ts b/ui/component/core/src/core.tsindex 6efa0bf44..91d45458d 100644--- a/ui/component/core/src/core.ts+++ b/ui/component/core/src/core.ts@@ -81,7 +81,7 @@ export class Manager {if (!normalisedConfig.managerUrl || normalisedConfig.managerUrl === "") {// Assume manager is running on same host as this code- normalisedConfig.managerUrl = "/";+ normalisedConfig.managerUrl = window.location.protocol + "//" + window.location.hostname + window.location.port;} else {// Normalise by stripping any trailing slashesnormalisedConfig.managerUrl = normalisedConfig.managerUrl.replace(/\/+$/, "");