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

lsyer
2 parents eccd9d2a 674512dd
Showing 2 changed files with 5 additions and 3 deletions
application/src/main/java/org/thingsboard/server/controller/DashboardController.java
ui-ngx/src/app/shared/models/rule-node.models.ts
--- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
View file @2657d1a
+++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
View file @2657d1a
@@ -212,7 +212,7 @@ public class DashboardController extends BaseController {
     @RequestMapping(value = "/dashboard/{dashboardId}/customers", method = RequestMethod.POST)
     @ResponseBody
     public Dashboard updateDashboardCustomers(@PathVariable(DASHBOARD_ID) String strDashboardId,
-                                              @RequestBody String[] strCustomerIds) throws ThingsboardException {
+                                              @RequestBody(required = false) String[] strCustomerIds) throws ThingsboardException {
         checkParameter(DASHBOARD_ID, strDashboardId);
         try {
             DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
--- a/ui-ngx/src/app/shared/models/rule-node.models.ts
View file @2657d1a
+++ b/ui-ngx/src/app/shared/models/rule-node.models.ts
View file @2657d1a
@@ -349,7 +349,8 @@ export enum MessageType {
   ENTITY_UNASSIGNED = 'ENTITY_UNASSIGNED',
   ATTRIBUTES_UPDATED = 'ATTRIBUTES_UPDATED',
   ATTRIBUTES_DELETED = 'ATTRIBUTES_DELETED',
-  TIMESERIES_UPDATED = 'TIMESERIES_UPDATED'
+  TIMESERIES_UPDATED = 'TIMESERIES_UPDATED',
+  TIMESERIES_DELETED = 'TIMESERIES_DELETED'
 }
 export const messageTypeNames = new Map<MessageType, string>(
@@ -369,7 +370,8 @@ export const messageTypeNames = new Map<MessageType, string>(
     [MessageType.ENTITY_UNASSIGNED, 'Entity Unassigned'],
     [MessageType.ATTRIBUTES_UPDATED, 'Attributes Updated'],
     [MessageType.ATTRIBUTES_DELETED, 'Attributes Deleted'],
-    [MessageType.TIMESERIES_UPDATED, 'Timeseries Updated']
+    [MessageType.TIMESERIES_UPDATED, 'Timeseries Updated'],
+    [MessageType.TIMESERIES_DELETED, 'Timeseries Deleted']
   ]
 );