From bea4d7b86e5fa6ad2fc56f3ff67eaf2fd42698ee Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 29 Dec 2020 11:00:15 +0200 Subject: [PATCH 1/2] Add TIMESERIES_DELETED constant to rule node models --- ui-ngx/src/app/shared/models/rule-node.models.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/shared/models/rule-node.models.ts b/ui-ngx/src/app/shared/models/rule-node.models.ts index df989401d9..4ea358dc5f 100644 --- a/ui-ngx/src/app/shared/models/rule-node.models.ts +++ b/ui-ngx/src/app/shared/models/rule-node.models.ts @@ -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( @@ -369,7 +370,8 @@ export const messageTypeNames = new Map( [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'] ] ); From 674512ddccf1e9abab7a549d4f3bd110b9a8ab00 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 29 Dec 2020 11:09:21 +0200 Subject: [PATCH 2/2] Fix updateDashboardCustomers method - allow empty body --- .../org/thingsboard/server/controller/DashboardController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java index 02c5f2ff20..3346aff858 100644 --- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java +++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java @@ -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));