Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -82,7 +82,7 @@ import org.thingsboard.server.dao.widget.WidgetsBundleService;
 
 
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Collections;
-import java.util.LinkedHashMap;
+import java.util.TreeMap;
 
 
 @Service
 @Service
 @Profile("install")
 @Profile("install")
@@ -311,7 +311,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
         temperatureCondition.setCondition(Arrays.asList(temperatureAlarmFlagAttributeFilter, temperatureTimeseriesFilter));
         temperatureCondition.setCondition(Arrays.asList(temperatureAlarmFlagAttributeFilter, temperatureTimeseriesFilter));
         temperatureRule.setAlarmDetails("Current temperature = ${temperature}");
         temperatureRule.setAlarmDetails("Current temperature = ${temperature}");
         temperatureRule.setCondition(temperatureCondition);
         temperatureRule.setCondition(temperatureCondition);
-        highTemperature.setCreateRules(new LinkedHashMap<>(Collections.singletonMap(AlarmSeverity.MAJOR, temperatureRule)));
+        highTemperature.setCreateRules(new TreeMap<>(Collections.singletonMap(AlarmSeverity.MAJOR, temperatureRule)));
 
 
         AlarmRule clearTemperatureRule = new AlarmRule();
         AlarmRule clearTemperatureRule = new AlarmRule();
         AlarmCondition clearTemperatureCondition = new AlarmCondition();
         AlarmCondition clearTemperatureCondition = new AlarmCondition();
@@ -362,7 +362,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
 
 
         humidityRule.setCondition(humidityCondition);
         humidityRule.setCondition(humidityCondition);
         humidityRule.setAlarmDetails("Current humidity = ${humidity}");
         humidityRule.setAlarmDetails("Current humidity = ${humidity}");
-        lowHumidity.setCreateRules(new LinkedHashMap<>(Collections.singletonMap(AlarmSeverity.MINOR, humidityRule)));
+        lowHumidity.setCreateRules(new TreeMap<>(Collections.singletonMap(AlarmSeverity.MINOR, humidityRule)));
 
 
         AlarmRule clearHumidityRule = new AlarmRule();
         AlarmRule clearHumidityRule = new AlarmRule();
         AlarmCondition clearHumidityCondition = new AlarmCondition();
         AlarmCondition clearHumidityCondition = new AlarmCondition();

@@ -18,9 +18,8 @@ package org.thingsboard.server.common.data.device.profile;
 import lombok.Data;
 import lombok.Data;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 
 
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.List;
-import java.util.Map;
+import java.util.TreeMap;
 
 
 @Data
 @Data
 public class DeviceProfileAlarm {
 public class DeviceProfileAlarm {
@@ -28,7 +27,7 @@ public class DeviceProfileAlarm {
     private String id;
     private String id;
     private String alarmType;
     private String alarmType;
 
 
-    private LinkedHashMap<AlarmSeverity, AlarmRule> createRules;
+    private TreeMap<AlarmSeverity, AlarmRule> createRules;
     private AlarmRule clearRule;
     private AlarmRule clearRule;
 
 
     // Hidden in advanced settings
     // Hidden in advanced settings

@@ -23,17 +23,13 @@ import org.junit.runner.RunWith;
 import org.mockito.AdditionalAnswers;
 import org.mockito.AdditionalAnswers;
 import org.mockito.Mock;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.mockito.stubbing.Answer;
-import org.springframework.util.StringUtils;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
 import org.thingsboard.rule.engine.api.RuleEngineDeviceProfileCache;
 import org.thingsboard.rule.engine.api.RuleEngineDeviceProfileCache;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeConfiguration;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.rule.engine.api.TbNodeException;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
 import org.thingsboard.server.common.data.device.profile.AlarmRule;
@@ -52,11 +48,10 @@ import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgDataType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.session.SessionMsgType;
 import org.thingsboard.server.common.msg.session.SessionMsgType;
-import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 
 
 import java.util.Collections;
 import java.util.Collections;
-import java.util.LinkedHashMap;
+import java.util.TreeMap;
 import java.util.UUID;
 import java.util.UUID;
 
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verify;
@@ -140,7 +135,7 @@ public class TbDeviceProfileNodeTest {
         DeviceProfileAlarm dpa = new DeviceProfileAlarm();
         DeviceProfileAlarm dpa = new DeviceProfileAlarm();
         dpa.setId("highTemperatureAlarmID");
         dpa.setId("highTemperatureAlarmID");
         dpa.setAlarmType("highTemperatureAlarm");
         dpa.setAlarmType("highTemperatureAlarm");
-        dpa.setCreateRules(new LinkedHashMap<>(Collections.singletonMap(AlarmSeverity.CRITICAL, alarmRule)));
+        dpa.setCreateRules(new TreeMap<>(Collections.singletonMap(AlarmSeverity.CRITICAL, alarmRule)));
 
 
         KeyFilter lowTempFilter = new KeyFilter();
         KeyFilter lowTempFilter = new KeyFilter();
         lowTempFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "temperature"));
         lowTempFilter.setKey(new EntityKey(EntityKeyType.TIME_SERIES, "temperature"));

@@ -130,7 +130,7 @@ export class DashboardService {
         const publicCustomerId = publicCustomers[0].customerId.id;
         const publicCustomerId = publicCustomers[0].customerId.id;
         let url = this.window.location.protocol + '//' + this.window.location.hostname;
         let url = this.window.location.protocol + '//' + this.window.location.hostname;
         const port = this.window.location.port;
         const port = this.window.location.port;
-        if (port !== '80' && port !== '443') {
+        if (port && port.length > 0 && port !== '80' && port !== '443') {
           url += ':' + port;
           url += ':' + port;
         }
         }
         url += `/dashboard/${dashboard.id.id}?publicId=${publicCustomerId}`;
         url += `/dashboard/${dashboard.id.id}?publicId=${publicCustomerId}`;