Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Minor bug fixes

Rich Turner6b793f125343
diff --git a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
index 702871d85..ce3ec7094 100644
--- a/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
+++ b/manager/src/main/java/org/openremote/manager/gateway/GatewayService.java
@@ -116,6 +116,11 @@ public class GatewayService extends RouteBuilder implements ContainerService, As
@Override
public void start(Container container) throws Exception {
+
+ if (!active) {
+ return;
+ }
+
List<Asset> gateways = assetStorageService.findAll(new AssetQuery().types(AssetType.GATEWAY));
List<String> gatewayIds = gateways.stream().map(Asset::getId).collect(Collectors.toList());
gateways = gateways.stream()
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
index 593d93055..40b31b769 100644
--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
@@ -66,7 +66,7 @@ public class ManagerWebService extends WebService {
public static final String CONSOLE_USE_STATIC_BOWER_COMPONENTS = "CONSOLE_USE_STATIC_BOWER_COMPONENTS";
public static final boolean CONSOLE_USE_STATIC_BOWER_COMPONENTS_DEFAULT = true;
public static final String APP_DEFAULT = "APP_DEFAULT";
- public static final String APP_DEFAULT_DEFAULT = "manager";
+ public static final String APP_DEFAULT_DEFAULT = "main";
public static final String API_PATH = "/api";
public static final String JSAPI_PATH = "/jsapi";
public static final String STATIC_PATH = "/static";
diff --git a/profile/deploy.yml b/profile/deploy.yml
index 4b7730be2..56d811c69 100644
--- a/profile/deploy.yml
+++ b/profile/deploy.yml
@@ -175,7 +175,7 @@ services:
# APP_DOCROOT: '/deployment/manager/app'
# SHARED_DOCROOT: '/deployment/manager/shared'
# Custom default app name to load when '/' is requested
- APP_DEFAULT: ${APP_DEFAULT:-manager}
+ APP_DEFAULT: ${APP_DEFAULT:-main}
# Disable HTTP redirects when a console application requests libraries which
# are delivered and used on the platform. This is necessary if your console application
diff --git a/swarm/aws-swarm-docker-compose.yml b/swarm/aws-swarm-docker-compose.yml
index 408269151..e1347304f 100644
--- a/swarm/aws-swarm-docker-compose.yml
+++ b/swarm/aws-swarm-docker-compose.yml
@@ -121,7 +121,7 @@ services:
# when running in container. Default is 127.0.0.1.
WEBSERVER_LISTEN_HOST: 0.0.0.0
- APP_DEFAULT: ${APP_DEFAULT:-manager}
+ APP_DEFAULT: ${APP_DEFAULT:-main}
JAVA_OPTS: '-Xms400m -Xmx400m
-XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=150m
diff --git a/swarm/kube-docker-compose.yml b/swarm/kube-docker-compose.yml
index 82b1bee73..b0af86c9d 100644
--- a/swarm/kube-docker-compose.yml
+++ b/swarm/kube-docker-compose.yml
@@ -155,7 +155,7 @@ services:
# when running in container. Default is 127.0.0.1.
WEBSERVER_LISTEN_HOST: 0.0.0.0
- APP_DEFAULT: ${APP_DEFAULT:-manager}
+ APP_DEFAULT: ${APP_DEFAULT:-main}
JAVA_OPTS: '-Xms400m -Xmx400m
-XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=150m
diff --git a/swarm/swarm-docker-compose.yml b/swarm/swarm-docker-compose.yml
index 9c2c22335..7c9c62a59 100644
--- a/swarm/swarm-docker-compose.yml
+++ b/swarm/swarm-docker-compose.yml
@@ -185,7 +185,7 @@ services:
# when running in container. Default is 127.0.0.1.
WEBSERVER_LISTEN_HOST: 0.0.0.0
- APP_DEFAULT: ${APP_DEFAULT:-manager}
+ APP_DEFAULT: ${APP_DEFAULT:-main}
JAVA_OPTS: '-Xms400m -Xmx400m
-XX:CompressedClassSpaceSize=25m -XX:MaxMetaspaceSize=150m
diff --git a/ui/component/or-mwc-components/src/or-mwc-dialog.ts b/ui/component/or-mwc-components/src/or-mwc-dialog.ts
index ae4cae26b..1895e6219 100644
--- a/ui/component/or-mwc-components/src/or-mwc-dialog.ts
+++ b/ui/component/or-mwc-components/src/or-mwc-dialog.ts
@@ -128,6 +128,7 @@ export class OrMwcDialog extends LitElement {
public open() {
if (this._mdcElem && !this._mdcComponent) {
this._mdcComponent = new MDCDialog(this._mdcElem);
+ this._mdcComponent!.scrimClickAction = "";
}
if (this._mdcComponent) {
this._mdcComponent.open();