diff --git a/application/pom.xml b/application/pom.xml index c7d3240ef4..e5a4a4e614 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -125,10 +125,6 @@ io.jsonwebtoken jjwt - - joda-time - joda-time - org.apache.velocity velocity diff --git a/application/src/main/data/json/system/widget_bundles/cards.json b/application/src/main/data/json/system/widget_bundles/cards.json index 0fc0085f12..ddb90dbaae 100644 --- a/application/src/main/data/json/system/widget_bundles/cards.json +++ b/application/src/main/data/json/system/widget_bundles/cards.json @@ -112,9 +112,9 @@ "templateHtml": "\n", "templateCss": "", "controllerScript": "self.onInit = function() {\n var scope = self.ctx.$scope;\n var id = self.ctx.$scope.$injector.get('utils').guid();\n scope.tableId = \"table-\"+id;\n scope.ctx = self.ctx;\n}\n\nself.onDataUpdated = function() {\n self.ctx.$scope.$broadcast('timeseries-table-data-updated', self.ctx.$scope.tableId);\n}\n\nself.onDestroy = function() {\n}", - "settingsSchema": "{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"TimeseriesTableSettings\",\n \"properties\": {\n \"showTimestamp\": {\n \"title\": \"Display timestamp column\",\n \"type\": \"boolean\",\n \"default\": true\n }\n },\n \"required\": []\n },\n \"form\": [\n \"showTimestamp\"\n ]\n}", + "settingsSchema": "{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"TimeseriesTableSettings\",\n \"properties\": {\n \"showTimestamp\": {\n \"title\": \"Display timestamp column\",\n \"type\": \"boolean\",\n \"default\": true\n },\n \"displayPagination\": {\n \"title\": \"Display pagination\",\n \"type\": \"boolean\",\n \"default\": true\n }, \n \"defaultPageSize\": {\n \"title\": \"Default page size\",\n \"type\": \"number\",\n \"default\": 10\n }\n },\n \"required\": []\n },\n \"form\": [\n \"showTimestamp\",\n \"displayPagination\",\n \"defaultPageSize\"\n ]\n}", "dataKeySettingsSchema": "{\n \"schema\": {\n \"type\": \"object\",\n \"title\": \"DataKeySettings\",\n \"properties\": {\n \"useCellStyleFunction\": {\n \"title\": \"Use cell style function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"cellStyleFunction\": {\n \"title\": \"Cell style function: f(value)\",\n \"type\": \"string\",\n \"default\": \"\"\n },\n \"useCellContentFunction\": {\n \"title\": \"Use cell content function\",\n \"type\": \"boolean\",\n \"default\": false\n },\n \"cellContentFunction\": {\n \"title\": \"Cell content function: f(value, rowData, filter)\",\n \"type\": \"string\",\n \"default\": \"\"\n }\n },\n \"required\": []\n },\n \"form\": [\n \"useCellStyleFunction\",\n {\n \"key\": \"cellStyleFunction\",\n \"type\": \"javascript\"\n },\n \"useCellContentFunction\",\n {\n \"key\": \"cellContentFunction\",\n \"type\": \"javascript\"\n }\n ]\n}", - "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature °C\",\"color\":\"#2196f3\",\"settings\":{\"useCellStyleFunction\":true,\"cellStyleFunction\":\"if (value) {\\n var percent = (value + 60)/120 * 100;\\n var color = tinycolor.mix('blue', 'red', amount = percent);\\n color.setAlpha(.5);\\n return {\\n paddingLeft: '20px',\\n color: '#ffffff',\\n background: color.toRgbString(),\\n fontSize: '18px'\\n };\\n} else {\\n return {};\\n}\"},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nvar multiplier = Math.pow(10, 1 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity, %\",\"color\":\"#ffc107\",\"settings\":{\"useCellStyleFunction\":true,\"cellStyleFunction\":\"if (value) {\\n var percent = value;\\n var backgroundColor = tinycolor('blue');\\n backgroundColor.setAlpha(value/100);\\n var color = 'blue';\\n if (value > 50) {\\n color = 'white';\\n }\\n \\n return {\\n paddingLeft: '20px',\\n color: color,\\n background: backgroundColor.toRgbString(),\\n fontSize: '18px'\\n };\\n} else {\\n return {};\\n}\",\"useCellContentFunction\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nvar multiplier = Math.pow(10, 1 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 5) {\\n\\tvalue = 5;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"interval\":1000,\"timewindowMs\":60000},\"aggregation\":{\"type\":\"NONE\",\"limit\":200}},\"showTitle\":true,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"showTimestamp\":true},\"title\":\"Timeseries table\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":false,\"showLegend\":false}" + "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature °C\",\"color\":\"#2196f3\",\"settings\":{\"useCellStyleFunction\":true,\"cellStyleFunction\":\"if (value) {\\n var percent = (value + 60)/120 * 100;\\n var color = tinycolor.mix('blue', 'red', amount = percent);\\n color.setAlpha(.5);\\n return {\\n paddingLeft: '20px',\\n color: '#ffffff',\\n background: color.toRgbString(),\\n fontSize: '18px'\\n };\\n} else {\\n return {};\\n}\"},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nvar multiplier = Math.pow(10, 1 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity, %\",\"color\":\"#ffc107\",\"settings\":{\"useCellStyleFunction\":true,\"cellStyleFunction\":\"if (value) {\\n var percent = value;\\n var backgroundColor = tinycolor('blue');\\n backgroundColor.setAlpha(value/100);\\n var color = 'blue';\\n if (value > 50) {\\n color = 'white';\\n }\\n \\n return {\\n paddingLeft: '20px',\\n color: color,\\n background: backgroundColor.toRgbString(),\\n fontSize: '18px'\\n };\\n} else {\\n return {};\\n}\",\"useCellContentFunction\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nvar multiplier = Math.pow(10, 1 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < 5) {\\n\\tvalue = 5;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"interval\":1000,\"timewindowMs\":60000},\"aggregation\":{\"type\":\"NONE\",\"limit\":200}},\"showTitle\":true,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"showTimestamp\":true,\"displayPagination\":true,\"defaultPageSize\":10},\"title\":\"Timeseries table\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"useDashboardTimewindow\":false,\"showLegend\":false,\"widgetStyle\":{},\"actions\":{}}" } } ] diff --git a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java index a2dd53bd82..d2d9b7ae10 100644 --- a/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/plugin/PluginProcessingContext.java @@ -62,6 +62,7 @@ public final class PluginProcessingContext implements PluginContext { private static final Executor executor = Executors.newSingleThreadExecutor(); public static final String CUSTOMER_USER_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION = "Customer user is not allowed to perform this operation!"; public static final String SYSTEM_ADMINISTRATOR_IS_NOT_ALLOWED_TO_PERFORM_THIS_OPERATION = "System administrator is not allowed to perform this operation!"; + public static final String DEVICE_WITH_REQUESTED_ID_NOT_FOUND = "Device with requested id wasn't found!"; private final SharedPluginProcessingContext pluginCtx; private final Optional securityCtx; @@ -309,7 +310,7 @@ public final class PluginProcessingContext implements PluginContext { ListenableFuture deviceFuture = pluginCtx.deviceService.findDeviceByIdAsync(new DeviceId(entityId.getId())); Futures.addCallback(deviceFuture, getCallback(callback, device -> { if (device == null) { - return ValidationResult.entityNotFound("Device with requested id wasn't found!"); + return ValidationResult.entityNotFound(DEVICE_WITH_REQUESTED_ID_NOT_FOUND); } else { if (!device.getTenantId().equals(ctx.getTenantId())) { return ValidationResult.accessDenied("Device doesn't belong to the current Tenant!"); diff --git a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java index 35d17732fe..9f7c08f511 100644 --- a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java +++ b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java @@ -47,8 +47,8 @@ public class WebSocketConfiguration implements WebSocketConfigurer { @Bean public ServletServerContainerFactoryBean createWebSocketContainer() { ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean(); - container.setMaxTextMessageBufferSize(8192); - container.setMaxBinaryMessageBufferSize(8192); + container.setMaxTextMessageBufferSize(32768); + container.setMaxBinaryMessageBufferSize(32768); return container; } diff --git a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java index c54973f0bc..d87ea5cfe0 100644 --- a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java +++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java @@ -82,7 +82,7 @@ public class CustomerController extends BaseController { @PreAuthorize("hasAuthority('TENANT_ADMIN')") @RequestMapping(value = "/customer", method = RequestMethod.POST) - @ResponseBody + @ResponseBody public Customer saveCustomer(@RequestBody Customer customer) throws ThingsboardException { try { customer.setTenantId(getCurrentUser().getTenantId()); @@ -107,7 +107,7 @@ public class CustomerController extends BaseController { } @PreAuthorize("hasAuthority('TENANT_ADMIN')") - @RequestMapping(value = "/customers", params = { "limit" }, method = RequestMethod.GET) + @RequestMapping(value = "/customers", params = {"limit"}, method = RequestMethod.GET) @ResponseBody public TextPageData getCustomers(@RequestParam int limit, @RequestParam(required = false) String textSearch, @@ -122,4 +122,16 @@ public class CustomerController extends BaseController { } } + @PreAuthorize("hasAuthority('TENANT_ADMIN')") + @RequestMapping(value = "/tenant/customers", params = {"customerTitle"}, method = RequestMethod.GET) + @ResponseBody + public Customer getTenantCustomer( + @RequestParam String customerTitle) throws ThingsboardException { + try { + TenantId tenantId = getCurrentUser().getTenantId(); + return checkNotNull(customerService.findCustomerByTenantIdAndTitle(tenantId, customerTitle)); + } catch (Exception e) { + throw handleException(e); + } + } } diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java index d1df671972..727fd30f87 100644 --- a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java +++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java @@ -77,7 +77,6 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug log.warn("[{}] Failed to find session", session.getId()); session.close(CloseStatus.SERVER_ERROR.withReason("Session not found!")); } - session.sendMessage(message); } catch (IOException e) { log.warn("IO error", e); } diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java index c069ba637f..a6c4f43e6c 100644 --- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java +++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java @@ -96,7 +96,7 @@ public class DefaultMailService implements MailService { javaMailProperties.put(MAIL_PROP + protocol + ".port", jsonConfig.get("smtpPort").asText()); javaMailProperties.put(MAIL_PROP + protocol + ".timeout", jsonConfig.get("timeout").asText()); javaMailProperties.put(MAIL_PROP + protocol + ".auth", String.valueOf(StringUtils.isNotEmpty(jsonConfig.get("username").asText()))); - javaMailProperties.put(MAIL_PROP + protocol + ".starttls.enable", jsonConfig.get("enableTls")); + javaMailProperties.put(MAIL_PROP + protocol + ".starttls.enable", jsonConfig.has("enableTls") ? jsonConfig.get("enableTls").asText() : "false"); return javaMailProperties; } diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java index 20de6d8e73..7e5fba5477 100644 --- a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java +++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java @@ -20,7 +20,6 @@ import io.jsonwebtoken.Jws; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import org.apache.commons.lang3.StringUtils; -import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.CustomerId; @@ -31,7 +30,9 @@ import org.thingsboard.server.config.JwtSettings; import org.thingsboard.server.service.security.model.SecurityUser; import org.thingsboard.server.service.security.model.UserPrincipal; -import java.util.Arrays; +import java.time.ZonedDateTime; +import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.UUID; import java.util.stream.Collectors; @@ -81,13 +82,13 @@ public class JwtTokenFactory { claims.put(CUSTOMER_ID, securityUser.getCustomerId().getId().toString()); } - DateTime currentTime = new DateTime(); + ZonedDateTime currentTime = ZonedDateTime.now(); String token = Jwts.builder() .setClaims(claims) .setIssuer(settings.getTokenIssuer()) - .setIssuedAt(currentTime.toDate()) - .setExpiration(currentTime.plusSeconds(settings.getTokenExpirationTime()).toDate()) + .setIssuedAt(Date.from(currentTime.toInstant())) + .setExpiration(Date.from(currentTime.plusSeconds(settings.getTokenExpirationTime()).toInstant())) .signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey()) .compact(); @@ -129,11 +130,11 @@ public class JwtTokenFactory { throw new IllegalArgumentException("Cannot create JWT Token without username/email"); } - DateTime currentTime = new DateTime(); + ZonedDateTime currentTime = ZonedDateTime.now(); UserPrincipal principal = securityUser.getUserPrincipal(); Claims claims = Jwts.claims().setSubject(principal.getValue()); - claims.put(SCOPES, Arrays.asList(Authority.REFRESH_TOKEN.name())); + claims.put(SCOPES, Collections.singletonList(Authority.REFRESH_TOKEN.name())); claims.put(USER_ID, securityUser.getId().getId().toString()); claims.put(IS_PUBLIC, principal.getType() == UserPrincipal.Type.PUBLIC_ID); @@ -141,8 +142,8 @@ public class JwtTokenFactory { .setClaims(claims) .setIssuer(settings.getTokenIssuer()) .setId(UUID.randomUUID().toString()) - .setIssuedAt(currentTime.toDate()) - .setExpiration(currentTime.plusSeconds(settings.getRefreshTokenExpTime()).toDate()) + .setIssuedAt(Date.from(currentTime.toInstant())) + .setExpiration(Date.from(currentTime.plusSeconds(settings.getRefreshTokenExpTime()).toInstant())) .signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey()) .compact(); diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java index 36d736d6e7..2204fff2af 100644 --- a/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/AbstractControllerTest.java @@ -107,6 +107,11 @@ public abstract class AbstractControllerTest { protected static final String CUSTOMER_USER_EMAIL = "testcustomer@thingsboard.org"; private static final String CUSTOMER_USER_PASSWORD = "customer"; + /** See {@link org.springframework.test.web.servlet.DefaultMvcResult#getAsyncResult(long)} + * and {@link org.springframework.mock.web.MockAsyncContext#getTimeout()} + */ + private static final long DEFAULT_TIMEOUT = -1L; + protected MediaType contentType = new MediaType(MediaType.APPLICATION_JSON.getType(), MediaType.APPLICATION_JSON.getSubtype(), Charset.forName("utf8")); @@ -366,7 +371,7 @@ public abstract class AbstractControllerTest { } protected T doPost(String urlTemplate, T content, Class responseClass, ResultMatcher resultMatcher, String... params) throws Exception { - return readResponse(doPost(urlTemplate, params).andExpect(resultMatcher), responseClass); + return readResponse(doPost(urlTemplate, content, params).andExpect(resultMatcher), responseClass); } protected T doPost(String urlTemplate, T content, Class responseClass, String... params) throws Exception { @@ -374,7 +379,11 @@ public abstract class AbstractControllerTest { } protected T doPostAsync(String urlTemplate, T content, Class responseClass, ResultMatcher resultMatcher, String... params) throws Exception { - return readResponse(doPostAsync(urlTemplate, content, params).andExpect(resultMatcher), responseClass); + return readResponse(doPostAsync(urlTemplate, content, DEFAULT_TIMEOUT, params).andExpect(resultMatcher), responseClass); + } + + protected T doPostAsync(String urlTemplate, T content, Class responseClass, ResultMatcher resultMatcher, Long timeout, String... params) throws Exception { + return readResponse(doPostAsync(urlTemplate, content, timeout, params).andExpect(resultMatcher), responseClass); } protected T doDelete(String urlTemplate, Class responseClass, String... params) throws Exception { @@ -396,12 +405,13 @@ public abstract class AbstractControllerTest { return mockMvc.perform(postRequest); } - protected ResultActions doPostAsync(String urlTemplate, T content, String... params) throws Exception { + protected ResultActions doPostAsync(String urlTemplate, T content, Long timeout, String... params) throws Exception { MockHttpServletRequestBuilder postRequest = post(urlTemplate); setJwtToken(postRequest); String json = json(content); postRequest.contentType(contentType).content(json); MvcResult result = mockMvc.perform(postRequest).andReturn(); + result.getAsyncResult(timeout); return mockMvc.perform(asyncDispatch(result)); } @@ -414,8 +424,8 @@ public abstract class AbstractControllerTest { protected void populateParams(MockHttpServletRequestBuilder request, String... params) { if (params != null && params.length > 0) { - Assert.assertEquals(params.length % 2, 0); - MultiValueMap paramsMap = new LinkedMultiValueMap(); + Assert.assertEquals(0, params.length % 2); + MultiValueMap paramsMap = new LinkedMultiValueMap<>(); for (int i = 0; i < params.length; i += 2) { paramsMap.add(params[i], params[i + 1]); } diff --git a/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java index ac474b818e..8b4332c9f0 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java @@ -15,21 +15,23 @@ */ package org.thingsboard.server.mqtt.rpc; +import java.util.Arrays; + +import com.datastax.driver.core.utils.UUIDs; +import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.eclipse.paho.client.mqttv3.*; import org.junit.*; -import org.springframework.http.HttpStatus; -import org.springframework.web.client.HttpClientErrorException; +import org.thingsboard.server.actors.plugin.PluginProcessingContext; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.Tenant; import org.thingsboard.server.common.data.User; +import org.thingsboard.server.common.data.page.TextPageData; +import org.thingsboard.server.common.data.plugin.PluginMetaData; import org.thingsboard.server.common.data.security.Authority; import org.thingsboard.server.common.data.security.DeviceCredentials; import org.thingsboard.server.controller.AbstractControllerTest; -import org.thingsboard.server.dao.service.DaoNoSqlTest; - -import java.util.UUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -42,15 +44,19 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractControllerTest { private static final String MQTT_URL = "tcp://localhost:1883"; - private static final String FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED = "HttpClientErrorException expected, but not encountered"; + private static final Long TIME_TO_HANDLE_REQUEST = 500L; private Tenant savedTenant; private User tenantAdmin; + private Long asyncContextTimeoutToUseRpcPlugin; + @Before public void beforeTest() throws Exception { loginSysAdmin(); + asyncContextTimeoutToUseRpcPlugin = getAsyncContextTimeoutToUseRpcPlugin(); + Tenant tenant = new Tenant(); tenant.setTitle("My tenant"); savedTenant = doPost("/api/tenant", tenant, Tenant.class); @@ -70,8 +76,7 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC public void afterTest() throws Exception { loginSysAdmin(); if (savedTenant != null) { - doDelete("/api/tenant/" + savedTenant.getId().getId().toString()) - .andExpect(status().isOk()); + doDelete("/api/tenant/" + savedTenant.getId().getId().toString()).andExpect(status().isOk()); } } @@ -102,7 +107,6 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC } @Test - @Ignore // TODO: figure out the right error code for this case. Ignored due to failure: expected 408 but was: 200 public void testServerMqttOneWayRpcDeviceOffline() throws Exception { Device device = new Device(); device.setName("Test One-Way Server-Side RPC Device Offline"); @@ -115,29 +119,19 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; String deviceId = savedDevice.getId().getId().toString(); - try { - doPost("/api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().is(408)); - Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); - } catch (HttpClientErrorException e) { - log.error(e.getMessage(), e); - Assert.assertEquals(HttpStatus.REQUEST_TIMEOUT, e.getStatusCode()); - Assert.assertEquals("408 null", e.getMessage()); - } + + doPostAsync("/api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isRequestTimeout(), + asyncContextTimeoutToUseRpcPlugin); } @Test - @Ignore // TODO: figure out the right error code for this case. Ignored due to failure: expected 400 (404?) but was: 401 public void testServerMqttOneWayRpcDeviceDoesNotExist() throws Exception { String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; - String nonExistentDeviceId = UUID.randomUUID().toString(); - try { - doPostAsync("/api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class, status().is(400)); - Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); - } catch (HttpClientErrorException e) { - log.error(e.getMessage(), e); - Assert.assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); - Assert.assertEquals("400 null", e.getMessage()); - } + String nonExistentDeviceId = UUIDs.timeBased().toString(); + + String result = doPostAsync("/api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class, + status().isNotFound()); + Assert.assertEquals(PluginProcessingContext.DEVICE_WITH_REQUESTED_ID_NOT_FOUND, result); } @Test @@ -168,7 +162,6 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC } @Test - @Ignore // TODO: figure out the right error code for this case. Ignored due to failure: expected 408 but was: 200 public void testServerMqttTwoWayRpcDeviceOffline() throws Exception { Device device = new Device(); device.setName("Test Two-Way Server-Side RPC Device Offline"); @@ -181,29 +174,19 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; String deviceId = savedDevice.getId().getId().toString(); - try { - doPost("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().is(408)); - Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); - } catch (HttpClientErrorException e) { - log.error(e.getMessage(), e); - Assert.assertEquals(HttpStatus.REQUEST_TIMEOUT, e.getStatusCode()); - Assert.assertEquals("408 null", e.getMessage()); - } + + doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isRequestTimeout(), + asyncContextTimeoutToUseRpcPlugin); } @Test - @Ignore // TODO: figure out the right error code for this case. Ignored due to failure: expected 400 (404?) but was: 401 public void testServerMqttTwoWayRpcDeviceDoesNotExist() throws Exception { String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; - String nonExistentDeviceId = UUID.randomUUID().toString(); - try { - doPostAsync("/api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class, status().is(400)); - Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); - } catch (HttpClientErrorException e) { - log.error(e.getMessage(), e); - Assert.assertEquals(HttpStatus.BAD_REQUEST, e.getStatusCode()); - Assert.assertEquals("400 null", e.getMessage()); - } + String nonExistentDeviceId = UUIDs.timeBased().toString(); + + String result = doPostAsync("/api/plugins/rpc/twoway/" + nonExistentDeviceId, setGpioRequest, String.class, + status().isNotFound()); + Assert.assertEquals(PluginProcessingContext.DEVICE_WITH_REQUESTED_ID_NOT_FOUND, result); } private Device getSavedDevice(Device device) throws Exception { @@ -214,6 +197,13 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC return doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class); } + private Long getAsyncContextTimeoutToUseRpcPlugin() throws Exception { + TextPageData plugins = doGetTyped("/api/plugin/system?limit=1&textSearch=system rpc plugin", + new TypeReference>(){}); + Long systemRpcPluginTimeout = plugins.getData().iterator().next().getConfiguration().get("defaultTimeout").asLong(); + return systemRpcPluginTimeout + TIME_TO_HANDLE_REQUEST; + } + private static class TestMqttCallback implements MqttCallback { private final MqttAsyncClient client; @@ -228,10 +218,10 @@ public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractC @Override public void messageArrived(String requestTopic, MqttMessage mqttMessage) throws Exception { - log.info("Message Arrived: " + mqttMessage.getPayload().toString()); + log.info("Message Arrived: " + Arrays.toString(mqttMessage.getPayload())); MqttMessage message = new MqttMessage(); String responseTopic = requestTopic.replace("request", "response"); - message.setPayload("{\"value1\":\"A\", \"value2\":\"B\"}".getBytes()); + message.setPayload("{\"value1\":\"A\", \"value2\":\"B\"}".getBytes("UTF-8")); client.publish(responseTopic, message); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java index 4600d9f048..1d1abda11f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java @@ -22,20 +22,24 @@ import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.page.TextPageData; import org.thingsboard.server.common.data.page.TextPageLink; +import java.util.Optional; + public interface CustomerService { Customer findCustomerById(CustomerId customerId); + Optional findCustomerByTenantIdAndTitle(TenantId tenantId, String title); + ListenableFuture findCustomerByIdAsync(CustomerId customerId); Customer saveCustomer(Customer customer); - + void deleteCustomer(CustomerId customerId); Customer findOrCreatePublicCustomer(TenantId tenantId); TextPageData findCustomersByTenantId(TenantId tenantId, TextPageLink pageLink); - + void deleteCustomersByTenantId(TenantId tenantId); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java index e8ec21f3c0..f76d654bf9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java @@ -52,6 +52,7 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom private static final String PUBLIC_CUSTOMER_TITLE = "Public"; public static final String INCORRECT_CUSTOMER_ID = "Incorrect customerId "; + public static final String INCORRECT_TENANT_ID = "Incorrect tenantId "; @Autowired private CustomerDao customerDao; @@ -78,6 +79,13 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom return customerDao.findById(customerId.getId()); } + @Override + public Optional findCustomerByTenantIdAndTitle(TenantId tenantId, String title) { + log.trace("Executing findCustomerByTenantIdAndTitle [{}] [{}]", tenantId, title); + validateId(tenantId, INCORRECT_TENANT_ID + tenantId); + return customerDao.findCustomersByTenantIdAndTitle(tenantId.getId(), title); + } + @Override public ListenableFuture findCustomerByIdAsync(CustomerId customerId) { log.trace("Executing findCustomerByIdAsync [{}]", customerId); diff --git a/pom.xml b/pom.xml index e45fc3ea28..4b77abbd98 100755 --- a/pom.xml +++ b/pom.xml @@ -33,8 +33,7 @@ 4.3.4.RELEASE 4.2.0.RELEASE 0.7.0 - 2.4 - 2.2.0 + 2.2.0 4.12 1.7.7 1.2.3 @@ -483,11 +482,6 @@ jjwt ${jjwt.version} - - joda-time - joda-time - ${joda-time.version} - org.apache.velocity velocity diff --git a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java b/tools/src/main/java/org/thingsboard/client/tools/RestClient.java index 7000496cdc..0baf1db508 100644 --- a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java +++ b/tools/src/main/java/org/thingsboard/client/tools/RestClient.java @@ -29,13 +29,12 @@ import org.springframework.web.client.RestTemplate; import org.thingsboard.server.common.data.Customer; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.alarm.Alarm; -import org.thingsboard.server.common.data.alarm.AlarmSeverity; -import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.asset.Asset; import org.thingsboard.server.common.data.id.AssetId; import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.EntityId; +import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.security.DeviceCredentials; import java.io.IOException; @@ -78,6 +77,36 @@ public class RestClient implements ClientHttpRequestInterceptor { } } + public Optional findCustomer(String title) { + Map params = new HashMap(); + params.put("customerTitle", title); + try { + ResponseEntity customerEntity = restTemplate.getForEntity(baseURL + "/api/tenant/customers?customerTitle={customerTitle}", Customer.class, params); + return Optional.of(customerEntity.getBody()); + } catch (HttpClientErrorException exception) { + if (exception.getStatusCode() == HttpStatus.NOT_FOUND) { + return Optional.empty(); + } else { + throw exception; + } + } + } + + public Optional findAsset(String name) { + Map params = new HashMap(); + params.put("assetName", name); + try { + ResponseEntity assetEntity = restTemplate.getForEntity(baseURL + "/api/tenant/assets?assetName={assetName}", Asset.class, params); + return Optional.of(assetEntity.getBody()); + } catch (HttpClientErrorException exception) { + if (exception.getStatusCode() == HttpStatus.NOT_FOUND) { + return Optional.empty(); + } else { + throw exception; + } + } + } + public Customer createCustomer(String title) { Customer customer = new Customer(); customer.setTitle(title); @@ -112,6 +141,14 @@ public class RestClient implements ClientHttpRequestInterceptor { customerId.toString(), assetId.toString()).getBody(); } + public EntityRelation makeRelation(String relationType, EntityId idFrom, EntityId idTo) { + EntityRelation relation = new EntityRelation(); + relation.setFrom(idFrom); + relation.setTo(idTo); + relation.setType(relationType); + return restTemplate.postForEntity(baseURL + "/api/relation", relation, EntityRelation.class).getBody(); + } + public DeviceCredentials getCredentials(DeviceId id) { return restTemplate.getForEntity(baseURL + "/api/device/" + id.getId().toString() + "/credentials", DeviceCredentials.class).getBody(); } diff --git a/tools/src/main/shell/client.keygen.sh b/tools/src/main/shell/client.keygen.sh index 2e83ef0ef0..bb59077ba7 100755 --- a/tools/src/main/shell/client.keygen.sh +++ b/tools/src/main/shell/client.keygen.sh @@ -74,13 +74,13 @@ echo "Generating SSL Key Pair..." keytool -genkeypair -v \ -alias $CLIENT_KEY_ALIAS \ - -dname "CN=$DOMAIN_SUFFIX, OU=$ORGANIZATIONAL_UNIT, O=$ORGANIZATION, L=$CITY, ST=$STATE_OR_PROVINCE, C=$TWO_LETTER_COUNTRY_CODE" \ -keystore $CLIENT_FILE_PREFIX.jks \ -keypass $CLIENT_KEY_PASSWORD \ -storepass $CLIENT_KEYSTORE_PASSWORD \ -keyalg RSA \ -keysize 2048 \ - -validity 9999 + -validity 9999 \ + -dname "CN=$DOMAIN_SUFFIX, OU=$ORGANIZATIONAL_UNIT, O=$ORGANIZATION, L=$CITY, ST=$STATE_OR_PROVINCE, C=$TWO_LETTER_COUNTRY_CODE" echo "Converting keystore to pkcs12" keytool -importkeystore \ diff --git a/tools/src/main/shell/keygen.properties b/tools/src/main/shell/keygen.properties index 8dd11f2ea4..a01b782a74 100644 --- a/tools/src/main/shell/keygen.properties +++ b/tools/src/main/shell/keygen.properties @@ -17,7 +17,7 @@ DOMAIN_SUFFIX="$(hostname)" ORGANIZATIONAL_UNIT=Thingsboard ORGANIZATION=Thingsboard -CITY=San Francisco +CITY=SF STATE_OR_PROVINCE=CA TWO_LETTER_COUNTRY_CODE=US diff --git a/ui/src/app/admin/general-settings.tpl.html b/ui/src/app/admin/general-settings.tpl.html index f6286511b6..50342d3afd 100644 --- a/ui/src/app/admin/general-settings.tpl.html +++ b/ui/src/app/admin/general-settings.tpl.html @@ -22,11 +22,11 @@ admin.general-settings - - + +
-
+
@@ -35,7 +35,7 @@
- {{'action.save' | translate}} + {{'action.save' | translate}}
diff --git a/ui/src/app/admin/outgoing-mail-settings.tpl.html b/ui/src/app/admin/outgoing-mail-settings.tpl.html index fd8476a499..3c59593ff7 100644 --- a/ui/src/app/admin/outgoing-mail-settings.tpl.html +++ b/ui/src/app/admin/outgoing-mail-settings.tpl.html @@ -24,11 +24,11 @@
- - + +
-
+
@@ -38,7 +38,7 @@ - + {{smtpProtocol.toUpperCase()}} @@ -78,7 +78,7 @@
admin.timeout-invalid
 - {{ 'admin.enable-tls' | translate }} @@ -89,8 +89,8 @@
- {{'admin.send-test-mail' | translate}} - {{'action.save' | translate}} + {{'admin.send-test-mail' | translate}} + {{'action.save' | translate}}
diff --git a/ui/src/app/alarm/alarm-details-dialog.tpl.html b/ui/src/app/alarm/alarm-details-dialog.tpl.html index b090052228..cc213d1178 100644 --- a/ui/src/app/alarm/alarm-details-dialog.tpl.html +++ b/ui/src/app/alarm/alarm-details-dialog.tpl.html @@ -87,7 +87,7 @@ {{ 'alarm.acknowledge' | translate }} @@ -95,12 +95,12 @@ {{ 'alarm.clear' | translate }} - {{ 'action.close' | + {{ 'action.close' | translate }} diff --git a/ui/src/app/alarm/alarm-table.tpl.html b/ui/src/app/alarm/alarm-table.tpl.html index c32e39a2d2..98d42a2a93 100644 --- a/ui/src/app/alarm/alarm-table.tpl.html +++ b/ui/src/app/alarm/alarm-table.tpl.html @@ -19,7 +19,7 @@
- + {{ ('alarm.search-status.' + searchStatus) | translate }} @@ -31,8 +31,8 @@ - + tenantService.getTenant(id, config), entityIds); break; case types.entityType.customer: - promise = getEntitiesByIdsPromise(customerService.getCustomer, entityIds); + promise = getEntitiesByIdsPromise( + (id) => customerService.getCustomer(id, config), entityIds); break; case types.entityType.rule: - promise = getEntitiesByIdsPromise(ruleService.getRule, entityIds); + promise = getEntitiesByIdsPromise( + (id) => ruleService.getRule(id, config), entityIds); break; case types.entityType.plugin: - promise = getEntitiesByIdsPromise(pluginService.getPlugin, entityIds); + promise = getEntitiesByIdsPromise( + (id) => pluginService.getPlugin(id, config), entityIds); break; case types.entityType.dashboard: - promise = getEntitiesByIdsPromise(dashboardService.getDashboardInfo, entityIds); + promise = getEntitiesByIdsPromise( + (id) => dashboardService.getDashboardInfo(id, config), entityIds); break; case types.entityType.user: - promise = getEntitiesByIdsPromise(userService.getUser, entityIds); + promise = getEntitiesByIdsPromise( + (id) => userService.getUser(id, true, config), entityIds); break; case types.entityType.alarm: $log.error('Get Alarm Entity is not implemented!'); @@ -178,11 +184,11 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device return deferred.promise; } - function getSingleTenantByPageLinkPromise(pageLink) { + function getSingleTenantByPageLinkPromise(pageLink, config) { var user = userService.getCurrentUser(); var tenantId = user.tenantId; var deferred = $q.defer(); - tenantService.getTenant(tenantId).then( + tenantService.getTenant(tenantId, config).then( function success(tenant) { var tenantName = tenant.name; var result = { @@ -202,11 +208,11 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device return deferred.promise; } - function getSingleCustomerByPageLinkPromise(pageLink) { + function getSingleCustomerByPageLinkPromise(pageLink, config) { var user = userService.getCurrentUser(); var customerId = user.customerId; var deferred = $q.defer(); - customerService.getCustomer(customerId).then( + customerService.getCustomer(customerId, config).then( function success(customer) { var customerName = customer.name; var result = { @@ -247,29 +253,29 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device break; case types.entityType.tenant: if (user.authority === 'TENANT_ADMIN') { - promise = getSingleTenantByPageLinkPromise(pageLink); + promise = getSingleTenantByPageLinkPromise(pageLink, config); } else { - promise = tenantService.getTenants(pageLink); + promise = tenantService.getTenants(pageLink, config); } break; case types.entityType.customer: if (user.authority === 'CUSTOMER_USER') { - promise = getSingleCustomerByPageLinkPromise(pageLink); + promise = getSingleCustomerByPageLinkPromise(pageLink, config); } else { - promise = customerService.getCustomers(pageLink); + promise = customerService.getCustomers(pageLink, config); } break; case types.entityType.rule: - promise = ruleService.getAllRules(pageLink); + promise = ruleService.getAllRules(pageLink, config); break; case types.entityType.plugin: - promise = pluginService.getAllPlugins(pageLink); + promise = pluginService.getAllPlugins(pageLink, config); break; case types.entityType.dashboard: if (user.authority === 'CUSTOMER_USER') { - promise = dashboardService.getCustomerDashboards(customerId, pageLink, false); + promise = dashboardService.getCustomerDashboards(customerId, pageLink, false, config); } else { - promise = dashboardService.getTenantDashboards(pageLink, false); + promise = dashboardService.getTenantDashboards(pageLink, false, config); } break; case types.entityType.user: @@ -426,7 +432,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device var stateEntityId = getStateEntityId(filter, stateParams); switch (filter.type) { case types.aliasFilterType.singleEntity.value: - getEntity(filter.singleEntity.entityType, filter.singleEntity.id).then( + getEntity(filter.singleEntity.entityType, filter.singleEntity.id, {ignoreLoading: true}).then( function success(entity) { result.entities = entitiesToEntitiesInfo([entity]); deferred.resolve(result); @@ -437,7 +443,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device ); break; case types.aliasFilterType.entityList.value: - getEntities(filter.entityType, filter.entityList).then( + getEntities(filter.entityType, filter.entityList, {ignoreLoading: true}).then( function success(entities) { if (entities && entities.length || !failOnEmpty) { result.entities = entitiesToEntitiesInfo(entities); @@ -452,7 +458,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device ); break; case types.aliasFilterType.entityName.value: - getEntitiesByNameFilter(filter.entityType, filter.entityNameFilter, maxItems).then( + getEntitiesByNameFilter(filter.entityType, filter.entityNameFilter, maxItems, {ignoreLoading: true}).then( function success(entities) { if (entities && entities.length || !failOnEmpty) { result.entities = entitiesToEntitiesInfo(entities); @@ -469,7 +475,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device case types.aliasFilterType.stateEntity.value: result.stateEntity = true; if (stateEntityId) { - getEntity(stateEntityId.entityType, stateEntityId.id).then( + getEntity(stateEntityId.entityType, stateEntityId.id, {ignoreLoading: true}).then( function success(entity) { result.entities = entitiesToEntitiesInfo([entity]); deferred.resolve(result); @@ -483,7 +489,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device } break; case types.aliasFilterType.assetType.value: - getEntitiesByNameFilter(types.entityType.asset, filter.assetNameFilter, maxItems, null, filter.assetType).then( + getEntitiesByNameFilter(types.entityType.asset, filter.assetNameFilter, maxItems, {ignoreLoading: true}, filter.assetType).then( function success(entities) { if (entities && entities.length || !failOnEmpty) { result.entities = entitiesToEntitiesInfo(entities); @@ -498,7 +504,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device ); break; case types.aliasFilterType.deviceType.value: - getEntitiesByNameFilter(types.entityType.device, filter.deviceNameFilter, maxItems, null, filter.deviceType).then( + getEntitiesByNameFilter(types.entityType.device, filter.deviceNameFilter, maxItems, {ignoreLoading: true}, filter.deviceType).then( function success(entities) { if (entities && entities.length || !failOnEmpty) { result.entities = entitiesToEntitiesInfo(entities); @@ -533,7 +539,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device filters: filter.filters }; searchQuery.parameters.maxLevel = filter.maxLevel && filter.maxLevel > 0 ? filter.maxLevel : -1; - entityRelationService.findInfoByQuery(searchQuery).then( + entityRelationService.findInfoByQuery(searchQuery, {ignoreLoading: true}).then( function success(allRelations) { if (allRelations && allRelations.length || !failOnEmpty) { if (angular.isDefined(maxItems) && maxItems > 0 && allRelations) { @@ -577,10 +583,10 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device var findByQueryPromise; if (filter.type == types.aliasFilterType.assetSearchQuery.value) { searchQuery.assetTypes = filter.assetTypes; - findByQueryPromise = assetService.findByQuery(searchQuery, false); + findByQueryPromise = assetService.findByQuery(searchQuery, false, {ignoreLoading: true}); } else if (filter.type == types.aliasFilterType.deviceSearchQuery.value) { searchQuery.deviceTypes = filter.deviceTypes; - findByQueryPromise = deviceService.findByQuery(searchQuery, false); + findByQueryPromise = deviceService.findByQuery(searchQuery, false, {ignoreLoading: true}); } findByQueryPromise.then( function success(entities) { @@ -762,7 +768,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device return deferred.promise; } - function getEntityKeys(entityType, entityId, query, type) { + function getEntityKeys(entityType, entityId, query, type, config) { var deferred = $q.defer(); var url = '/api/plugins/telemetry/' + entityType + '/' + entityId + '/keys/'; if (type === types.dataKeyType.timeseries) { @@ -770,7 +776,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device } else if (type === types.dataKeyType.attribute) { url += 'attributes'; } - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { var result = []; if (response.data) { if (query) { diff --git a/ui/src/app/api/plugin.service.js b/ui/src/app/api/plugin.service.js index 55429ce1cf..28f63def4e 100644 --- a/ui/src/app/api/plugin.service.js +++ b/ui/src/app/api/plugin.service.js @@ -50,11 +50,11 @@ function PluginService($http, $q, $rootScope, $filter, componentDescriptorServic tenantPlugins = undefined; } - function loadPluginsCache() { + function loadPluginsCache(config) { var deferred = $q.defer(); if (!allPlugins) { var url = '/api/plugins'; - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { componentDescriptorService.getComponentDescriptorsByType(types.componentType.plugin).then( function success(pluginComponents) { allPlugins = response.data; @@ -93,9 +93,9 @@ function PluginService($http, $q, $rootScope, $filter, componentDescriptorServic return deferred.promise; } - function getSystemPlugins(pageLink) { + function getSystemPlugins(pageLink, config) { var deferred = $q.defer(); - loadPluginsCache().then( + loadPluginsCache(config).then( function success() { utils.filterSearchTextEntities(systemPlugins, 'name', pageLink, deferred); }, @@ -106,9 +106,9 @@ function PluginService($http, $q, $rootScope, $filter, componentDescriptorServic return deferred.promise; } - function getTenantPlugins(pageLink) { + function getTenantPlugins(pageLink, config) { var deferred = $q.defer(); - loadPluginsCache().then( + loadPluginsCache(config).then( function success() { utils.filterSearchTextEntities(tenantPlugins, 'name', pageLink, deferred); }, @@ -119,9 +119,9 @@ function PluginService($http, $q, $rootScope, $filter, componentDescriptorServic return deferred.promise; } - function getAllActionPlugins(pageLink) { + function getAllActionPlugins(pageLink, config) { var deferred = $q.defer(); - loadPluginsCache().then( + loadPluginsCache(config).then( function success() { utils.filterSearchTextEntities(allActionPlugins, 'name', pageLink, deferred); }, @@ -132,9 +132,9 @@ function PluginService($http, $q, $rootScope, $filter, componentDescriptorServic return deferred.promise; } - function getAllPlugins(pageLink) { + function getAllPlugins(pageLink, config) { var deferred = $q.defer(); - loadPluginsCache().then( + loadPluginsCache(config).then( function success() { utils.filterSearchTextEntities(allPlugins, 'name', pageLink, deferred); }, @@ -156,10 +156,10 @@ function PluginService($http, $q, $rootScope, $filter, componentDescriptorServic return deferred.promise; } - function getPlugin(pluginId) { + function getPlugin(pluginId, config) { var deferred = $q.defer(); var url = '/api/plugin/' + pluginId; - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { deferred.resolve(response.data); }, function fail(response) { deferred.reject(response.data); diff --git a/ui/src/app/api/rule.service.js b/ui/src/app/api/rule.service.js index ee166f69ac..df37305ec5 100644 --- a/ui/src/app/api/rule.service.js +++ b/ui/src/app/api/rule.service.js @@ -47,11 +47,11 @@ function RuleService($http, $q, $rootScope, $filter, types, utils) { tenantRules = undefined; } - function loadRulesCache() { + function loadRulesCache(config) { var deferred = $q.defer(); if (!allRules) { var url = '/api/rules'; - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { allRules = response.data; systemRules = []; tenantRules = []; @@ -100,9 +100,9 @@ function RuleService($http, $q, $rootScope, $filter, types, utils) { return deferred.promise; } - function getAllRules(pageLink) { + function getAllRules(pageLink, config) { var deferred = $q.defer(); - loadRulesCache().then( + loadRulesCache(config).then( function success() { utils.filterSearchTextEntities(allRules, 'name', pageLink, deferred); }, @@ -124,10 +124,10 @@ function RuleService($http, $q, $rootScope, $filter, types, utils) { return deferred.promise; } - function getRule(ruleId) { + function getRule(ruleId, config) { var deferred = $q.defer(); var url = '/api/rule/' + ruleId; - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { deferred.resolve(response.data); }, function fail(response) { deferred.reject(response.data); diff --git a/ui/src/app/api/telemetry-websocket.service.js b/ui/src/app/api/telemetry-websocket.service.js index f84d66d3dd..b0e8ea91dd 100644 --- a/ui/src/app/api/telemetry-websocket.service.js +++ b/ui/src/app/api/telemetry-websocket.service.js @@ -23,6 +23,8 @@ export default angular.module('thingsboard.api.telemetryWebsocket', [thingsboard const RECONNECT_INTERVAL = 2000; const WS_IDLE_TIMEOUT = 90000; +const MAX_PUBLISH_COMMANDS = 10; + /*@ngInject*/ function TelemetryWebsocketService($rootScope, $websocket, $timeout, $window, types, userService) { @@ -75,19 +77,40 @@ function TelemetryWebsocketService($rootScope, $websocket, $timeout, $window, ty return service; function publishCommands () { - if (isOpened && (cmdsWrapper.tsSubCmds.length > 0 || - cmdsWrapper.historyCmds.length > 0 || - cmdsWrapper.attrSubCmds.length > 0)) { - dataStream.send(angular.copy(cmdsWrapper)).then(function () { + while(isOpened && hasCommands()) { + dataStream.send(preparePublishCommands()).then(function () { checkToClose(); }); - cmdsWrapper.tsSubCmds = []; - cmdsWrapper.historyCmds = []; - cmdsWrapper.attrSubCmds = []; } tryOpenSocket(); } + function hasCommands() { + return cmdsWrapper.tsSubCmds.length > 0 || + cmdsWrapper.historyCmds.length > 0 || + cmdsWrapper.attrSubCmds.length > 0; + } + + function preparePublishCommands() { + var preparedWrapper = {}; + var leftCount = MAX_PUBLISH_COMMANDS; + preparedWrapper.tsSubCmds = popCmds(cmdsWrapper.tsSubCmds, leftCount); + leftCount -= preparedWrapper.tsSubCmds.length; + preparedWrapper.historyCmds = popCmds(cmdsWrapper.historyCmds, leftCount); + leftCount -= preparedWrapper.historyCmds.length; + preparedWrapper.attrSubCmds = popCmds(cmdsWrapper.attrSubCmds, leftCount); + return preparedWrapper; + } + + function popCmds(cmds, leftCount) { + var toPublish = Math.min(cmds.length, leftCount); + if (toPublish > 0) { + return cmds.splice(0, toPublish); + } else { + return []; + } + } + function onError (/*message*/) { isOpening = false; } diff --git a/ui/src/app/api/tenant.service.js b/ui/src/app/api/tenant.service.js index 594b543e7d..be04ae970d 100644 --- a/ui/src/app/api/tenant.service.js +++ b/ui/src/app/api/tenant.service.js @@ -29,7 +29,7 @@ function TenantService($http, $q) { return service; - function getTenants (pageLink) { + function getTenants (pageLink, config) { var deferred = $q.defer(); var url = '/api/tenants?limit=' + pageLink.limit; if (angular.isDefined(pageLink.textSearch)) { @@ -41,7 +41,7 @@ function TenantService($http, $q) { if (angular.isDefined(pageLink.textOffset)) { url += '&textOffset=' + pageLink.textOffset; } - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { deferred.resolve(response.data); }, function fail() { deferred.reject(); @@ -49,10 +49,10 @@ function TenantService($http, $q) { return deferred.promise; } - function getTenant (tenantId) { + function getTenant (tenantId, config) { var deferred = $q.defer(); var url = '/api/tenant/' + tenantId; - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { deferred.resolve(response.data); }, function fail(response) { deferred.reject(response.data); diff --git a/ui/src/app/api/user.service.js b/ui/src/app/api/user.service.js index d09387bda8..1a146b4e00 100644 --- a/ui/src/app/api/user.service.js +++ b/ui/src/app/api/user.service.js @@ -421,10 +421,14 @@ function UserService($http, $q, $rootScope, adminService, dashboardService, logi return deferred.promise; } - function getUser(userId, ignoreErrors) { + function getUser(userId, ignoreErrors, config) { var deferred = $q.defer(); var url = '/api/user/' + userId; - $http.get(url, { ignoreErrors: ignoreErrors }).then(function success(response) { + if (!config) { + config = {}; + } + config = Object.assign(config, { ignoreErrors: ignoreErrors }); + $http.get(url, config).then(function success(response) { deferred.resolve(response.data); }, function fail() { deferred.reject(); diff --git a/ui/src/app/api/widget.service.js b/ui/src/app/api/widget.service.js index 3c74ecbb4c..fe95729f3b 100644 --- a/ui/src/app/api/widget.service.js +++ b/ui/src/app/api/widget.service.js @@ -298,11 +298,11 @@ function WidgetService($rootScope, $http, $q, $filter, $ocLazyLoad, $window, $tr tenantWidgetsBundles = undefined; } - function loadWidgetsBundleCache() { + function loadWidgetsBundleCache(config) { var deferred = $q.defer(); if (!allWidgetsBundles) { var url = '/api/widgetsBundles'; - $http.get(url, null).then(function success(response) { + $http.get(url, config).then(function success(response) { allWidgetsBundles = response.data; systemWidgetsBundles = []; tenantWidgetsBundles = []; @@ -326,9 +326,9 @@ function WidgetService($rootScope, $http, $q, $filter, $ocLazyLoad, $window, $tr } - function getSystemWidgetsBundles() { + function getSystemWidgetsBundles(config) { var deferred = $q.defer(); - loadWidgetsBundleCache().then( + loadWidgetsBundleCache(config).then( function success() { deferred.resolve(systemWidgetsBundles); }, @@ -339,9 +339,9 @@ function WidgetService($rootScope, $http, $q, $filter, $ocLazyLoad, $window, $tr return deferred.promise; } - function getTenantWidgetsBundles() { + function getTenantWidgetsBundles(config) { var deferred = $q.defer(); - loadWidgetsBundleCache().then( + loadWidgetsBundleCache(config).then( function success() { deferred.resolve(tenantWidgetsBundles); }, @@ -352,9 +352,9 @@ function WidgetService($rootScope, $http, $q, $filter, $ocLazyLoad, $window, $tr return deferred.promise; } - function getAllWidgetsBundles() { + function getAllWidgetsBundles(config) { var deferred = $q.defer(); - loadWidgetsBundleCache().then( + loadWidgetsBundleCache(config).then( function success() { deferred.resolve(allWidgetsBundles); }, diff --git a/ui/src/app/asset/add-asset.tpl.html b/ui/src/app/asset/add-asset.tpl.html index ce22e4e674..71901e4b6a 100644 --- a/ui/src/app/asset/add-asset.tpl.html +++ b/ui/src/app/asset/add-asset.tpl.html @@ -27,8 +27,8 @@ - - + +
@@ -36,10 +36,10 @@ - + {{ 'action.add' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/asset/add-assets-to-customer.tpl.html b/ui/src/app/asset/add-assets-to-customer.tpl.html index 18e23ce0ca..64edcf817a 100644 --- a/ui/src/app/asset/add-assets-to-customer.tpl.html +++ b/ui/src/app/asset/add-assets-to-customer.tpl.html @@ -26,8 +26,8 @@
- - + +
@@ -65,11 +65,11 @@ - {{ 'action.assign' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/asset/asset-fieldset.tpl.html b/ui/src/app/asset/asset-fieldset.tpl.html index d921b2e6c4..afa14adc07 100644 --- a/ui/src/app/asset/asset-fieldset.tpl.html +++ b/ui/src/app/asset/asset-fieldset.tpl.html @@ -48,7 +48,7 @@ ng-show="!isEdit && isPublic && (assetScope === 'customer' || assetScope === 'tenant')"> {{ 'asset.asset-public' | translate }}
-
+
@@ -57,7 +57,7 @@ - - + +
@@ -65,10 +65,10 @@ - + {{ 'action.assign' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/common/utils.service.js b/ui/src/app/common/utils.service.js index 9d997816f6..085a28bad5 100644 --- a/ui/src/app/common/utils.service.js +++ b/ui/src/app/common/utils.service.js @@ -134,6 +134,8 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t defaultAlarmDataKeys.push(dataKey); } + var imageAspectMap = {}; + var service = { getDefaultDatasource: getDefaultDatasource, generateObjectFromJsonSchema: generateObjectFromJsonSchema, @@ -159,7 +161,8 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t insertVariable: insertVariable, customTranslation: customTranslation, objToBase64: objToBase64, - base64toObj: base64toObj + base64toObj: base64toObj, + loadImageAspect: loadImageAspect } return service; @@ -543,4 +546,34 @@ function Utils($mdColorPalette, $rootScope, $window, $translate, $q, $timeout, t return obj; } + function loadImageAspect(imageUrl) { + var deferred = $q.defer(); + if (imageUrl && imageUrl.length) { + var urlHashCode = hashCode(imageUrl); + var aspect = imageAspectMap[urlHashCode]; + if (angular.isUndefined(aspect)) { + var testImage = document.createElement('img'); // eslint-disable-line + testImage.style.visibility = 'hidden'; + testImage.onload = function() { + aspect = testImage.width / testImage.height; + document.body.removeChild(testImage); //eslint-disable-line + imageAspectMap[urlHashCode] = aspect; + deferred.resolve(aspect); + }; + testImage.onerror = function() { + aspect = 0; + imageAspectMap[urlHashCode] = aspect; + deferred.resolve(aspect); + }; + document.body.appendChild(testImage); //eslint-disable-line + testImage.src = imageUrl; + } else { + deferred.resolve(aspect); + } + } else { + deferred.resolve(0); + } + return deferred.promise; + } + } diff --git a/ui/src/app/component/component-dialog.tpl.html b/ui/src/app/component/component-dialog.tpl.html index 271d818555..841d7ef69a 100644 --- a/ui/src/app/component/component-dialog.tpl.html +++ b/ui/src/app/component/component-dialog.tpl.html @@ -27,11 +27,11 @@
- - + +
-
+
@@ -42,7 +42,7 @@ - + {{componentDescriptor.name}} @@ -57,7 +57,7 @@ @@ -67,11 +67,11 @@ - {{ (vm.isAdd ? 'action.add' : 'action.save') | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/component/component.tpl.html b/ui/src/app/component/component.tpl.html index a9faa7f03f..d007ba6ccd 100644 --- a/ui/src/app/component/component.tpl.html +++ b/ui/src/app/component/component.tpl.html @@ -24,7 +24,7 @@ {{ componentTypeName }}
- @@ -43,7 +43,7 @@ edit - diff --git a/ui/src/app/components/dashboard-autocomplete.directive.js b/ui/src/app/components/dashboard-autocomplete.directive.js index ce7e4770fc..2235b82e95 100644 --- a/ui/src/app/components/dashboard-autocomplete.directive.js +++ b/ui/src/app/components/dashboard-autocomplete.directive.js @@ -48,19 +48,19 @@ function DashboardAutocomplete($compile, $templateCache, $q, dashboardService, u var promise; if (scope.dashboardsScope === 'customer' || userService.getAuthority() === 'CUSTOMER_USER') { if (scope.customerId) { - promise = dashboardService.getCustomerDashboards(scope.customerId, pageLink, false); + promise = dashboardService.getCustomerDashboards(scope.customerId, pageLink, false, {ignoreLoading: true}); } else { promise = $q.when({data: []}); } } else { if (userService.getAuthority() === 'SYS_ADMIN') { if (scope.tenantId) { - promise = dashboardService.getTenantDashboardsByTenantId(scope.tenantId, pageLink); + promise = dashboardService.getTenantDashboardsByTenantId(scope.tenantId, pageLink, {ignoreLoading: true}); } else { promise = $q.when({data: []}); } } else { - promise = dashboardService.getTenantDashboards(pageLink, false); + promise = dashboardService.getTenantDashboards(pageLink, false, {ignoreLoading: true}); } } diff --git a/ui/src/app/components/dashboard-select.directive.js b/ui/src/app/components/dashboard-select.directive.js index d7b32d8b06..ac5cd3d5b1 100644 --- a/ui/src/app/components/dashboard-select.directive.js +++ b/ui/src/app/components/dashboard-select.directive.js @@ -48,12 +48,12 @@ function DashboardSelect($compile, $templateCache, $q, $mdMedia, $mdPanel, $docu var promise; if (scope.dashboardsScope === 'customer' || userService.getAuthority() === 'CUSTOMER_USER') { if (scope.customerId && scope.customerId != types.id.nullUid) { - promise = dashboardService.getCustomerDashboards(scope.customerId, pageLink, false); + promise = dashboardService.getCustomerDashboards(scope.customerId, pageLink, false, {ignoreLoading: true}); } else { promise = $q.when({data: []}); } } else { - promise = dashboardService.getTenantDashboards(pageLink, false); + promise = dashboardService.getTenantDashboards(pageLink, false, {ignoreLoading: true}); } promise.then(function success(result) { diff --git a/ui/src/app/components/datakey-config-dialog.controller.js b/ui/src/app/components/datakey-config-dialog.controller.js index ccaac21235..c4e85946f9 100644 --- a/ui/src/app/components/datakey-config-dialog.controller.js +++ b/ui/src/app/components/datakey-config-dialog.controller.js @@ -43,7 +43,7 @@ function DatakeyConfigDialogController($scope, $mdDialog, $q, entityService, dat function success(aliasInfo) { var entity = aliasInfo.currentEntity; if (entity) { - entityService.getEntityKeys(entity.entityType, entity.id, query, type).then( + entityService.getEntityKeys(entity.entityType, entity.id, query, type, {ignoreLoading: true}).then( function success(keys) { deferred.resolve(keys); }, diff --git a/ui/src/app/components/datakey-config-dialog.tpl.html b/ui/src/app/components/datakey-config-dialog.tpl.html index a55c3161c1..574a7af3c8 100644 --- a/ui/src/app/components/datakey-config-dialog.tpl.html +++ b/ui/src/app/components/datakey-config-dialog.tpl.html @@ -26,8 +26,8 @@
- - + + - + {{ 'action.save' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/components/details-sidenav.tpl.html b/ui/src/app/components/details-sidenav.tpl.html index 24c22704d7..934aed37b2 100644 --- a/ui/src/app/components/details-sidenav.tpl.html +++ b/ui/src/app/components/details-sidenav.tpl.html @@ -35,7 +35,7 @@
- @@ -44,7 +44,7 @@ - diff --git a/ui/src/app/components/grid.tpl.html b/ui/src/app/components/grid.tpl.html index 24285d898a..b334567e5a 100644 --- a/ui/src/app/components/grid.tpl.html +++ b/ui/src/app/components/grid.tpl.html @@ -45,7 +45,7 @@ - {{ action.details( rowItem[n] ) }} @@ -81,28 +81,28 @@
- {{ groupAction.details(vm.items.selectedCount) }} - + {{'grid.scroll-to-top' | translate}} - + {{ vm.addItemAction.details() }} - + - + {{ vm.addItemAction.details() }} @@ -110,7 +110,7 @@ - {{ addItemAction.details() }} diff --git a/ui/src/app/components/legend-config-panel.tpl.html b/ui/src/app/components/legend-config-panel.tpl.html index c5538a12e6..fe642041d9 100644 --- a/ui/src/app/components/legend-config-panel.tpl.html +++ b/ui/src/app/components/legend-config-panel.tpl.html @@ -16,7 +16,7 @@ -->
-
+
diff --git a/ui/src/app/components/material-icons-dialog.tpl.html b/ui/src/app/components/material-icons-dialog.tpl.html index 8a2eb6537b..db1abdac50 100644 --- a/ui/src/app/components/material-icons-dialog.tpl.html +++ b/ui/src/app/components/material-icons-dialog.tpl.html @@ -32,15 +32,15 @@ - - + +
-
+
{{icon}} @@ -54,7 +54,7 @@ - + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/components/plugin-select.directive.js b/ui/src/app/components/plugin-select.directive.js index f20076f870..0e526572b9 100644 --- a/ui/src/app/components/plugin-select.directive.js +++ b/ui/src/app/components/plugin-select.directive.js @@ -56,7 +56,7 @@ function PluginSelect($compile, $templateCache, $q, pluginService, types) { var deferred = $q.defer(); - scope.pluginFetchFunction(pageLink).then(function success(result) { + scope.pluginFetchFunction(pageLink, {ignoreLoading: true}).then(function success(result) { deferred.resolve(result.data); }, function fail() { deferred.reject(); @@ -89,7 +89,7 @@ function PluginSelect($compile, $templateCache, $q, pluginService, types) { if (scope.selectFirstPlugin) { var pageLink = {limit: 1, textSearch: ''}; - scope.pluginFetchFunction(pageLink).then(function success(result) { + scope.pluginFetchFunction(pageLink, {ignoreLoading: true}).then(function success(result) { var plugins = result.data; if (plugins.length > 0) { scope.plugin = plugins[0]; diff --git a/ui/src/app/components/timewindow-panel.tpl.html b/ui/src/app/components/timewindow-panel.tpl.html index 27187dcea5..0c80538d82 100644 --- a/ui/src/app/components/timewindow-panel.tpl.html +++ b/ui/src/app/components/timewindow-panel.tpl.html @@ -16,7 +16,7 @@ --> -
+
@@ -81,10 +81,10 @@
- + {{ 'action.update' | translate }} - + {{ 'action.cancel' | translate }}
diff --git a/ui/src/app/components/widget/action/widget-action-dialog.tpl.html b/ui/src/app/components/widget/action/widget-action-dialog.tpl.html index ded4c969a6..91b4981b5f 100644 --- a/ui/src/app/components/widget/action/widget-action-dialog.tpl.html +++ b/ui/src/app/components/widget/action/widget-action-dialog.tpl.html @@ -26,12 +26,12 @@
- - + +
-
+
@@ -120,7 +120,7 @@
@@ -129,11 +129,11 @@ - {{ (vm.isAdd ? 'action.add' : 'action.save') | translate }} - + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/components/widget/widget-config.tpl.html b/ui/src/app/components/widget/widget-config.tpl.html index b0084d7665..c50aade9f4 100644 --- a/ui/src/app/components/widget/widget-config.tpl.html +++ b/ui/src/app/components/widget/widget-config.tpl.html @@ -104,7 +104,7 @@ generate-data-key="generateDataKey(chip,type)" fetch-entity-keys="fetchEntityKeys({entityAliasId: entityAliasId, query: query, type: type})" on-create-entity-alias="onCreateEntityAlias({event: event, alias: alias})"> - @@ -121,7 +121,7 @@
- {{ 'widget-config.add-datasource' | translate }} diff --git a/ui/src/app/components/widget/widget.controller.js b/ui/src/app/components/widget/widget.controller.js index 7d91aef114..a5faadaec5 100644 --- a/ui/src/app/components/widget/widget.controller.js +++ b/ui/src/app/components/widget/widget.controller.js @@ -444,7 +444,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele } } - function handleWidgetAction($event, descriptor, entityId, entityName) { + function handleWidgetAction($event, descriptor, entityId, entityName, additionalParams) { var type = descriptor.type; var targetEntityParamName = descriptor.stateEntityParamName; var targetEntityId; @@ -485,8 +485,11 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele var customFunction = descriptor.customFunction; if (angular.isDefined(customFunction) && customFunction.length > 0) { try { - var customActionFunction = new Function('$event', 'widgetContext', 'entityId', 'entityName', customFunction); - customActionFunction($event, widgetContext, entityId, entityName); + if (!additionalParams) { + additionalParams = {}; + } + var customActionFunction = new Function('$event', 'widgetContext', 'entityId', 'entityName', 'additionalParams', customFunction); + customActionFunction($event, widgetContext, entityId, entityName, additionalParams); } catch (e) { // } diff --git a/ui/src/app/components/widgets-bundle-select.directive.js b/ui/src/app/components/widgets-bundle-select.directive.js index b90d24033b..7e1ed7130c 100644 --- a/ui/src/app/components/widgets-bundle-select.directive.js +++ b/ui/src/app/components/widgets-bundle-select.directive.js @@ -48,7 +48,7 @@ function WidgetsBundleSelect($compile, $templateCache, widgetService, types) { } } - widgetsBundleFetchFunction().then( + widgetsBundleFetchFunction({ignoreLoading: true}).then( function success(widgetsBundles) { scope.widgetsBundles = widgetsBundles; if (scope.selectFirstBundle) { diff --git a/ui/src/app/customer/add-customer.tpl.html b/ui/src/app/customer/add-customer.tpl.html index c1da19d0fd..69c38321fb 100644 --- a/ui/src/app/customer/add-customer.tpl.html +++ b/ui/src/app/customer/add-customer.tpl.html @@ -27,8 +27,8 @@
- - + +
@@ -36,10 +36,10 @@ - + {{ 'action.add' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/customer/customer-fieldset.tpl.html b/ui/src/app/customer/customer-fieldset.tpl.html index 3facd0f7a8..e367c88ddf 100644 --- a/ui/src/app/customer/customer-fieldset.tpl.html +++ b/ui/src/app/customer/customer-fieldset.tpl.html @@ -32,7 +32,7 @@
-
+
diff --git a/ui/src/app/dashboard/add-dashboard.tpl.html b/ui/src/app/dashboard/add-dashboard.tpl.html index 4807522896..79735e0960 100644 --- a/ui/src/app/dashboard/add-dashboard.tpl.html +++ b/ui/src/app/dashboard/add-dashboard.tpl.html @@ -27,8 +27,8 @@ - - + +
@@ -36,10 +36,10 @@ - + {{ 'action.add' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} \ No newline at end of file diff --git a/ui/src/app/dashboard/add-dashboards-to-customer.tpl.html b/ui/src/app/dashboard/add-dashboards-to-customer.tpl.html index cfd6b6a56e..6ae2f8d5a4 100644 --- a/ui/src/app/dashboard/add-dashboards-to-customer.tpl.html +++ b/ui/src/app/dashboard/add-dashboards-to-customer.tpl.html @@ -26,8 +26,8 @@
- - + +
@@ -65,11 +65,11 @@ - {{ 'action.assign' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/dashboard/add-widget.controller.js b/ui/src/app/dashboard/add-widget.controller.js index c15492dbd9..bae486b732 100644 --- a/ui/src/app/dashboard/add-widget.controller.js +++ b/ui/src/app/dashboard/add-widget.controller.js @@ -110,7 +110,7 @@ export default function AddWidgetController($scope, widgetService, entityService function success(aliasInfo) { var entity = aliasInfo.currentEntity; if (entity) { - entityService.getEntityKeys(entity.entityType, entity.id, query, type).then( + entityService.getEntityKeys(entity.entityType, entity.id, query, type, {ignoreLoading: true}).then( function success(keys) { deferred.resolve(keys); }, diff --git a/ui/src/app/dashboard/add-widget.tpl.html b/ui/src/app/dashboard/add-widget.tpl.html index 4ca29f0b01..8d5e130d96 100644 --- a/ui/src/app/dashboard/add-widget.tpl.html +++ b/ui/src/app/dashboard/add-widget.tpl.html @@ -27,11 +27,11 @@
- - + +
-
+
- {{ 'action.add' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/dashboard/assign-to-customer.tpl.html b/ui/src/app/dashboard/assign-to-customer.tpl.html index b08e44aaa4..4d7ba85452 100644 --- a/ui/src/app/dashboard/assign-to-customer.tpl.html +++ b/ui/src/app/dashboard/assign-to-customer.tpl.html @@ -26,8 +26,8 @@
- - + +
@@ -65,10 +65,10 @@ - + {{ 'action.assign' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/dashboard/dashboard-fieldset.tpl.html b/ui/src/app/dashboard/dashboard-fieldset.tpl.html index 954d881588..a54f477d11 100644 --- a/ui/src/app/dashboard/dashboard-fieldset.tpl.html +++ b/ui/src/app/dashboard/dashboard-fieldset.tpl.html @@ -59,7 +59,7 @@
-
+
diff --git a/ui/src/app/dashboard/dashboard-settings.tpl.html b/ui/src/app/dashboard/dashboard-settings.tpl.html index 38e2af39f2..da2b2549a4 100644 --- a/ui/src/app/dashboard/dashboard-settings.tpl.html +++ b/ui/src/app/dashboard/dashboard-settings.tpl.html @@ -26,11 +26,11 @@ - - + +
-
+
@@ -194,10 +194,10 @@ - + {{ 'action.save' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/dashboard/dashboard.tpl.html b/ui/src/app/dashboard/dashboard.tpl.html index 87f284050b..fab46346da 100644 --- a/ui/src/app/dashboard/dashboard.tpl.html +++ b/ui/src/app/dashboard/dashboard.tpl.html @@ -110,7 +110,7 @@
-
- - @@ -290,7 +290,7 @@ - @@ -298,7 +298,7 @@ - @@ -308,7 +308,7 @@ - @@ -317,8 +317,8 @@ - diff --git a/ui/src/app/dashboard/edit-widget.directive.js b/ui/src/app/dashboard/edit-widget.directive.js index 9bf1548d4a..935781251d 100644 --- a/ui/src/app/dashboard/edit-widget.directive.js +++ b/ui/src/app/dashboard/edit-widget.directive.js @@ -75,7 +75,7 @@ export default function EditWidgetDirective($compile, $templateCache, types, wid function success(aliasInfo) { var entity = aliasInfo.currentEntity; if (entity) { - entityService.getEntityKeys(entity.entityType, entity.id, query, type).then( + entityService.getEntityKeys(entity.entityType, entity.id, query, type, {ignoreLoading: true}).then( function success(keys) { deferred.resolve(keys); }, diff --git a/ui/src/app/dashboard/edit-widget.tpl.html b/ui/src/app/dashboard/edit-widget.tpl.html index 1f724a8749..5b225e26c9 100644 --- a/ui/src/app/dashboard/edit-widget.tpl.html +++ b/ui/src/app/dashboard/edit-widget.tpl.html @@ -15,7 +15,7 @@ limitations under the License. --> -
+
-
diff --git a/ui/src/app/dashboard/layouts/manage-dashboard-layouts.tpl.html b/ui/src/app/dashboard/layouts/manage-dashboard-layouts.tpl.html index d4d95dbe54..335563d9e1 100644 --- a/ui/src/app/dashboard/layouts/manage-dashboard-layouts.tpl.html +++ b/ui/src/app/dashboard/layouts/manage-dashboard-layouts.tpl.html @@ -26,11 +26,11 @@ - - + +
-
+
{{ 'layout.main' | translate }} @@ -56,10 +56,10 @@ - + {{ 'action.save' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/dashboard/layouts/select-target-layout.tpl.html b/ui/src/app/dashboard/layouts/select-target-layout.tpl.html index f69f4872ed..a84f4f28f5 100644 --- a/ui/src/app/dashboard/layouts/select-target-layout.tpl.html +++ b/ui/src/app/dashboard/layouts/select-target-layout.tpl.html @@ -26,11 +26,11 @@
- - + +
-
+
diff --git a/ui/src/app/dashboard/states/dashboard-state-dialog.tpl.html b/ui/src/app/dashboard/states/dashboard-state-dialog.tpl.html index 4cf0a3d525..3f9fb4336d 100644 --- a/ui/src/app/dashboard/states/dashboard-state-dialog.tpl.html +++ b/ui/src/app/dashboard/states/dashboard-state-dialog.tpl.html @@ -26,12 +26,12 @@
- - + +
-
+
@@ -57,11 +57,11 @@ - {{ (vm.isAdd ? 'action.add' : 'action.save') | translate }} - + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/dashboard/states/manage-dashboard-states.tpl.html b/ui/src/app/dashboard/states/manage-dashboard-states.tpl.html index 9f86b9b1de..9f7365282b 100644 --- a/ui/src/app/dashboard/states/manage-dashboard-states.tpl.html +++ b/ui/src/app/dashboard/states/manage-dashboard-states.tpl.html @@ -26,11 +26,11 @@
- - + +
-
+
@@ -118,10 +118,10 @@ - + {{ 'action.save' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/dashboard/states/select-target-state.tpl.html b/ui/src/app/dashboard/states/select-target-state.tpl.html index c874a0770e..412b818185 100644 --- a/ui/src/app/dashboard/states/select-target-state.tpl.html +++ b/ui/src/app/dashboard/states/select-target-state.tpl.html @@ -26,11 +26,11 @@
- - + +
-
+
{{state.name}} @@ -41,10 +41,10 @@ - + {{ 'action.save' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/device/add-device.tpl.html b/ui/src/app/device/add-device.tpl.html index 4db792fdf9..3e26d707d4 100644 --- a/ui/src/app/device/add-device.tpl.html +++ b/ui/src/app/device/add-device.tpl.html @@ -27,8 +27,8 @@
- - + +
@@ -36,10 +36,10 @@ - + {{ 'action.add' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} \ No newline at end of file diff --git a/ui/src/app/device/add-devices-to-customer.tpl.html b/ui/src/app/device/add-devices-to-customer.tpl.html index 0795f95262..04b28fd6d6 100644 --- a/ui/src/app/device/add-devices-to-customer.tpl.html +++ b/ui/src/app/device/add-devices-to-customer.tpl.html @@ -26,8 +26,8 @@
- - + +
@@ -65,11 +65,11 @@ - {{ 'action.assign' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/device/assign-to-customer.tpl.html b/ui/src/app/device/assign-to-customer.tpl.html index b9736c621e..7bc2a12cec 100644 --- a/ui/src/app/device/assign-to-customer.tpl.html +++ b/ui/src/app/device/assign-to-customer.tpl.html @@ -26,8 +26,8 @@
- - + +
@@ -65,10 +65,10 @@ - + {{ 'action.assign' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/device/device-credentials.tpl.html b/ui/src/app/device/device-credentials.tpl.html index 705f983f7d..c050349a2b 100644 --- a/ui/src/app/device/device-credentials.tpl.html +++ b/ui/src/app/device/device-credentials.tpl.html @@ -26,14 +26,14 @@
- - + +
-
+
- {{credentialsType.name}} @@ -62,10 +62,10 @@ - + {{ 'action.save' | translate }} - {{ (vm.isReadOnly ? 'action.close' : 'action.cancel') | translate }} + {{ (vm.isReadOnly ? 'action.close' : 'action.cancel') | translate }} \ No newline at end of file diff --git a/ui/src/app/device/device-fieldset.tpl.html b/ui/src/app/device/device-fieldset.tpl.html index 767e47aad4..a4d15f33eb 100644 --- a/ui/src/app/device/device-fieldset.tpl.html +++ b/ui/src/app/device/device-fieldset.tpl.html @@ -58,7 +58,7 @@ ng-show="!isEdit && isPublic && (deviceScope === 'customer' || deviceScope === 'tenant')"> {{ 'device.device-public' | translate }}
-
+
@@ -67,14 +67,14 @@
- {{ 'device.is-gateway' | translate }} diff --git a/ui/src/app/entity/alias/entity-alias-dialog.tpl.html b/ui/src/app/entity/alias/entity-alias-dialog.tpl.html index b78a795e61..546f8bf1b1 100644 --- a/ui/src/app/entity/alias/entity-alias-dialog.tpl.html +++ b/ui/src/app/entity/alias/entity-alias-dialog.tpl.html @@ -26,11 +26,11 @@
- - + +
-
+
@@ -64,10 +64,10 @@ - + {{ (vm.isAdd ? 'action.add' : 'action.save') | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/entity/alias/entity-aliases.tpl.html b/ui/src/app/entity/alias/entity-aliases.tpl.html index 40010a2a97..227619b8b3 100644 --- a/ui/src/app/entity/alias/entity-aliases.tpl.html +++ b/ui/src/app/entity/alias/entity-aliases.tpl.html @@ -26,8 +26,8 @@
- - + +
@@ -40,7 +40,7 @@
-
+
{{$index + 1}}. @@ -63,7 +63,7 @@ aria-label="resolve-multiple-switcher">
- {{ 'alias.edit' | translate }} @@ -72,7 +72,7 @@ edit - {{ 'entity.remove-alias' | translate }} @@ -87,7 +87,7 @@ - @@ -96,10 +96,10 @@ alias.add - + {{ 'action.save' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} \ No newline at end of file diff --git a/ui/src/app/entity/attribute/add-attribute-dialog.tpl.html b/ui/src/app/entity/attribute/add-attribute-dialog.tpl.html index 18f99fcd89..6df9343f37 100644 --- a/ui/src/app/entity/attribute/add-attribute-dialog.tpl.html +++ b/ui/src/app/entity/attribute/add-attribute-dialog.tpl.html @@ -26,12 +26,12 @@ - - + +
-
+
@@ -42,7 +42,7 @@
- + {{type.name | translate}} @@ -83,11 +83,11 @@ - {{ 'action.add' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/entity/attribute/add-widget-to-dashboard-dialog.tpl.html b/ui/src/app/entity/attribute/add-widget-to-dashboard-dialog.tpl.html index d7fe8903f1..d74aa34476 100644 --- a/ui/src/app/entity/attribute/add-widget-to-dashboard-dialog.tpl.html +++ b/ui/src/app/entity/attribute/add-widget-to-dashboard-dialog.tpl.html @@ -26,18 +26,18 @@
- - + +
-
+
dashboard.select-existing @@ -69,11 +69,11 @@ style="margin-bottom: 0px; padding-right: 20px;"> {{ 'dashboard.open-dashboard' | translate }} - {{ 'action.add' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/entity/attribute/attribute-table.scss b/ui/src/app/entity/attribute/attribute-table.scss index cdf9ffdd0d..3f40cdf47e 100644 --- a/ui/src/app/entity/attribute/attribute-table.scss +++ b/ui/src/app/entity/attribute/attribute-table.scss @@ -47,7 +47,7 @@ md-toolbar.md-table-toolbar.alternate { .widgets-carousel { position: relative; margin: 0px; - + height: calc(100% - 100px); min-height: 150px !important; tb-dashboard { diff --git a/ui/src/app/entity/attribute/attribute-table.tpl.html b/ui/src/app/entity/attribute/attribute-table.tpl.html index 3b19e9d8d7..f7075fbca1 100644 --- a/ui/src/app/entity/attribute/attribute-table.tpl.html +++ b/ui/src/app/entity/attribute/attribute-table.tpl.html @@ -19,7 +19,7 @@
- + {{scope.name | translate}} diff --git a/ui/src/app/entity/entity-autocomplete.directive.js b/ui/src/app/entity/entity-autocomplete.directive.js index 461042676f..62f3d6d33e 100644 --- a/ui/src/app/entity/entity-autocomplete.directive.js +++ b/ui/src/app/entity/entity-autocomplete.directive.js @@ -38,7 +38,7 @@ export default function EntityAutocomplete($compile, $templateCache, $q, $filter if (scope.excludeEntityIds && scope.excludeEntityIds.length) { limit += scope.excludeEntityIds.length; } - entityService.getEntitiesByNameFilter(scope.entityType, searchText, limit, null, scope.entitySubtype).then(function success(result) { + entityService.getEntitiesByNameFilter(scope.entityType, searchText, limit, {ignoreLoading: true}, scope.entitySubtype).then(function success(result) { if (result) { if (scope.excludeEntityIds && scope.excludeEntityIds.length) { var entities = []; diff --git a/ui/src/app/entity/entity-list.directive.js b/ui/src/app/entity/entity-list.directive.js index 0863153046..f0bd7d9abd 100644 --- a/ui/src/app/entity/entity-list.directive.js +++ b/ui/src/app/entity/entity-list.directive.js @@ -38,7 +38,7 @@ export default function EntityListDirective($compile, $templateCache, $q, $mdUti scope.fetchEntities = function(searchText, limit) { var deferred = $q.defer(); - entityService.getEntitiesByNameFilter(scope.entityType, searchText, limit).then( + entityService.getEntitiesByNameFilter(scope.entityType, searchText, limit, {ignoreLoading: true}).then( function success(result) { if (result) { deferred.resolve(result); diff --git a/ui/src/app/entity/entity-subtype-autocomplete.directive.js b/ui/src/app/entity/entity-subtype-autocomplete.directive.js index 57f2e04b5e..511f27514c 100644 --- a/ui/src/app/entity/entity-subtype-autocomplete.directive.js +++ b/ui/src/app/entity/entity-subtype-autocomplete.directive.js @@ -93,9 +93,9 @@ export default function EntitySubtypeAutocomplete($compile, $templateCache, $q, if (!scope.entitySubtypes) { var entitySubtypesPromise; if (scope.entityType == types.entityType.asset) { - entitySubtypesPromise = assetService.getAssetTypes(); + entitySubtypesPromise = assetService.getAssetTypes({ignoreLoading: true}); } else if (scope.entityType == types.entityType.device) { - entitySubtypesPromise = deviceService.getDeviceTypes(); + entitySubtypesPromise = deviceService.getDeviceTypes({ignoreLoading: true}); } if (entitySubtypesPromise) { entitySubtypesPromise.then( diff --git a/ui/src/app/entity/entity-subtype-list.directive.js b/ui/src/app/entity/entity-subtype-list.directive.js index c7d63297e2..4468f649fd 100644 --- a/ui/src/app/entity/entity-subtype-list.directive.js +++ b/ui/src/app/entity/entity-subtype-list.directive.js @@ -95,9 +95,9 @@ export default function EntitySubtypeListDirective($compile, $templateCache, $q, if (!scope.entitySubtypes) { var entitySubtypesPromise; if (scope.entityType == types.entityType.asset) { - entitySubtypesPromise = assetService.getAssetTypes(); + entitySubtypesPromise = assetService.getAssetTypes({ignoreLoading: true}); } else if (scope.entityType == types.entityType.device) { - entitySubtypesPromise = deviceService.getDeviceTypes(); + entitySubtypesPromise = deviceService.getDeviceTypes({ignoreLoading: true}); } if (entitySubtypesPromise) { entitySubtypesPromise.then( diff --git a/ui/src/app/entity/entity-subtype-select.directive.js b/ui/src/app/entity/entity-subtype-select.directive.js index 36d9729422..72c42509e8 100644 --- a/ui/src/app/entity/entity-subtype-select.directive.js +++ b/ui/src/app/entity/entity-subtype-select.directive.js @@ -73,9 +73,9 @@ export default function EntitySubtypeSelect($compile, $templateCache, $translate scope.entitySubtypes = []; var entitySubtypesPromise; if (scope.entityType == types.entityType.asset) { - entitySubtypesPromise = assetService.getAssetTypes(); + entitySubtypesPromise = assetService.getAssetTypes({ignoreLoading: true}); } else if (scope.entityType == types.entityType.device) { - entitySubtypesPromise = deviceService.getDeviceTypes(); + entitySubtypesPromise = deviceService.getDeviceTypes({ignoreLoading: true}); } if (entitySubtypesPromise) { entitySubtypesPromise.then( diff --git a/ui/src/app/entity/relation/relation-dialog.tpl.html b/ui/src/app/entity/relation/relation-dialog.tpl.html index 8799287637..652b9d2260 100644 --- a/ui/src/app/entity/relation/relation-dialog.tpl.html +++ b/ui/src/app/entity/relation/relation-dialog.tpl.html @@ -26,16 +26,16 @@
- - + +
-
+
+ ng-disabled="$root.loading"> {{(vm.direction == vm.types.entitySearchDirection.from ? 'relation.to-entity' : 'relation.from-entity') | translate}} @@ -61,11 +61,11 @@ - {{ (vm.isAdd ? 'action.add' : 'action.save') | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/entity/relation/relation-filters.tpl.html b/ui/src/app/entity/relation/relation-filters.tpl.html index 679a4884a3..4f84fe13a0 100644 --- a/ui/src/app/entity/relation/relation-filters.tpl.html +++ b/ui/src/app/entity/relation/relation-filters.tpl.html @@ -37,7 +37,7 @@ allowed-entity-types="allowedEntityTypes" tb-required="false"> - {{ 'relation.remove-relation-filter' | translate }} @@ -54,7 +54,7 @@ class="tb-prompt" translate>relation.any-relation
- + {{ 'relation.add-relation-filter' | translate }} diff --git a/ui/src/app/entity/relation/relation-table.tpl.html b/ui/src/app/entity/relation/relation-table.tpl.html index 8599397bc5..1553d9366e 100644 --- a/ui/src/app/entity/relation/relation-table.tpl.html +++ b/ui/src/app/entity/relation/relation-table.tpl.html @@ -19,7 +19,7 @@
- + {{ ('relation.search-direction.' + direction) | translate}} diff --git a/ui/src/app/event/event-content-dialog.tpl.html b/ui/src/app/event/event-content-dialog.tpl.html index 7b4184c5f4..9678616ad9 100644 --- a/ui/src/app/event/event-content-dialog.tpl.html +++ b/ui/src/app/event/event-content-dialog.tpl.html @@ -35,7 +35,7 @@ - {{ 'action.close' | + {{ 'action.close' | translate }} diff --git a/ui/src/app/event/event-table.tpl.html b/ui/src/app/event/event-table.tpl.html index 82a921fedd..760b55bfff 100644 --- a/ui/src/app/event/event-table.tpl.html +++ b/ui/src/app/event/event-table.tpl.html @@ -19,7 +19,7 @@
- + {{type.name | translate}} @@ -30,8 +30,8 @@ - + - + - +
-
+
@@ -74,7 +74,7 @@ {{ (vm.isAdd ? 'action.add' : 'action.save') | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/import-export/import-dialog.tpl.html b/ui/src/app/import-export/import-dialog.tpl.html index c15fc23fab..8e0b32fee5 100644 --- a/ui/src/app/import-export/import-dialog.tpl.html +++ b/ui/src/app/import-export/import-dialog.tpl.html @@ -26,11 +26,11 @@
- - + +
-
+
@@ -63,10 +63,10 @@ - + {{ 'action.import' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/layout/home.tpl.html b/ui/src/app/layout/home.tpl.html index a35c370cb5..b9d2c0aac1 100644 --- a/ui/src/app/layout/home.tpl.html +++ b/ui/src/app/layout/home.tpl.html @@ -76,7 +76,7 @@
- +
diff --git a/ui/src/app/locale/locale.constant.js b/ui/src/app/locale/locale.constant.js index ab672de30d..7769b3dbda 100644 --- a/ui/src/app/locale/locale.constant.js +++ b/ui/src/app/locale/locale.constant.js @@ -1213,6 +1213,7 @@ export default angular.module('thingsboard.locale', []) "remove-widget-title": "Are you sure you want to remove the widget '{{widgetTitle}}'?", "remove-widget-text": "After the confirmation the widget and all related data will become unrecoverable.", "timeseries": "Time series", + "search-data": "Search data", "latest-values": "Latest values", "rpc": "Control widget", "alarm": "Alarm widget", diff --git a/ui/src/app/login/create-password.tpl.html b/ui/src/app/login/create-password.tpl.html index 16ed81c741..96dd8e647d 100644 --- a/ui/src/app/login/create-password.tpl.html +++ b/ui/src/app/login/create-password.tpl.html @@ -23,7 +23,7 @@ + md-mode="indeterminate" ng-disabled="!$root.loading" ng-show="$root.loading">
diff --git a/ui/src/app/login/login.tpl.html b/ui/src/app/login/login.tpl.html index afe2a1c8c4..05f9c8936f 100644 --- a/ui/src/app/login/login.tpl.html +++ b/ui/src/app/login/login.tpl.html @@ -23,7 +23,7 @@ + md-mode="indeterminate" ng-disabled="!$root.loading" ng-show="$root.loading">
diff --git a/ui/src/app/login/reset-password-request.tpl.html b/ui/src/app/login/reset-password-request.tpl.html index a4789279e6..51afe8818c 100644 --- a/ui/src/app/login/reset-password-request.tpl.html +++ b/ui/src/app/login/reset-password-request.tpl.html @@ -23,7 +23,7 @@ + md-mode="indeterminate" ng-disabled="!$root.loading" ng-show="$root.loading">
diff --git a/ui/src/app/login/reset-password.tpl.html b/ui/src/app/login/reset-password.tpl.html index 43b5803e91..52788dd90c 100644 --- a/ui/src/app/login/reset-password.tpl.html +++ b/ui/src/app/login/reset-password.tpl.html @@ -23,7 +23,7 @@ + md-mode="indeterminate" ng-disabled="!$root.loading" ng-show="$root.loading">
diff --git a/ui/src/app/plugin/add-plugin.tpl.html b/ui/src/app/plugin/add-plugin.tpl.html index 8d99408283..4060a62cf0 100644 --- a/ui/src/app/plugin/add-plugin.tpl.html +++ b/ui/src/app/plugin/add-plugin.tpl.html @@ -27,8 +27,8 @@
- - + +
@@ -36,11 +36,11 @@ - {{ 'action.add' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/plugin/plugin-fieldset.tpl.html b/ui/src/app/plugin/plugin-fieldset.tpl.html index b5f87429a0..987040cbda 100644 --- a/ui/src/app/plugin/plugin-fieldset.tpl.html +++ b/ui/src/app/plugin/plugin-fieldset.tpl.html @@ -39,7 +39,7 @@
-
+
@@ -61,7 +61,7 @@ - + {{component.name}} @@ -74,14 +74,14 @@ - plugin.configuration + plugin.configuration diff --git a/ui/src/app/profile/change-password.tpl.html b/ui/src/app/profile/change-password.tpl.html index 9057e8c0f4..dd1c57737e 100644 --- a/ui/src/app/profile/change-password.tpl.html +++ b/ui/src/app/profile/change-password.tpl.html @@ -26,8 +26,8 @@
- - + +
@@ -55,10 +55,10 @@ - + {{ 'profile.change-password' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/profile/profile.tpl.html b/ui/src/app/profile/profile.tpl.html index 39401f79e1..3849f9b28a 100644 --- a/ui/src/app/profile/profile.tpl.html +++ b/ui/src/app/profile/profile.tpl.html @@ -23,11 +23,11 @@ {{ vm.profileUser.email }} - - + +
-
+
@@ -48,11 +48,11 @@ - {{ 'profile.change-password' | translate }}
- {{ 'action.save' | translate }}
diff --git a/ui/src/app/rule/add-rule.tpl.html b/ui/src/app/rule/add-rule.tpl.html index f0d4ccad65..cfb1f621be 100644 --- a/ui/src/app/rule/add-rule.tpl.html +++ b/ui/src/app/rule/add-rule.tpl.html @@ -27,8 +27,8 @@
- - + +
@@ -36,11 +36,11 @@ - {{ 'action.add' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/rule/rule-fieldset.tpl.html b/ui/src/app/rule/rule-fieldset.tpl.html index 835b78344b..ca63203ad1 100644 --- a/ui/src/app/rule/rule-fieldset.tpl.html +++ b/ui/src/app/rule/rule-fieldset.tpl.html @@ -39,7 +39,7 @@
-
+
@@ -109,7 +109,7 @@
- {{ 'rule.add-filter' | translate }} @@ -149,7 +149,7 @@ rule.no-processor-configured
- {{ 'rule.create-processor' | translate }} @@ -162,7 +162,7 @@ -
+
@@ -203,7 +203,7 @@ rule.create-action-prompt
- {{ 'rule.create-action' | translate }} diff --git a/ui/src/app/tenant/add-tenant.tpl.html b/ui/src/app/tenant/add-tenant.tpl.html index d589e04e3d..d7ee48ea17 100644 --- a/ui/src/app/tenant/add-tenant.tpl.html +++ b/ui/src/app/tenant/add-tenant.tpl.html @@ -27,8 +27,8 @@
- - + +
@@ -36,11 +36,11 @@ - {{ 'action.add' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/tenant/tenant-fieldset.tpl.html b/ui/src/app/tenant/tenant-fieldset.tpl.html index 76b0c3f12e..41e371b206 100644 --- a/ui/src/app/tenant/tenant-fieldset.tpl.html +++ b/ui/src/app/tenant/tenant-fieldset.tpl.html @@ -29,7 +29,7 @@
-
+
diff --git a/ui/src/app/user/add-user.tpl.html b/ui/src/app/user/add-user.tpl.html index 4883394c7e..a34f994437 100644 --- a/ui/src/app/user/add-user.tpl.html +++ b/ui/src/app/user/add-user.tpl.html @@ -27,8 +27,8 @@
- - + +
@@ -45,10 +45,10 @@ - + {{ 'action.add' | translate }} - {{ 'action.cancel' | translate }} + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/user/user-fieldset.tpl.html b/ui/src/app/user/user-fieldset.tpl.html index d03b462249..b80481309e 100644 --- a/ui/src/app/user/user-fieldset.tpl.html +++ b/ui/src/app/user/user-fieldset.tpl.html @@ -26,7 +26,7 @@ -
+
- user.default-dashboard + user.default-dashboard
- {{ 'user.always-fullscreen' | translate }}
diff --git a/ui/src/app/widget/add-widgets-bundle.tpl.html b/ui/src/app/widget/add-widgets-bundle.tpl.html index 5544ddd562..fcd4582b05 100644 --- a/ui/src/app/widget/add-widgets-bundle.tpl.html +++ b/ui/src/app/widget/add-widgets-bundle.tpl.html @@ -27,8 +27,8 @@
- - + +
@@ -36,11 +36,11 @@ - {{ 'action.add' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/widget/lib/CanvasDigitalGauge.js b/ui/src/app/widget/lib/CanvasDigitalGauge.js index bd3ff986a8..200430c690 100644 --- a/ui/src/app/widget/lib/CanvasDigitalGauge.js +++ b/ui/src/app/widget/lib/CanvasDigitalGauge.js @@ -455,7 +455,7 @@ function barDimensions(context, options, x, y, w, h) { if (options.hideMinMax && options.label === '') { bd.labelY = bd.barBottom; bd.barLeft = bd.origBaseX + options.fontMinMaxSize/3 * bd.fontSizeFactor; - bd.barRight = bd.bd.origBaseX + w + /*bd.width*/ - options.fontMinMaxSize/3 * bd.fontSizeFactor; + bd.barRight = bd.origBaseX + w + /*bd.width*/ - options.fontMinMaxSize/3 * bd.fontSizeFactor; } else { context.font = canvasGauges.drawings.font(options, 'MinMax', bd.fontSizeFactor); var minTextWidth = context.measureText(options.minValue+'').width; diff --git a/ui/src/app/widget/lib/alarms-table-widget.js b/ui/src/app/widget/lib/alarms-table-widget.js index 9e96d4d049..00e499712e 100644 --- a/ui/src/app/widget/lib/alarms-table-widget.js +++ b/ui/src/app/widget/lib/alarms-table-widget.js @@ -124,7 +124,7 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia $scope.$on('alarms-table-data-updated', function(event, tableId) { if (vm.tableId == tableId) { if (vm.subscription) { - vm.allAlarms = vm.subscription.alarms; + vm.allAlarms = vm.subscription.alarms || []; updateAlarms(true); $scope.$digest(); } @@ -298,7 +298,7 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia entityId = vm.currentAlarm.originator; entityName = vm.currentAlarm.originatorName; } - vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName); + vm.ctx.actionsApi.handleWidgetAction($event, descriptors[0], entityId, entityName, { alarm: alarm }); } } @@ -312,7 +312,7 @@ function AlarmsTableWidgetController($element, $scope, $filter, $mdMedia, $mdDia entityId = alarm.originator; entityName = alarm.originatorName; } - vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName); + vm.ctx.actionsApi.handleWidgetAction($event, actionDescriptor, entityId, entityName, { alarm: alarm }); } function isCurrent(alarm) { diff --git a/ui/src/app/widget/lib/alarms-table-widget.tpl.html b/ui/src/app/widget/lib/alarms-table-widget.tpl.html index 860128d32f..34c7c1bfcb 100644 --- a/ui/src/app/widget/lib/alarms-table-widget.tpl.html +++ b/ui/src/app/widget/lib/alarms-table-widget.tpl.html @@ -77,7 +77,7 @@ + ng-click="vm.openAlarmDetails($event, alarm)" ng-disabled="$root.loading"> more_horiz {{ 'alarm.details' | translate }} @@ -90,7 +90,7 @@ width: vm.actionCellDescriptors.length*36+'px'}"> + ng-click="vm.onActionButtonClick($event, alarm, actionDescriptor)" ng-disabled="$root.loading"> {{actionDescriptor.icon}} {{ actionDescriptor.displayName }} diff --git a/ui/src/app/widget/lib/entities-table-widget.tpl.html b/ui/src/app/widget/lib/entities-table-widget.tpl.html index 2587da1779..7ef8c54de6 100644 --- a/ui/src/app/widget/lib/entities-table-widget.tpl.html +++ b/ui/src/app/widget/lib/entities-table-widget.tpl.html @@ -63,7 +63,7 @@ width: vm.actionCellDescriptors.length*36+'px'}"> + ng-click="vm.onActionButtonClick($event, entity, actionDescriptor)" ng-disabled="$root.loading"> {{actionDescriptor.icon}} {{ actionDescriptor.displayName }} diff --git a/ui/src/app/widget/lib/google-map.js b/ui/src/app/widget/lib/google-map.js index e2b4dc6015..af11ac36fd 100644 --- a/ui/src/app/widget/lib/google-map.js +++ b/ui/src/app/widget/lib/google-map.js @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - var gmGlobals = { loadingGmId: null, gmApiKeys: {} } export default class TbGoogleMap { - constructor($containerElement, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, gmApiKey, gmDefaultMapType) { + constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, gmApiKey, gmDefaultMapType) { var tbMap = this; + this.utils = utils; this.defaultZoomLevel = defaultZoomLevel; this.dontFitMapBounds = dontFitMapBounds; this.minZoomLevel = minZoomLevel; @@ -151,80 +151,97 @@ export default class TbGoogleMap { /* eslint-disable no-undef */ updateMarkerColor(marker, color) { - var pinColor = color.substr(1); - var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, - new google.maps.Size(21, 34), - new google.maps.Point(0,0), - new google.maps.Point(10, 34)); - marker.setIcon(pinImage); + this.createDefaultMarkerIcon(marker, color, (iconInfo) => { + marker.setIcon(iconInfo.icon); + }); } /* eslint-enable no-undef */ /* eslint-disable no-undef */ - updateMarkerImage(marker, settings, image, maxSize) { - var testImage = document.createElement('img'); // eslint-disable-line - testImage.style.visibility = 'hidden'; - testImage.onload = function() { - var width; - var height; - var aspect = testImage.width / testImage.height; - document.body.removeChild(testImage); //eslint-disable-line - if (aspect > 1) { - width = maxSize; - height = maxSize / aspect; - } else { - width = maxSize * aspect; - height = maxSize; - } - var pinImage = { - url: image, - scaledSize : new google.maps.Size(width, height) - } - marker.setIcon(pinImage); + updateMarkerIcon(marker, settings) { + this.createMarkerIcon(marker, settings, (iconInfo) => { + marker.setIcon(iconInfo.icon); if (settings.showLabel) { - marker.set('labelAnchor', new google.maps.Point(100, height + 20)); + marker.set('labelAnchor', new google.maps.Point(100, iconInfo.size[1] + 20)); } + }); + } + /* eslint-disable no-undef */ + + /* eslint-disable no-undef */ + createMarkerIcon(marker, settings, onMarkerIconReady) { + var currentImage = settings.currentImage; + var gMap = this; + if (currentImage && currentImage.url) { + this.utils.loadImageAspect(currentImage.url).then( + (aspect) => { + if (aspect) { + var width; + var height; + if (aspect > 1) { + width = currentImage.size; + height = currentImage.size / aspect; + } else { + width = currentImage.size * aspect; + height = currentImage.size; + } + var icon = { + url: currentImage.url, + scaledSize : new google.maps.Size(width, height) + }; + var iconInfo = { + size: [width, height], + icon: icon + }; + onMarkerIconReady(iconInfo); + } else { + gMap.createDefaultMarkerIcon(marker, settings.color, onMarkerIconReady); + } + } + ); + } else { + this.createDefaultMarkerIcon(marker, settings.color, onMarkerIconReady); } - document.body.appendChild(testImage); //eslint-disable-line - testImage.src = image; } /* eslint-enable no-undef */ /* eslint-disable no-undef */ - createMarker(location, settings, onClickListener, markerArgs) { - var height = 34; - var pinColor = settings.color.substr(1); - var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, - new google.maps.Size(21, 34), - new google.maps.Point(0,0), - new google.maps.Point(10, 34)); - var pinShadow = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_shadow", + createDefaultMarkerIcon(marker, color, onMarkerIconReady) { + var pinColor = color.substr(1); + var icon = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter_withshadow&chld=%E2%80%A2|" + pinColor, new google.maps.Size(40, 37), - new google.maps.Point(0, 0), - new google.maps.Point(12, 35)); + new google.maps.Point(0,0), + new google.maps.Point(10, 37)); + var iconInfo = { + size: [40, 37], + icon: icon + }; + onMarkerIconReady(iconInfo); + } + /* eslint-enable no-undef */ + + /* eslint-disable no-undef */ + createMarker(location, settings, onClickListener, markerArgs) { var marker; if (settings.showLabel) { marker = new MarkerWithLabel({ position: location, - map: this.map, - icon: pinImage, - shadow: pinShadow, labelContent: '
'+settings.labelText+'
', - labelClass: "tb-labels", - labelAnchor: new google.maps.Point(100, height + 20) + labelClass: "tb-labels" }); } else { marker = new google.maps.Marker({ position: location, - map: this.map, - icon: pinImage, - shadow: pinShadow }); } - - if (settings.useMarkerImage) { - this.updateMarkerImage(marker, settings, settings.markerImage, settings.markerImageSize || 34); - } + var gMap = this; + this.createMarkerIcon(marker, settings, (iconInfo) => { + marker.setIcon(iconInfo.icon); + if (settings.showLabel) { + marker.set('labelAnchor', new google.maps.Point(100, iconInfo.size[1] + 20)); + } + marker.setMap(gMap.map); + }); if (settings.displayTooltip) { this.createTooltip(marker, settings.tooltipPattern, settings.tooltipReplaceInfo, settings.autocloseTooltip, markerArgs); diff --git a/ui/src/app/widget/lib/image-map.js b/ui/src/app/widget/lib/image-map.js index e9d99765ce..c130539f6e 100644 --- a/ui/src/app/widget/lib/image-map.js +++ b/ui/src/app/widget/lib/image-map.js @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import 'leaflet/dist/leaflet.css'; import * as L from 'leaflet'; @@ -21,9 +20,10 @@ const maxZoom = 4; export default class TbImageMap { - constructor(ctx, $containerElement, initCallback, imageUrl, posFunction, imageEntityAlias, imageUrlAttribute) { + constructor(ctx, $containerElement, utils, initCallback, imageUrl, posFunction, imageEntityAlias, imageUrlAttribute) { this.ctx = ctx; + this.utils = utils; this.tooltips = []; this.$containerElement = $containerElement; @@ -117,18 +117,15 @@ export default class TbImageMap { } this.imageUrl = imageUrl; var imageMap = this; - var testImage = document.createElement('img'); // eslint-disable-line - testImage.style.visibility = 'hidden'; - testImage.onload = function() { - imageMap.aspect = testImage.width / testImage.height; - document.body.removeChild(testImage); //eslint-disable-line - imageMap.onresize(updateImage); - if (initCallback) { - setTimeout(initCallback, 0); //eslint-disable-line + this.utils.loadImageAspect(imageUrl).then( + (aspect) => { + imageMap.aspect = aspect; + imageMap.onresize(updateImage); + if (initCallback) { + setTimeout(initCallback, 0); //eslint-disable-line + } } - } - document.body.appendChild(testImage); //eslint-disable-line - testImage.src = imageUrl; + ); } onresize(updateImage) { @@ -229,83 +226,97 @@ export default class TbImageMap { } updateMarkerColor(marker, color) { - var pinColor = color.substr(1); - var icon = L.icon({ - iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, - iconSize: [21, 34], - iconAnchor: [10, 34], - popupAnchor: [0, -34], - shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', - shadowSize: [40, 37], - shadowAnchor: [12, 35] + this.createDefaultMarkerIcon(marker, color, (iconInfo) => { + marker.setIcon(iconInfo.icon); }); - marker.setIcon(icon); - } - - updateMarkerImage(marker, settings, image, maxSize) { - var testImage = document.createElement('img'); // eslint-disable-line - testImage.style.visibility = 'hidden'; - testImage.onload = function() { - var width; - var height; - var aspect = testImage.width / testImage.height; - document.body.removeChild(testImage); //eslint-disable-line - if (aspect > 1) { - width = maxSize; - height = maxSize / aspect; - } else { - width = maxSize * aspect; - height = maxSize; - } - var icon = L.icon({ - iconUrl: image, - iconSize: [width, height], - iconAnchor: [marker.offsetX * width, marker.offsetY * height], - popupAnchor: [0, -height] - }); - marker.setIcon(icon); + } + + updateMarkerIcon(marker, settings) { + this.createMarkerIcon(marker, settings, (iconInfo) => { + marker.setIcon(iconInfo.icon); if (settings.showLabel) { marker.unbindTooltip(); - marker.tooltipOffset = [0, -height * marker.offsetY + 10]; + marker.tooltipOffset = [0, -iconInfo.size[1] * marker.offsetY + 10]; marker.bindTooltip('
'+settings.labelText+'
', { className: 'tb-marker-label', permanent: true, direction: 'top', offset: marker.tooltipOffset }); } + }); + } + + createMarkerIcon(marker, settings, onMarkerIconReady) { + var currentImage = settings.currentImage; + var opMap = this; + if (currentImage && currentImage.url) { + this.utils.loadImageAspect(currentImage.url).then( + (aspect) => { + if (aspect) { + var width; + var height; + if (aspect > 1) { + width = currentImage.size; + height = currentImage.size / aspect; + } else { + width = currentImage.size * aspect; + height = currentImage.size; + } + var icon = L.icon({ + iconUrl: currentImage.url, + iconSize: [width, height], + iconAnchor: [marker.offsetX * width, marker.offsetY * height], + popupAnchor: [0, -height] + }); + var iconInfo = { + size: [width, height], + icon: icon + }; + onMarkerIconReady(iconInfo); + } else { + opMap.createDefaultMarkerIcon(marker, settings.color, onMarkerIconReady); + } + } + ); + } else { + this.createDefaultMarkerIcon(marker, settings.color, onMarkerIconReady); } - document.body.appendChild(testImage); //eslint-disable-line - testImage.src = image; } - createMarker(position, settings, onClickListener, markerArgs) { - var height = 34; - var pinColor = settings.color.substr(1); + createDefaultMarkerIcon(marker, color, onMarkerIconReady) { + var pinColor = color.substr(1); var icon = L.icon({ iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, iconSize: [21, 34], - iconAnchor: [21 * settings.markerOffsetX, 34 * settings.markerOffsetY], + iconAnchor: [21 * marker.offsetX, 34 * marker.offsetY], popupAnchor: [0, -34], shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', shadowSize: [40, 37], shadowAnchor: [12, 35] }); + var iconInfo = { + size: [21, 34], + icon: icon + }; + onMarkerIconReady(iconInfo); + } + createMarker(position, settings, onClickListener, markerArgs) { var pos = this.posFunction(position.x, position.y); var x = pos.x * this.width; var y = pos.y * this.height; var location = this.pointToLatLng(x, y); - var marker = L.marker(location, {icon: icon}).addTo(this.map); + var marker = L.marker(location, {});//.addTo(this.map); marker.position = position; marker.offsetX = settings.markerOffsetX; marker.offsetY = settings.markerOffsetY; - - if (settings.showLabel) { - marker.tooltipOffset = [0, -height * marker.offsetY + 10]; - marker.bindTooltip('
'+settings.labelText+'
', - { className: 'tb-marker-label', permanent: true, direction: 'top', offset: marker.tooltipOffset }); - } - - if (settings.useMarkerImage) { - this.updateMarkerImage(marker, settings, settings.markerImage, settings.markerImageSize || 34); - } + var opMap = this; + this.createMarkerIcon(marker, settings, (iconInfo) => { + marker.setIcon(iconInfo.icon); + if (settings.showLabel) { + marker.tooltipOffset = [0, -iconInfo.size[1] * marker.offsetY + 10]; + marker.bindTooltip('
'+settings.labelText+'
', + { className: 'tb-marker-label', permanent: true, direction: 'top', offset: marker.tooltipOffset }); + } + marker.addTo(opMap.map); + }); if (settings.displayTooltip) { this.createTooltip(marker, settings.tooltipPattern, settings.tooltipReplaceInfo, settings.autocloseTooltip, markerArgs); diff --git a/ui/src/app/widget/lib/map-widget.js b/ui/src/app/widget/lib/map-widget.js index f742514403..ef86381438 100644 --- a/ui/src/app/widget/lib/map-widget.js +++ b/ui/src/app/widget/lib/map-widget.js @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import tinycolor from 'tinycolor2'; import TbGoogleMap from './google-map'; @@ -75,7 +74,7 @@ export default class TbMapWidget { if (!$element) { $element = ctx.$container; } - + this.utils = ctx.$scope.$injector.get('utils'); this.drawRoutes = drawRoutes; this.markers = []; if (this.drawRoutes) { @@ -110,9 +109,9 @@ export default class TbMapWidget { }; if (mapProvider === 'google-map') { - this.map = new TbGoogleMap($element, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.gmApiKey, settings.gmDefaultMapType); + this.map = new TbGoogleMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.gmApiKey, settings.gmDefaultMapType); } else if (mapProvider === 'openstreet-map') { - this.map = new TbOpenStreetMap($element, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel); + this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel); } } @@ -274,9 +273,13 @@ export default class TbMapWidget { if (!this.locationsSettings[i].useMarkerImageFunction && angular.isDefined(configuredLocationsSettings[i].markerImage) && configuredLocationsSettings[i].markerImage.length > 0) { - this.locationsSettings[i].markerImage = configuredLocationsSettings[i].markerImage; this.locationsSettings[i].useMarkerImage = true; - this.locationsSettings[i].markerImageSize = configuredLocationsSettings[i].markerImageSize || 34; + var url = this.ctx.settings.markerImage; + var size = this.ctx.settings.markerImageSize || 34; + this.locationSettings.currentImage = { + url: url, + size: size + }; } if (this.drawRoutes) { @@ -380,17 +383,41 @@ export default class TbMapWidget { } } - function updateLocationMarkerImage(location, dataMap) { + function updateLocationMarkerIcon(location, dataMap) { var image = calculateLocationMarkerImage(location, dataMap); - if (image != null && (!location.settings.calculatedImage || !angular.equals(location.settings.calculatedImage, image))) { - tbMap.map.updateMarkerImage(location.marker, location.settings, image.url, image.size); - location.settings.calculatedImage = image; + if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) { + location.settings.currentImage = image; + tbMap.map.updateMarkerIcon(location.marker, location.settings); } } function updateLocationStyle(location, dataMap) { updateLocationColor(location, dataMap); - updateLocationMarkerImage(location, dataMap); + updateLocationMarkerIcon(location, dataMap); + } + + function createOrUpdateLocationMarker(location, markerLocation, dataMap) { + var changed = false; + if (!location.marker) { + var image = calculateLocationMarkerImage(location, dataMap); + if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) { + location.settings.currentImage = image; + } + location.marker = tbMap.map.createMarker(markerLocation, location.settings, + function() { + tbMap.callbacks.onLocationClick(location); + } + ); + tbMap.markers.push(location.marker); + changed = true; + } else { + var prevPosition = tbMap.map.getMarkerPosition(location.marker); + if (!prevPosition.equals(markerLocation)) { + tbMap.map.setMarkerPosition(location.marker, markerLocation); + changed = true; + } + } + return changed; } function updateLocation(location, data, dataMap) { @@ -413,15 +440,7 @@ export default class TbMapWidget { } if (latLngs.length > 0) { var markerLocation = latLngs[latLngs.length-1]; - if (!location.marker) { - location.marker = tbMap.map.createMarker(markerLocation, location.settings, - function() { - tbMap.callbacks.onLocationClick(location); - } - ); - } else { - tbMap.map.setMarkerPosition(location.marker, markerLocation); - } + createOrUpdateLocationMarker(location, markerLocation, dataMap); } if (!location.polyline) { location.polyline = tbMap.map.createPolyline(latLngs, location.settings); @@ -439,18 +458,8 @@ export default class TbMapWidget { lat = latData[latData.length-1][1]; lng = lngData[lngData.length-1][1]; latLng = tbMap.map.createLatLng(lat, lng); - if (!location.marker) { - location.marker = tbMap.map.createMarker(latLng, location.settings, function() { - tbMap.callbacks.onLocationClick(location); - }); - tbMap.markers.push(location.marker); + if (createOrUpdateLocationMarker(location, latLng, dataMap)) { locationChanged = true; - } else { - var prevPosition = tbMap.map.getMarkerPosition(location.marker); - if (!prevPosition.equals(latLng)) { - tbMap.map.setMarkerPosition(location.marker, latLng); - locationChanged = true; - } } } updateLocationStyle(location, dataMap); diff --git a/ui/src/app/widget/lib/map-widget2.js b/ui/src/app/widget/lib/map-widget2.js index 44abb2b2ac..6b589aa13a 100644 --- a/ui/src/app/widget/lib/map-widget2.js +++ b/ui/src/app/widget/lib/map-widget2.js @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import tinycolor from 'tinycolor2'; import TbGoogleMap from './google-map'; @@ -75,11 +74,11 @@ export default class TbMapWidgetV2 { }); if (mapProvider === 'google-map') { - this.map = new TbGoogleMap($element, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.gmApiKey, settings.gmDefaultMapType); + this.map = new TbGoogleMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.gmApiKey, settings.gmDefaultMapType); } else if (mapProvider === 'openstreet-map') { - this.map = new TbOpenStreetMap($element, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.mapProvider); + this.map = new TbOpenStreetMap($element, this.utils, initCallback, this.defaultZoomLevel, this.dontFitMapBounds, minZoomLevel, settings.mapProvider); } else if (mapProvider === 'image-map') { - this.map = new TbImageMap(this.ctx, $element, initCallback, + this.map = new TbImageMap(this.ctx, $element, this.utils, initCallback, settings.mapImageUrl, settings.posFunction, settings.imageEntityAlias, @@ -159,9 +158,13 @@ export default class TbMapWidgetV2 { if (!this.locationSettings.useMarkerImageFunction && angular.isDefined(this.ctx.settings.markerImage) && this.ctx.settings.markerImage.length > 0) { - this.locationSettings.markerImage = this.ctx.settings.markerImage; this.locationSettings.useMarkerImage = true; - this.locationSettings.markerImageSize = this.ctx.settings.markerImageSize || 34; + var url = this.ctx.settings.markerImage; + var size = this.ctx.settings.markerImageSize || 34; + this.locationSettings.currentImage = { + url: url, + size: size + }; } if (this.drawRoutes) { @@ -235,10 +238,10 @@ export default class TbMapWidgetV2 { } } - function updateLocationMarkerImage(location, image) { - if (image && (!location.settings.calculatedImage || !angular.equals(location.settings.calculatedImage, image))) { - tbMap.map.updateMarkerImage(location.marker, location.settings, image.url, image.size); - location.settings.calculatedImage = image; + function updateLocationMarkerIcon(location, image) { + if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) { + location.settings.currentImage = image; + tbMap.map.updateMarkerIcon(location.marker, location.settings); } } @@ -247,7 +250,31 @@ export default class TbMapWidgetV2 { var color = calculateLocationColor(location, dataMap); var image = calculateLocationMarkerImage(location, dataMap); updateLocationColor(location, color, image); - updateLocationMarkerImage(location, image); + updateLocationMarkerIcon(location, image); + } + + function createOrUpdateLocationMarker(location, markerLocation, dataMap) { + var changed = false; + if (!location.marker) { + var image = calculateLocationMarkerImage(location, dataMap); + if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) { + location.settings.currentImage = image; + } + location.marker = tbMap.map.createMarker(markerLocation, location.settings, + function (event) { + tbMap.callbacks.onLocationClick(location); + locationRowClick(event, location); + }, [location.dsIndex]); + tbMap.markers.push(location.marker); + changed = true; + } else { + var prevPosition = tbMap.map.getMarkerPosition(location.marker); + if (!prevPosition.equals(markerLocation)) { + tbMap.map.setMarkerPosition(location.marker, markerLocation); + changed = true; + } + } + return changed; } function locationRowClick($event, location) { @@ -284,16 +311,7 @@ export default class TbMapWidgetV2 { } if (latLngs.length > 0) { var markerLocation = latLngs[latLngs.length - 1]; - if (!location.marker) { - location.marker = tbMap.map.createMarker(markerLocation, location.settings, - function (event) { - tbMap.callbacks.onLocationClick(location); - locationRowClick(event, location); - }, [location.dsIndex] - ); - } else { - tbMap.map.setMarkerPosition(location.marker, markerLocation); - } + createOrUpdateLocationMarker(location, markerLocation, dataMap); } if (!location.polyline) { location.polyline = tbMap.map.createPolyline(latLngs, location.settings); @@ -312,20 +330,8 @@ export default class TbMapWidgetV2 { lng = lngData[lngData.length - 1][1]; if (angular.isDefined(lat) && lat != null && angular.isDefined(lng) && lng != null) { latLng = tbMap.map.createLatLng(lat, lng); - if (!location.marker) { - location.marker = tbMap.map.createMarker(latLng, location.settings, - function (event) { - tbMap.callbacks.onLocationClick(location); - locationRowClick(event, location); - }, [location.dsIndex]); - tbMap.markers.push(location.marker); + if (createOrUpdateLocationMarker(location, latLng, dataMap)) { locationChanged = true; - } else { - var prevPosition = tbMap.map.getMarkerPosition(location.marker); - if (!prevPosition.equals(latLng)) { - tbMap.map.setMarkerPosition(location.marker, latLng); - locationChanged = true; - } } } } diff --git a/ui/src/app/widget/lib/openstreet-map.js b/ui/src/app/widget/lib/openstreet-map.js index 1d1d3f7e5e..8aafe69a7a 100644 --- a/ui/src/app/widget/lib/openstreet-map.js +++ b/ui/src/app/widget/lib/openstreet-map.js @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import 'leaflet/dist/leaflet.css'; import * as L from 'leaflet'; import 'leaflet-providers'; export default class TbOpenStreetMap { - constructor($containerElement, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, mapProvider) { + constructor($containerElement, utils, initCallback, defaultZoomLevel, dontFitMapBounds, minZoomLevel, mapProvider) { + this.utils = utils; this.defaultZoomLevel = defaultZoomLevel; this.dontFitMapBounds = dontFitMapBounds; this.minZoomLevel = minZoomLevel; @@ -54,55 +54,62 @@ export default class TbOpenStreetMap { } updateMarkerColor(marker, color) { - var pinColor = color.substr(1); - var icon = L.icon({ - iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, - iconSize: [21, 34], - iconAnchor: [10, 34], - popupAnchor: [0, -34], - shadowUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_shadow', - shadowSize: [40, 37], - shadowAnchor: [12, 35] + this.createDefaultMarkerIcon(marker, color, (iconInfo) => { + marker.setIcon(iconInfo.icon); }); - marker.setIcon(icon); - } - - updateMarkerImage(marker, settings, image, maxSize) { - var testImage = document.createElement('img'); // eslint-disable-line - testImage.style.visibility = 'hidden'; - testImage.onload = function() { - var width; - var height; - var aspect = testImage.width / testImage.height; - document.body.removeChild(testImage); //eslint-disable-line - if (aspect > 1) { - width = maxSize; - height = maxSize / aspect; - } else { - width = maxSize * aspect; - height = maxSize; - } - var icon = L.icon({ - iconUrl: image, - iconSize: [width, height], - iconAnchor: [width/2, height], - popupAnchor: [0, -height] - }); - marker.setIcon(icon); + } + + updateMarkerIcon(marker, settings) { + this.createMarkerIcon(marker, settings, (iconInfo) => { + marker.setIcon(iconInfo.icon); if (settings.showLabel) { marker.unbindTooltip(); - marker.tooltipOffset = [0, -height + 10]; + marker.tooltipOffset = [0, -iconInfo.size[1] + 10]; marker.bindTooltip('
'+settings.labelText+'
', { className: 'tb-marker-label', permanent: true, direction: 'top', offset: marker.tooltipOffset }); } + }); + } + + createMarkerIcon(marker, settings, onMarkerIconReady) { + var currentImage = settings.currentImage; + var opMap = this; + if (currentImage && currentImage.url) { + this.utils.loadImageAspect(currentImage.url).then( + (aspect) => { + if (aspect) { + var width; + var height; + if (aspect > 1) { + width = currentImage.size; + height = currentImage.size / aspect; + } else { + width = currentImage.size * aspect; + height = currentImage.size; + } + var icon = L.icon({ + iconUrl: currentImage.url, + iconSize: [width, height], + iconAnchor: [width/2, height], + popupAnchor: [0, -height] + }); + var iconInfo = { + size: [width, height], + icon: icon + }; + onMarkerIconReady(iconInfo); + } else { + opMap.createDefaultMarkerIcon(marker, settings.color, onMarkerIconReady); + } + } + ); + } else { + this.createDefaultMarkerIcon(marker, settings.color, onMarkerIconReady); } - document.body.appendChild(testImage); //eslint-disable-line - testImage.src = image; } - createMarker(location, settings, onClickListener, markerArgs) { - var height = 34; - var pinColor = settings.color.substr(1); + createDefaultMarkerIcon(marker, color, onMarkerIconReady) { + var pinColor = color.substr(1); var icon = L.icon({ iconUrl: 'https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|' + pinColor, iconSize: [21, 34], @@ -112,18 +119,25 @@ export default class TbOpenStreetMap { shadowSize: [40, 37], shadowAnchor: [12, 35] }); + var iconInfo = { + size: [21, 34], + icon: icon + }; + onMarkerIconReady(iconInfo); + } - var marker = L.marker(location, {icon: icon}).addTo(this.map); - - if (settings.showLabel) { - marker.tooltipOffset = [0, -height + 10]; - marker.bindTooltip('
'+settings.labelText+'
', - { className: 'tb-marker-label', permanent: true, direction: 'top', offset: marker.tooltipOffset }); - } - - if (settings.useMarkerImage) { - this.updateMarkerImage(marker, settings, settings.markerImage, settings.markerImageSize || 34); - } + createMarker(location, settings, onClickListener, markerArgs) { + var marker = L.marker(location, {}); + var opMap = this; + this.createMarkerIcon(marker, settings, (iconInfo) => { + marker.setIcon(iconInfo.icon); + if (settings.showLabel) { + marker.tooltipOffset = [0, -iconInfo.size[1] + 10]; + marker.bindTooltip('
'+settings.labelText+'
', + { className: 'tb-marker-label', permanent: true, direction: 'top', offset: marker.tooltipOffset }); + } + marker.addTo(opMap.map); + }); if (settings.displayTooltip) { this.createTooltip(marker, settings.tooltipPattern, settings.tooltipReplaceInfo, settings.autocloseTooltip, markerArgs); diff --git a/ui/src/app/widget/lib/timeseries-table-widget.js b/ui/src/app/widget/lib/timeseries-table-widget.js index 0c23e027fe..28ac811f1b 100644 --- a/ui/src/app/widget/lib/timeseries-table-widget.js +++ b/ui/src/app/widget/lib/timeseries-table-widget.js @@ -47,9 +47,37 @@ function TimeseriesTableWidget() { /*@ngInject*/ function TimeseriesTableWidgetController($element, $scope, $filter) { var vm = this; + let dateFormatFilter = 'yyyy-MM-dd HH:mm:ss'; vm.sources = []; vm.sourceIndex = 0; + vm.defaultPageSize = 10; + vm.defaultSortOrder = '-0'; + vm.query = { + "search": null + }; + + vm.enterFilterMode = enterFilterMode; + vm.exitFilterMode = exitFilterMode; + + function enterFilterMode () { + vm.query.search = ''; + vm.ctx.hideTitlePanel = true; + } + + function exitFilterMode () { + vm.query.search = null; + vm.ctx.hideTitlePanel = false; + } + + vm.searchAction = { + name: 'action.search', + show: true, + onAction: function() { + vm.enterFilterMode(); + }, + icon: 'search' + }; $scope.$watch('vm.ctx', function() { if (vm.ctx) { @@ -62,6 +90,7 @@ function TimeseriesTableWidgetController($element, $scope, $filter) { }); function initialize() { + vm.ctx.widgetActions = [ vm.searchAction ]; vm.showTimestamp = vm.settings.showTimestamp !== false; var origColor = vm.widgetConfig.color || 'rgba(0, 0, 0, 0.87)'; var defaultColor = tinycolor(origColor); @@ -108,6 +137,8 @@ function TimeseriesTableWidgetController($element, $scope, $filter) { cssParser.createStyleElement(namespace, cssString); $element.addClass(namespace); + vm.displayPagination = angular.isDefined(vm.settings.displayPagination) ? vm.settings.displayPagination : true; + function hashCode(str) { var hash = 0; var i, char; @@ -163,7 +194,7 @@ function TimeseriesTableWidgetController($element, $scope, $filter) { vm.cellContent = function(source, index, row, value) { if (index === 0) { - return $filter('date')(value, 'yyyy-MM-dd HH:mm:ss'); + return $filter('date')(value, dateFormatFilter); } else { var strContent = ''; if (angular.isDefined(value)) { @@ -211,7 +242,7 @@ function TimeseriesTableWidgetController($element, $scope, $filter) { source.data = []; source.rawData = []; source.query = { - limit: 5, + limit: vm.settings.defaultPageSize || 10, page: 1, order: '-0' } @@ -287,7 +318,30 @@ function TimeseriesTableWidgetController($element, $scope, $filter) { } function reorder(source) { + let searchRegExp = new RegExp(vm.query.search); + source.data = $filter('orderBy')(source.data, source.query.order); + if (vm.query.search !== null) { + source.data = source.data.filter(function(item){ + for (let i = 0; i < item.length; i++) { + if (vm.showTimestamp) { + if (i === 0) { + if (searchRegExp.test($filter('date')(item[i], dateFormatFilter))) { + return true; + } + } else { + if (searchRegExp.test(item[i])) { + return true; + } + } + } else { + if (searchRegExp.test(item[i])) { + return true; + } + } + } + }); + } } function convertData(data) { diff --git a/ui/src/app/widget/lib/timeseries-table-widget.scss b/ui/src/app/widget/lib/timeseries-table-widget.scss index 99a06537e9..da3ee81644 100644 --- a/ui/src/app/widget/lib/timeseries-table-widget.scss +++ b/ui/src/app/widget/lib/timeseries-table-widget.scss @@ -26,4 +26,8 @@ tb-timeseries-table-widget { .md-table-pagination>* { height: 46px; } + + .tb-data-table md-toolbar { + z-index: 10; + } } diff --git a/ui/src/app/widget/lib/timeseries-table-widget.tpl.html b/ui/src/app/widget/lib/timeseries-table-widget.tpl.html index 2b6d72c10a..2e7286c163 100644 --- a/ui/src/app/widget/lib/timeseries-table-widget.tpl.html +++ b/ui/src/app/widget/lib/timeseries-table-widget.tpl.html @@ -15,29 +15,71 @@ limitations under the License. --> +
+
+ +
+ + search + + {{'entity.search' | translate}} + + + + + + + + close + + {{ 'action.close' | translate }} + + +
+ - - - - - - - - - - - - - - - -
Timestamp{{ h.dataKey.label }}
-
- - - - - \ No newline at end of file + + + + + + + + + + + + + + + + +
+ Timestamp + + {{ h.dataKey.label }} +
+ + + + + +
+
\ No newline at end of file diff --git a/ui/src/app/widget/save-widget-type-as.tpl.html b/ui/src/app/widget/save-widget-type-as.tpl.html index 6bdc54dbb0..87fb0cfab9 100644 --- a/ui/src/app/widget/save-widget-type-as.tpl.html +++ b/ui/src/app/widget/save-widget-type-as.tpl.html @@ -26,8 +26,8 @@
- - + +
@@ -49,10 +49,10 @@ - + {{ 'action.saveAs' | translate }} - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/widget/select-widget-type.tpl.html b/ui/src/app/widget/select-widget-type.tpl.html index b7ebcb15f6..ccae912035 100644 --- a/ui/src/app/widget/select-widget-type.tpl.html +++ b/ui/src/app/widget/select-widget-type.tpl.html @@ -26,11 +26,11 @@
- - + +
-
+
@@ -73,7 +73,7 @@ - {{ 'action.cancel' | + {{ 'action.cancel' | translate }} diff --git a/ui/src/app/widget/widget-editor.tpl.html b/ui/src/app/widget/widget-editor.tpl.html index 732cf8f333..9d10c05f41 100644 --- a/ui/src/app/widget/widget-editor.tpl.html +++ b/ui/src/app/widget/widget-editor.tpl.html @@ -129,7 +129,7 @@ - @@ -142,7 +142,7 @@
- diff --git a/ui/src/app/widget/widget-library.tpl.html b/ui/src/app/widget/widget-library.tpl.html index b2dd4a782d..ad4813164c 100644 --- a/ui/src/app/widget/widget-library.tpl.html +++ b/ui/src/app/widget/widget-library.tpl.html @@ -15,7 +15,7 @@ limitations under the License. --> -
@@ -42,10 +42,10 @@ on-init-failed="vm.dashboardInitFailed(e)">
- - @@ -55,7 +55,7 @@ - @@ -63,7 +63,7 @@ - diff --git a/ui/src/app/widget/widgets-bundle-fieldset.tpl.html b/ui/src/app/widget/widgets-bundle-fieldset.tpl.html index 15810d0b93..e4d8ea16cf 100644 --- a/ui/src/app/widget/widgets-bundle-fieldset.tpl.html +++ b/ui/src/app/widget/widgets-bundle-fieldset.tpl.html @@ -23,7 +23,7 @@ class="md-raised md-primary">{{ 'widgets-bundle.delete' | translate }} -
+