From 5387f545d60377540ec31aade2a6c35f8fe2a0eb Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Fri, 8 Sep 2023 16:47:44 +0300
Subject: [PATCH 1/9] edge downlink table - fixed error in case unknown entity
 type or action. added missing types/actions

---
 .../components/edge/edge-downlink-table-config.ts  | 10 ++++++++--
 ui-ngx/src/app/shared/models/edge.models.ts        | 14 ++++++++++++--
 .../src/assets/locale/locale.constant-en_US.json   |  5 +++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts b/ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts
index 5889ebcdf2..f970ad80f4 100644
--- a/ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/edge/edge-downlink-table-config.ts
@@ -107,9 +107,15 @@ export class EdgeDownlinkTableConfig extends EntityTableConfig<EdgeEvent, TimePa
     this.columns.push(
       new DateEntityTableColumn<EdgeEvent>('createdTime', 'event.event-time', this.datePipe, '120px'),
       new EntityTableColumn<EdgeEvent>('type', 'event.type', '25%',
-        entity => this.translate.instant(edgeEventTypeTranslations.get(entity.type)), entity => ({}), false),
+        entity => {
+          let key = edgeEventTypeTranslations.get(entity.type);
+          return key ? this.translate.instant(key) : entity.type;
+        }, entity => ({}), false),
       new EntityTableColumn<EdgeEvent>('action', 'edge.event-action', '25%',
-        entity => this.translate.instant(edgeEventActionTypeTranslations.get(entity.action)), entity => ({}), false),
+        entity => {
+          let key = edgeEventActionTypeTranslations.get(entity.action);
+          return key ? this.translate.instant(key) : entity.action;
+        }, entity => ({}), false),
       new EntityTableColumn<EdgeEvent>('entityId', 'edge.entity-id', '40%',
         (entity) => entity.entityId ? entity.entityId : '', () => ({}), false),
       new EntityTableColumn<EdgeEvent>('status', 'event.status', '10%',
diff --git a/ui-ngx/src/app/shared/models/edge.models.ts b/ui-ngx/src/app/shared/models/edge.models.ts
index 372a910402..1acfa2ca28 100644
--- a/ui-ngx/src/app/shared/models/edge.models.ts
+++ b/ui-ngx/src/app/shared/models/edge.models.ts
@@ -59,9 +59,12 @@ export enum EdgeEventType {
   CUSTOMER = 'CUSTOMER',
   RELATION = 'RELATION',
   TENANT = 'TENANT',
+  TENANT_PROFILE = 'TENANT_PROFILE',
   WIDGETS_BUNDLE = 'WIDGETS_BUNDLE',
   WIDGET_TYPE = 'WIDGET_TYPE',
-  ADMIN_SETTINGS = 'ADMIN_SETTINGS'
+  ADMIN_SETTINGS = 'ADMIN_SETTINGS',
+  OTA_PACKAGE = 'OTA_PACKAGE',
+  QUEUE = 'QUEUE'
 }
 
 export enum EdgeEventActionType {
@@ -80,6 +83,8 @@ export enum EdgeEventActionType {
   RPC_CALL = 'RPC_CALL',
   ALARM_ACK = 'ALARM_ACK',
   ALARM_CLEAR = 'ALARM_CLEAR',
+  ALARM_ASSIGNED = 'ALARM_ASSIGNED',
+  ALARM_UNASSIGNED = 'ALARM_UNASSIGNED',
   ASSIGNED_TO_EDGE = 'ASSIGNED_TO_EDGE',
   UNASSIGNED_FROM_EDGE = 'UNASSIGNED_FROM_EDGE',
   CREDENTIALS_REQUEST = 'CREDENTIALS_REQUEST',
@@ -107,9 +112,12 @@ export const edgeEventTypeTranslations = new Map<EdgeEventType, string>(
     [EdgeEventType.CUSTOMER, 'edge-event.type-customer'],
     [EdgeEventType.RELATION, 'edge-event.type-relation'],
     [EdgeEventType.TENANT, 'edge-event.type-tenant'],
+    [EdgeEventType.TENANT_PROFILE, 'edge-event.type-tenant-profile'],
     [EdgeEventType.WIDGETS_BUNDLE, 'edge-event.type-widgets-bundle'],
     [EdgeEventType.WIDGET_TYPE, 'edge-event.type-widgets-type'],
-    [EdgeEventType.ADMIN_SETTINGS, 'edge-event.type-admin-settings']
+    [EdgeEventType.ADMIN_SETTINGS, 'edge-event.type-admin-settings'],
+    [EdgeEventType.OTA_PACKAGE, 'edge-event.type-ota-package'],
+    [EdgeEventType.QUEUE, 'edge-event.type-queue']
   ]
 );
 
@@ -130,6 +138,8 @@ export const edgeEventActionTypeTranslations = new Map<EdgeEventActionType, stri
     [EdgeEventActionType.RPC_CALL, 'edge-event.action-type-rpc-call'],
     [EdgeEventActionType.ALARM_ACK, 'edge-event.action-type-alarm-ack'],
     [EdgeEventActionType.ALARM_CLEAR, 'edge-event.action-type-alarm-clear'],
+    [EdgeEventActionType.ALARM_ASSIGNED, 'edge-event.action-type-alarm-assigned'],
+    [EdgeEventActionType.ALARM_UNASSIGNED, 'edge-event.action-type-alarm-unassigned'],
     [EdgeEventActionType.ASSIGNED_TO_EDGE, 'edge-event.action-type-assigned-to-edge'],
     [EdgeEventActionType.UNASSIGNED_FROM_EDGE, 'edge-event.action-type-unassigned-from-edge'],
     [EdgeEventActionType.CREDENTIALS_REQUEST, 'edge-event.action-type-credentials-request'],
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index f2b2924de4..672ed9b1b2 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2014,11 +2014,14 @@
         "type-edge": "Edge",
         "type-user": "User",
         "type-tenant": "Tenant",
+        "type-tenant-profile": "Tenant Profile",
         "type-customer": "Customer",
         "type-relation": "Relation",
         "type-widgets-bundle": "Widgets Bundle",
         "type-widgets-type": "Widgets Type",
         "type-admin-settings": "Admin Settings",
+        "type-ota-package": "Ota Package",
+        "type-queue": "Queue",
         "action-type-added": "Added",
         "action-type-deleted": "Deleted",
         "action-type-updated": "Updated",
@@ -2034,6 +2037,8 @@
         "action-type-rpc-call": "RPC Call",
         "action-type-alarm-ack": "Alarm Ack",
         "action-type-alarm-clear": "Alarm Clear",
+        "action-type-alarm-assigned": "Alarm Assigned",
+        "action-type-alarm-unassigned": "Alarm Unassigned",
         "action-type-assigned-to-edge": "Assigned to Edge",
         "action-type-unassigned-from-edge": "Unassigned from Edge",
         "action-type-credentials-request": "Credentials Request",

From 0519fc8eaff0ed5a92b1aa0d880d2601634bc094 Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Fri, 8 Sep 2023 16:53:33 +0300
Subject: [PATCH 2/9] UI: changed validation hints of add telemetry dialog to
 more precise

---
 .../attribute/add-attribute-dialog.component.html           | 6 +++---
 .../components/attribute/add-attribute-dialog.component.ts  | 5 ++---
 ui-ngx/src/assets/locale/locale.constant-en_US.json         | 2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
index 17e31854cc..af2a959424 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
@@ -17,7 +17,7 @@
 -->
 <form [formGroup]="attributeFormGroup" (ngSubmit)="add()" style="min-width: 400px;">
   <mat-toolbar color="primary">
-    <h2>{{ title | translate }}</h2>
+    <h2>{{ (isTelemetry ? 'attribute.add-telemetry' : 'attribute.add') | translate }}</h2>
     <span fxFlex></span>
     <button mat-icon-button
             (click)="cancel()"
@@ -34,7 +34,7 @@
         <mat-label translate>attribute.key</mat-label>
         <input matInput formControlName="key" required>
         <mat-error *ngIf="attributeFormGroup.get('key').hasError('required')">
-          {{ 'attribute.key-required' | translate }}
+          {{ (isTelemetry ? 'attribute.telemetry-key-required' : 'attribute.key-required') | translate }}
         </mat-error>
         <mat-error *ngIf="attributeFormGroup.get('key').hasError('maxlength')">
           {{ 'attribute.key-max-length' | translate }}
@@ -42,7 +42,7 @@
       </mat-form-field>
       <tb-value-input
         formControlName="value"
-        requiredText="attribute.value-required">
+        [requiredText]="isTelemetry ? 'attribute.telemetry-value-required' : 'attribute.value-required'">
       </tb-value-input>
     </fieldset>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
index aadb96c142..5aa8a1cc88 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
@@ -45,7 +45,7 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
 
   submitted = false;
 
-  title = '';
+  isTelemetry = false;
 
   constructor(protected store: Store<AppState>,
               protected router: Router,
@@ -62,8 +62,7 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
       key: ['', [Validators.required, Validators.maxLength(255)]],
       value: [null, [Validators.required]]
     });
-    this.title = this.data.attributeScope === LatestTelemetry.LATEST_TELEMETRY ?
-      'attribute.add-telemetry' : 'attribute.add'
+    this.isTelemetry = this.data.attributeScope === LatestTelemetry.LATEST_TELEMETRY;
   }
 
   isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index f2b2924de4..e601c53c82 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -722,6 +722,8 @@
         "key-required": "Attribute key is required.",
         "value": "Value",
         "value-required": "Attribute value is required.",
+        "telemetry-key-required": "Telemetry key is required",
+        "telemetry-value-required": "Telemetry value is required",
         "delete-attributes-title": "Are you sure you want to delete { count, plural, =1 {1 attribute} other {# attributes} }?",
         "delete-attributes-text": "Be careful, after the confirmation all selected attributes will be removed.",
         "delete-attributes": "Delete attributes",

From 88a17e3cfa93dcba6dbc77c2457eee6e64ffcd98 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Mon, 11 Sep 2023 18:07:30 +0300
Subject: [PATCH 3/9] added validation on space key

---
 .../server/controller/TelemetryControllerTest.java  | 13 +++++++++++++
 .../org/thingsboard/server/dao/util/KvUtils.java    |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
index f7e5f6f6f3..7b7554c559 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TelemetryControllerTest.java
@@ -149,6 +149,19 @@ public class TelemetryControllerTest extends AbstractControllerTest {
         doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody, String.class, status().isBadRequest());
     }
 
+    @Test
+    public void testEmptyKeyIsProhibited() throws Exception {
+        loginTenantAdmin();
+        Device device = createDevice();
+        String invalidRequestBody = "{\"\": \"value\"}";
+        doPostAsync("/api/plugins/telemetry/" + device.getId() + "/SHARED_SCOPE", invalidRequestBody, String.class, status().isBadRequest());
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody, String.class, status().isBadRequest());
+
+        String invalidRequestBody2 = "{\" \": \"value\"}";
+        doPostAsync("/api/plugins/telemetry/" + device.getId() + "/SHARED_SCOPE", invalidRequestBody2, String.class, status().isBadRequest());
+        doPostAsync("/api/plugins/telemetry/DEVICE/" + device.getId() + "/timeseries/smth", invalidRequestBody2, String.class, status().isBadRequest());
+    }
+
     private Device createDevice() throws Exception {
         String testToken = "TEST_TOKEN";
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java b/dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java
index e417a5a50a..f94d76ba89 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java
@@ -48,8 +48,8 @@ public class KvUtils {
 
         String key = tsKvEntry.getKey();
 
-        if (key == null) {
-            throw new DataValidationException("Key can't be null");
+        if (key == null || key.isBlank()) {
+            throw new DataValidationException("Key can't be null or empty");
         }
 
         if (key.length() > 255) {

From 66f598b4d84b7f0322666ddd1bbde9021857bde9 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 12 Sep 2023 11:13:57 +0300
Subject: [PATCH 4/9] refactored KvUtils.validate method

---
 dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java b/dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java
index f94d76ba89..31bb00ebd9 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/KvUtils.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.util;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
+import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
@@ -48,7 +49,7 @@ public class KvUtils {
 
         String key = tsKvEntry.getKey();
 
-        if (key == null || key.isBlank()) {
+        if (StringUtils.isBlank(key)) {
             throw new DataValidationException("Key can't be null or empty");
         }
 

From 3f10ba464e96106f77688c641829e7874c146a29 Mon Sep 17 00:00:00 2001
From: Shvaika Dmytro <dshvaika@thingsboard.io>
Date: Tue, 12 Sep 2023 12:16:31 +0300
Subject: [PATCH 5/9] added executor to speed up rule nodes upgrade & added SQL
 upgrade for TbMsgAttributesNode & updated logback.xml with new debug entry to
 view the rule node upgrade logs (#9224)

* added executor to speed up rule nodes upgrade & added SQL upgrade for TbMsgAttributesNode & updated logback.xml with new debug entry to view the rule node upgrade logs

* refactoring after review

* create index before upsert

* added missing logic to await futures to be completed with max pending futures size set to 100

* added better logging

* refacotring after review
---
 .../install/SqlDatabaseUpgradeService.java    |  7 +++
 .../update/DefaultDataUpdateService.java      | 44 ++++++++++++++-----
 application/src/main/resources/logback.xml    |  2 +
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
index 4bb29426c9..9e942b481e 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
@@ -756,6 +756,13 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                             conn.createStatement().execute("CREATE INDEX IF NOT EXISTS idx_rule_node_type_configuration_version ON rule_node(type, configuration_version);");
                         } catch (Exception e) {
                         }
+                        try {
+                            conn.createStatement().execute("UPDATE rule_node SET " +
+                                    "configuration = (configuration::jsonb || '{\"updateAttributesOnlyOnValueChange\": \"false\"}'::jsonb)::varchar, " +
+                                    "configuration_version = 1 " +
+                                    "WHERE type = 'org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode' AND configuration_version < 1;");
+                        } catch (Exception e) {
+                        }
                         try {
                             conn.createStatement().execute("CREATE INDEX IF NOT EXISTS idx_notification_recipient_id_unread ON notification(recipient_id) WHERE status <> 'READ';");
                         } catch (Exception e) {
diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
index a1048d6a37..8c3b78040b 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@@ -78,6 +78,7 @@ import org.thingsboard.server.dao.model.sql.DeviceProfileEntity;
 import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.rule.RuleChainService;
+import org.thingsboard.server.dao.sql.JpaExecutorService;
 import org.thingsboard.server.dao.sql.device.DeviceProfileRepository;
 import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -101,6 +102,8 @@ import static org.thingsboard.server.common.data.StringUtils.isBlank;
 @Slf4j
 public class DefaultDataUpdateService implements DataUpdateService {
 
+    private static final int MAX_PENDING_SAVE_RULE_NODE_FUTURES = 100;
+
     @Autowired
     private TenantService tenantService;
 
@@ -153,6 +156,9 @@ public class DefaultDataUpdateService implements DataUpdateService {
     @Autowired
     private EdgeEventDao edgeEventDao;
 
+    @Autowired
+    JpaExecutorService jpaExecutorService;
+
     @Override
     public void updateData(String fromVersion) throws Exception {
         switch (fromVersion) {
@@ -225,13 +231,15 @@ public class DefaultDataUpdateService implements DataUpdateService {
     @Override
     public void upgradeRuleNodes() {
         try {
+            var futures = new ArrayList<ListenableFuture<?>>(100);
+            int totalRuleNodesUpgraded = 0;
             log.info("Starting rule nodes upgrade ...");
             var nodeClassToVersionMap = componentDiscoveryService.getVersionedNodes();
             log.debug("Found {} versioned nodes to check for upgrade!", nodeClassToVersionMap.size());
-            nodeClassToVersionMap.forEach(clazz -> {
-                var ruleNodeType = clazz.getClassName();
-                var ruleNodeTypeForLogs = clazz.getSimpleName();
-                var toVersion = clazz.getCurrentVersion();
+            for (var ruleNodeClassInfo : nodeClassToVersionMap) {
+                var ruleNodeType = ruleNodeClassInfo.getClassName();
+                var ruleNodeTypeForLogs = ruleNodeClassInfo.getSimpleName();
+                var toVersion = ruleNodeClassInfo.getCurrentVersion();
                 log.debug("Going to check for nodes with type: {} to upgrade to version: {}.", ruleNodeTypeForLogs, toVersion);
                 var ruleNodesToUpdate = new PageDataIterable<>(
                         pageLink -> ruleChainService.findAllRuleNodesByTypeAndVersionLessThan(ruleNodeType, toVersion, pageLink), 1024
@@ -246,28 +254,44 @@ public class DefaultDataUpdateService implements DataUpdateService {
                         log.debug("Going to upgrade rule node with id: {} type: {} fromVersion: {} toVersion: {}",
                                 ruleNodeId, ruleNodeTypeForLogs, fromVersion, toVersion);
                         try {
-                            var tbVersionedNode = (TbNode) clazz.getClazz().getDeclaredConstructor().newInstance();
+                            var tbVersionedNode = (TbNode) ruleNodeClassInfo.getClazz().getDeclaredConstructor().newInstance();
                             TbPair<Boolean, JsonNode> upgradeRuleNodeConfigurationResult = tbVersionedNode.upgrade(fromVersion, oldConfiguration);
                             if (upgradeRuleNodeConfigurationResult.getFirst()) {
                                 ruleNode.setConfiguration(upgradeRuleNodeConfigurationResult.getSecond());
                             }
                             ruleNode.setConfigurationVersion(toVersion);
-                            ruleChainService.saveRuleNode(TenantId.SYS_TENANT_ID, ruleNode);
-                            log.debug("Successfully upgrade rule node with id: {} type: {} fromVersion: {} toVersion: {}",
-                                    ruleNodeId, ruleNodeTypeForLogs, fromVersion, toVersion);
+                            futures.add(jpaExecutorService.submit(() -> {
+                                ruleChainService.saveRuleNode(TenantId.SYS_TENANT_ID, ruleNode);
+                                log.debug("Successfully upgrade rule node with id: {} type: {} fromVersion: {} toVersion: {}",
+                                        ruleNodeId, ruleNodeTypeForLogs, fromVersion, toVersion);
+                            }));
+                            if (futures.size() >= MAX_PENDING_SAVE_RULE_NODE_FUTURES) {
+                                log.info("{} upgraded rule nodes so far ...",
+                                        totalRuleNodesUpgraded += awaitFuturesToCompleteAndGetCount(futures));
+                                futures.clear();
+                            }
                         } catch (Exception e) {
                             log.warn("Failed to upgrade rule node with id: {} type: {} fromVersion: {} toVersion: {} due to: ",
                                     ruleNodeId, ruleNodeTypeForLogs, fromVersion, toVersion, e);
                         }
                     }
                 }
-            });
-            log.info("Finished rule nodes upgrade!");
+            }
+            log.info("Finished rule nodes upgrade. Upgraded rule nodes count: {}",
+                    totalRuleNodesUpgraded + awaitFuturesToCompleteAndGetCount(futures));
         } catch (Exception e) {
             log.error("Unexpected error during rule nodes upgrade: ", e);
         }
     }
 
+    private int awaitFuturesToCompleteAndGetCount(List<ListenableFuture<?>> futures) {
+        try {
+            return Futures.allAsList(futures).get().size();
+        } catch (ExecutionException | InterruptedException e) {
+            throw new RuntimeException("Failed to process save rule nodes requests due to: ", e);
+        }
+    }
+
     private final PaginatedUpdater<String, DeviceProfileEntity> deviceProfileEntityDynamicConditionsUpdater =
             new PaginatedUpdater<>() {
 
diff --git a/application/src/main/resources/logback.xml b/application/src/main/resources/logback.xml
index eaf6ace29e..b0a4174012 100644
--- a/application/src/main/resources/logback.xml
+++ b/application/src/main/resources/logback.xml
@@ -30,6 +30,8 @@
     <logger name="org.apache.kafka.clients" level="WARN"/>
     <!-- To enable the logging of scanned rule engine components-->
     <!--    <logger name="org.thingsboard.server.service.component.AnnotationComponentDiscoveryService" level="DEBUG" />-->
+    <!-- To enable the debug logging of rule node upgrade -->
+    <!--    <logger name="org.thingsboard.server.service.install.update.DefaultDataUpdateService" level="DEBUG"/>-->
     <!-- Other useful logs -->
     <!--    <logger name="org.springframework.jdbc.core" level="TRACE" />-->
     <!--    <logger name="org.hibernate.SQL" level="DEBUG" />-->

From e369218a1fe386b153530bf9af4744d88c58c0bc Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Tue, 12 Sep 2023 12:17:54 +0300
Subject: [PATCH 6/9] Fix rule node query performance

---
 .../server/dao/rule/RuleNodeDao.java          |   2 +-
 .../server/dao/sql/rule/JpaRuleNodeDao.java   |   4 +-
 .../dao/sql/rule/RuleNodeRepository.java      |  13 +-
 .../dao/sql/rule/JpaRuleNodeDaoTest.java      | 158 ++++++++++++++++++
 4 files changed, 169 insertions(+), 8 deletions(-)
 create mode 100644 dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDaoTest.java

diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleNodeDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleNodeDao.java
index 7df394ddd4..cd8fbb0a3c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleNodeDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleNodeDao.java
@@ -30,7 +30,7 @@ import java.util.List;
  */
 public interface RuleNodeDao extends Dao<RuleNode> {
 
-    List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type, String search);
+    List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type, String configurationSearch);
 
     PageData<RuleNode> findAllRuleNodesByType(String type, PageLink pageLink);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java
index 7adf8aa0c8..827b73a0c1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDao.java
@@ -56,8 +56,8 @@ public class JpaRuleNodeDao extends JpaAbstractDao<RuleNodeEntity, RuleNode> imp
     }
 
     @Override
-    public List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type, String search) {
-        return DaoUtil.convertDataList(ruleNodeRepository.findRuleNodesByTenantIdAndType(tenantId.getId(), type, search));
+    public List<RuleNode> findRuleNodesByTenantIdAndType(TenantId tenantId, String type, String configurationSearch) {
+        return DaoUtil.convertDataList(ruleNodeRepository.findRuleNodesByTenantIdAndType(tenantId.getId(), type, configurationSearch));
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleNodeRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleNodeRepository.java
index e016462255..c8ecb8000b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleNodeRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/RuleNodeRepository.java
@@ -29,19 +29,22 @@ import java.util.UUID;
 
 public interface RuleNodeRepository extends JpaRepository<RuleNodeEntity, UUID> {
 
-    @Query("SELECT r FROM RuleNodeEntity r WHERE r.ruleChainId in " +
-            "(select id from RuleChainEntity rc WHERE rc.tenantId = :tenantId) " +
-            "AND r.type = :ruleType AND LOWER(r.configuration) LIKE LOWER(CONCAT('%', :searchText, '%')) ")
+    @Query(nativeQuery = true, value = "SELECT * FROM rule_node r WHERE r.rule_chain_id in " +
+            "(select id from rule_chain rc WHERE rc.tenant_id = :tenantId) AND r.type = :ruleType " +
+            " AND (:searchText IS NULL OR r.configuration ILIKE CONCAT('%', :searchText, '%'))")
     List<RuleNodeEntity> findRuleNodesByTenantIdAndType(@Param("tenantId") UUID tenantId,
                                                         @Param("ruleType") String ruleType,
                                                         @Param("searchText") String searchText);
 
-    @Query("SELECT r FROM RuleNodeEntity r WHERE r.type = :ruleType AND LOWER(r.configuration) LIKE LOWER(CONCAT('%', :searchText, '%')) ")
+    @Query(nativeQuery = true, value = "SELECT * FROM rule_node r WHERE r.type = :ruleType " +
+            " AND (:searchText IS NULL OR r.configuration ILIKE CONCAT('%', :searchText, '%'))")
     Page<RuleNodeEntity> findAllRuleNodesByType(@Param("ruleType") String ruleType,
                                                 @Param("searchText") String searchText,
                                                 Pageable pageable);
 
-    @Query("SELECT r FROM RuleNodeEntity r WHERE r.type = :ruleType AND r.configurationVersion < :version AND LOWER(r.configuration) LIKE LOWER(CONCAT('%', :searchText, '%')) ")
+    @Query(nativeQuery = true, value = "SELECT * FROM rule_node r WHERE r.type = :ruleType " +
+            " AND configuration_version < :version " +
+            " AND (:searchText IS NULL OR r.configuration ILIKE CONCAT('%', :searchText, '%'))")
     Page<RuleNodeEntity> findAllRuleNodesByTypeAndVersionLessThan(@Param("ruleType") String ruleType,
                                                                   @Param("version") int version,
                                                                   @Param("searchText") String searchText,
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDaoTest.java
new file mode 100644
index 0000000000..6e77927233
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/rule/JpaRuleNodeDaoTest.java
@@ -0,0 +1,158 @@
+/**
+ * Copyright © 2016-2023 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.sql.rule;
+
+import com.datastax.oss.driver.api.core.uuid.Uuids;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.RuleNodeId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.data.rule.RuleNode;
+import org.thingsboard.server.dao.AbstractJpaDaoTest;
+import org.thingsboard.server.dao.rule.RuleChainDao;
+import org.thingsboard.server.dao.rule.RuleNodeDao;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class JpaRuleNodeDaoTest extends AbstractJpaDaoTest {
+
+    public static final int COUNT = 40;
+    public static final String PREFIX_FOR_RULE_NODE_NAME = "SEARCH_TEXT_";
+    List<UUID> ruleNodeIds;
+    TenantId tenantId1;
+    TenantId tenantId2;
+    RuleChainId ruleChainId1;
+    RuleChainId ruleChainId2;
+
+    @Autowired
+    private RuleChainDao ruleChainDao;
+
+    @Autowired
+    private RuleNodeDao ruleNodeDao;
+
+    ListeningExecutorService executor;
+
+    @Before
+    public void setUp() {
+        tenantId1 = TenantId.fromUUID(Uuids.timeBased());
+        ruleChainId1 = new RuleChainId(UUID.randomUUID());
+        tenantId2 = TenantId.fromUUID(Uuids.timeBased());
+        ruleChainId2 = new RuleChainId(UUID.randomUUID());
+
+        ruleNodeIds = createRuleNodes(tenantId1, tenantId2, ruleChainId1, ruleChainId2, COUNT);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        ruleNodeDao.removeAllByIds(ruleNodeIds);
+        if (executor != null) {
+            executor.shutdownNow();
+        }
+    }
+
+    @Test
+    public void testSaveRuleName0x00_thenSomeDatabaseException() {
+        RuleNode ruleNode = getRuleNode(ruleChainId1, "T", "\u0000");
+        assertThatThrownBy(() -> ruleNodeIds.add(ruleNodeDao.save(tenantId1, ruleNode).getUuidId()));
+    }
+
+    @Test
+    public void testFindRuleNodesByTenantIdAndType() {
+        List<RuleNode> ruleNodes1 = ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId1, "A", PREFIX_FOR_RULE_NODE_NAME);
+        assertEquals(20, ruleNodes1.size());
+
+        List<RuleNode> ruleNodes2 = ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId2, "B", PREFIX_FOR_RULE_NODE_NAME);
+        assertEquals(20, ruleNodes2.size());
+
+        ruleNodes1 = ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId1, "A", null);
+        assertEquals(20, ruleNodes1.size());
+
+        ruleNodes2 = ruleNodeDao.findRuleNodesByTenantIdAndType(tenantId2, "B", null);
+        assertEquals(20, ruleNodes2.size());
+    }
+
+    @Test
+    public void testFindRuleNodesByType() {
+        PageData<RuleNode> ruleNodes = ruleNodeDao.findAllRuleNodesByType( "A", new PageLink(10, 0, PREFIX_FOR_RULE_NODE_NAME));
+        assertEquals(20, ruleNodes.getTotalElements());
+        assertEquals(2, ruleNodes.getTotalPages());
+        assertEquals(10, ruleNodes.getData().size());
+
+        ruleNodes = ruleNodeDao.findAllRuleNodesByType( "A", new PageLink(10, 0));
+        assertEquals(20, ruleNodes.getTotalElements());
+        assertEquals(2, ruleNodes.getTotalPages());
+        assertEquals(10, ruleNodes.getData().size());
+    }
+
+    @Test
+    public void testFindRuleNodesByTypeAndVersionLessThan() {
+        PageData<RuleNode> ruleNodes = ruleNodeDao.findAllRuleNodesByTypeAndVersionLessThan( "A", 1, new PageLink(10, 0, PREFIX_FOR_RULE_NODE_NAME));
+        assertEquals(20, ruleNodes.getTotalElements());
+        assertEquals(2, ruleNodes.getTotalPages());
+        assertEquals(10, ruleNodes.getData().size());
+
+        ruleNodes = ruleNodeDao.findAllRuleNodesByTypeAndVersionLessThan( "A", 1, new PageLink(10, 0));
+        assertEquals(20, ruleNodes.getTotalElements());
+        assertEquals(2, ruleNodes.getTotalPages());
+        assertEquals(10, ruleNodes.getData().size());
+    }
+
+    private List<UUID> createRuleNodes(TenantId tenantId1, TenantId tenantId2, RuleChainId ruleChainId1, RuleChainId ruleChainId2, int count) {
+        var chain1 = new RuleChain(ruleChainId1);
+        chain1.setTenantId(tenantId1);
+        chain1.setName(ruleChainId1.toString());
+        ruleChainDao.save(tenantId1, chain1);
+        var chain2 = new RuleChain(ruleChainId2);
+        chain2.setTenantId(tenantId2);
+        chain2.setName(ruleChainId2.toString());
+        ruleChainDao.save(tenantId2, chain2);
+        List<UUID> savedRuleNodeIds = new ArrayList<>();
+        for (int i = 0; i < count / 2; i++) {
+            savedRuleNodeIds.add(ruleNodeDao.save(tenantId1, getRuleNode(ruleChainId1, "A", Integer.toString(i))).getUuidId());
+            savedRuleNodeIds.add(ruleNodeDao.save(tenantId2, getRuleNode(ruleChainId2, "B", Integer.toString(i + count / 2))).getUuidId());
+        }
+        return savedRuleNodeIds;
+    }
+
+    private RuleNode getRuleNode(RuleChainId ruleChainId, String type, String nameSuffix) {
+        return getRuleNode(ruleChainId, Uuids.timeBased(), type, nameSuffix);
+    }
+
+    private RuleNode getRuleNode(RuleChainId ruleChainId, UUID ruleNodeId, String type, String nameSuffix) {
+        RuleNode ruleNode = new RuleNode();
+        ruleNode.setId(new RuleNodeId(ruleNodeId));
+        ruleNode.setRuleChainId(ruleChainId);
+        ruleNode.setName(nameSuffix);
+        ruleNode.setType(type);
+        ruleNode.setConfiguration(JacksonUtil.newObjectNode().put("searchHint", PREFIX_FOR_RULE_NODE_NAME + nameSuffix));
+        ruleNode.setConfigurationVersion(0);
+        return ruleNode;
+    }
+}

From 4114c96571dbb35c1655cd77faa4bb4872c237c8 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Tue, 12 Sep 2023 12:32:35 +0300
Subject: [PATCH 7/9] Version control: fix ids replacement in dashboard config

---
 .../impl/BaseEntityExportService.java         |  4 +-
 .../impl/DashboardExportService.java          |  5 +-
 .../impl/BaseEntityImportService.java         |  6 +--
 .../impl/DashboardImportService.java          |  4 +-
 .../sync/ie/ExportImportServiceSqlTest.java   | 53 ++++++++++++++++---
 .../thingsboard/common/util/JacksonUtil.java  | 21 ++++----
 6 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/BaseEntityExportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/BaseEntityExportService.java
index abc90221be..3cf05ac503 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/BaseEntityExportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/BaseEntityExportService.java
@@ -48,8 +48,8 @@ public abstract class BaseEntityExportService<I extends EntityId, E extends Expo
 
     public abstract Set<EntityType> getSupportedEntityTypes();
 
-    protected void replaceUuidsRecursively(EntitiesExportCtx<?> ctx, JsonNode node, Set<String> skipFieldsSet, Pattern includedFieldsPattern) {
-        JacksonUtil.replaceUuidsRecursively(node, skipFieldsSet, includedFieldsPattern, uuid -> getExternalIdOrElseInternalByUuid(ctx, uuid));
+    protected void replaceUuidsRecursively(EntitiesExportCtx<?> ctx, JsonNode node, Set<String> skippedRootFields, Pattern includedFieldsPattern) {
+        JacksonUtil.replaceUuidsRecursively(node, skippedRootFields, includedFieldsPattern, uuid -> getExternalIdOrElseInternalByUuid(ctx, uuid), true);
     }
 
     protected Stream<UUID> toExternalIds(Collection<UUID> internalIds, Function<UUID, EntityId> entityIdCreator,
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DashboardExportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DashboardExportService.java
index 0df1e83c7f..d1278bc585 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DashboardExportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DashboardExportService.java
@@ -26,8 +26,11 @@ import org.thingsboard.server.common.data.sync.ie.EntityExportData;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.sync.vc.data.EntitiesExportCtx;
 
+import java.util.Collections;
 import java.util.Set;
 
+import static org.thingsboard.server.service.sync.ie.importing.impl.DashboardImportService.WIDGET_CONFIG_PROCESSED_FIELDS_PATTERN;
+
 @Service
 @TbCoreComponent
 public class DashboardExportService extends BaseEntityExportService<DashboardId, Dashboard, EntityExportData<Dashboard>> {
@@ -43,7 +46,7 @@ public class DashboardExportService extends BaseEntityExportService<DashboardId,
             replaceUuidsRecursively(ctx, entityAlias, Set.of("id"), null);
         }
         for (JsonNode widgetConfig : dashboard.getWidgetsConfig()) {
-            replaceUuidsRecursively(ctx, JacksonUtil.getSafely(widgetConfig, "config", "actions"), Set.of("id"), null);
+            replaceUuidsRecursively(ctx, JacksonUtil.getSafely(widgetConfig, "config", "actions"), Collections.emptySet(), WIDGET_CONFIG_PROCESSED_FIELDS_PATTERN);
         }
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
index 87438d39cb..ee82668334 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
@@ -388,11 +388,11 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
     }
 
     protected void replaceIdsRecursively(EntitiesImportCtx ctx, IdProvider idProvider, JsonNode json,
-                                         Set<String> skipFieldsSet, Pattern includedFieldsPattern,
+                                         Set<String> skippedRootFields, Pattern includedFieldsPattern,
                                          LinkedHashSet<EntityType> hints) {
-        JacksonUtil.replaceUuidsRecursively(json, skipFieldsSet, includedFieldsPattern,
+        JacksonUtil.replaceUuidsRecursively(json, skippedRootFields, includedFieldsPattern,
                 uuid -> idProvider.getInternalIdByUuid(uuid, ctx.isFinalImportAttempt(), hints)
-                        .map(EntityId::getId).orElse(uuid));
+                        .map(EntityId::getId).orElse(uuid), true);
     }
 
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DashboardImportService.java b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DashboardImportService.java
index eac229f774..658ecf744a 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DashboardImportService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/DashboardImportService.java
@@ -36,6 +36,7 @@ import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Service
@@ -44,6 +45,7 @@ import java.util.stream.Collectors;
 public class DashboardImportService extends BaseEntityImportService<DashboardId, Dashboard, EntityExportData<Dashboard>> {
 
     private static final LinkedHashSet<EntityType> HINTS = new LinkedHashSet<>(Arrays.asList(EntityType.DASHBOARD, EntityType.DEVICE, EntityType.ASSET));
+    public static final Pattern WIDGET_CONFIG_PROCESSED_FIELDS_PATTERN = Pattern.compile(".*Id.*");
 
     private final DashboardService dashboardService;
 
@@ -68,7 +70,7 @@ public class DashboardImportService extends BaseEntityImportService<DashboardId,
             replaceIdsRecursively(ctx, idProvider, entityAlias, Set.of("id"), null, HINTS);
         }
         for (JsonNode widgetConfig : dashboard.getWidgetsConfig()) {
-            replaceIdsRecursively(ctx, idProvider, JacksonUtil.getSafely(widgetConfig, "config", "actions"), Set.of("id"), null, HINTS);
+            replaceIdsRecursively(ctx, idProvider, JacksonUtil.getSafely(widgetConfig, "config", "actions"), Collections.emptySet(), WIDGET_CONFIG_PROCESSED_FIELDS_PATTERN, HINTS);
         }
         return dashboard;
     }
diff --git a/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java b/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
index 3361d516f0..dc95ab793b 100644
--- a/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
@@ -257,6 +257,7 @@ public class ExportImportServiceSqlTest extends BaseExportImportServiceTest {
         Asset asset1 = createAsset(tenantId1, null, assetProfile.getId(), "Asset 1");
         Asset asset2 = createAsset(tenantId1, null, assetProfile.getId(), "Asset 2");
         Dashboard dashboard = createDashboard(tenantId1, null, "Dashboard 1");
+        Dashboard otherDashboard = createDashboard(tenantId1, null, "Dashboard 2");
         DeviceProfile existingDeviceProfile = createDeviceProfile(tenantId2, null, null, "Existing");
 
         String aliasId = "23c4185d-1497-9457-30b2-6d91e69a5b2c";
@@ -265,20 +266,43 @@ public class ExportImportServiceSqlTest extends BaseExportImportServiceTest {
                 "\"" + aliasId + "\": {\n" +
                 "\"alias\": \"assets\",\n" +
                 "\"filter\": {\n" +
-                "\"entityList\": [\n" +
-                "\"" + asset1.getId().toString() + "\",\n" +
-                "\"" + asset2.getId().toString() + "\",\n" +
-                "\"" + tenantId1.getId().toString() + "\",\n" +
-                "\"" + existingDeviceProfile.getId().toString() + "\",\n" +
-                "\"" + unknownUuid + "\"\n" +
-                "],\n" +
-                "\"resolveMultiple\": true\n" +
+                "   \"entityList\": [\n" +
+                "   \"" + asset1.getId() + "\",\n" +
+                "   \"" + asset2.getId() + "\",\n" +
+                "   \"" + tenantId1.getId() + "\",\n" +
+                "   \"" + existingDeviceProfile.getId() + "\",\n" +
+                "   \"" + unknownUuid + "\"\n" +
+                "   ],\n" +
+                "   \"id\":\"" + asset1.getId() + "\",\n" +
+                "   \"resolveMultiple\": true\n" +
                 "},\n" +
                 "\"id\": \"" + aliasId + "\"\n" +
                 "}\n" +
                 "}";
+        String widgetId = "ea8f34a0-264a-f11f-cde3-05201bb4ff4b";
+        String actionId = "4a8e6efa-3e68-fa59-7feb-d83366130cae";
+        String widgets = "{\n" +
+                "  \"" + widgetId + "\": {\n" +
+                "    \"config\": {\n" +
+                "      \"actions\": {\n" +
+                "        \"rowClick\": [\n" +
+                "          {\n" +
+                "            \"name\": \"go to dashboard\",\n" +
+                "            \"targetDashboardId\": \"" + otherDashboard.getId() + "\",\n" +
+                "            \"id\": \"" + actionId + "\"\n" +
+                "          }\n" +
+                "        ]\n" +
+                "      }\n" +
+                "    },\n" +
+                "    \"row\": 0,\n" +
+                "    \"col\": 0,\n" +
+                "    \"id\": \"" + widgetId + "\"\n" +
+                "  }\n" +
+                "}";
+
         ObjectNode dashboardConfiguration = JacksonUtil.newObjectNode();
         dashboardConfiguration.set("entityAliases", JacksonUtil.toJsonNode(entityAliases));
+        dashboardConfiguration.set("widgets", JacksonUtil.toJsonNode(widgets));
         dashboardConfiguration.set("description", new TextNode("hallo"));
         dashboard.setConfiguration(dashboardConfiguration);
         dashboard = dashboardService.saveDashboard(dashboard);
@@ -288,10 +312,12 @@ public class ExportImportServiceSqlTest extends BaseExportImportServiceTest {
         EntityExportData<Asset> asset1ExportData = exportEntity(tenantAdmin1, asset1.getId());
         EntityExportData<Asset> asset2ExportData = exportEntity(tenantAdmin1, asset2.getId());
         EntityExportData<Dashboard> dashboardExportData = exportEntity(tenantAdmin1, dashboard.getId());
+        EntityExportData<Dashboard> otherDashboardExportData = exportEntity(tenantAdmin1, otherDashboard.getId());
 
         AssetProfile importedProfile = importEntity(tenantAdmin2, profileExportData).getSavedEntity();
         Asset importedAsset1 = importEntity(tenantAdmin2, asset1ExportData).getSavedEntity();
         Asset importedAsset2 = importEntity(tenantAdmin2, asset2ExportData).getSavedEntity();
+        Dashboard importedOtherDashboard = importEntity(tenantAdmin2, otherDashboardExportData).getSavedEntity();
         Dashboard importedDashboard = importEntity(tenantAdmin2, dashboardExportData).getSavedEntity();
 
         Map.Entry<String, JsonNode> entityAlias = importedDashboard.getConfiguration().get("entityAliases").fields().next();
@@ -311,6 +337,17 @@ public class ExportImportServiceSqlTest extends BaseExportImportServiceTest {
                 .isEqualTo(existingDeviceProfile.getId().toString());
         assertThat(aliasEntitiesIds).element(4).as("unresolved uuid was replaced with tenant id")
                 .isEqualTo(tenantId2.toString());
+        assertThat(entityAlias.getValue().get("filter").get("id").asText()).as("external asset 1 was replaced with imported one")
+                .isEqualTo(importedAsset1.getId().toString());
+
+        ObjectNode widgetConfig = importedDashboard.getWidgetsConfig().get(0);
+        assertThat(widgetConfig.get("id").asText()).as("widget id is not replaced")
+                .isEqualTo(widgetId);
+        JsonNode actionConfig = widgetConfig.get("config").get("actions").get("rowClick").get(0);
+        assertThat(actionConfig.get("id").asText()).as("action id is not replaced")
+                .isEqualTo(actionId);
+        assertThat(actionConfig.get("targetDashboardId").asText()).as("dashboard id is replaced with imported one")
+                .isEqualTo(importedOtherDashboard.getId().toString());
     }
 
 
diff --git a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
index 9f980f36c8..7c8d174af2 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
@@ -28,6 +28,7 @@ import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.google.common.collect.Lists;
 import org.thingsboard.server.common.data.kv.DataType;
 import org.thingsboard.server.common.data.kv.KvEntry;
 
@@ -35,7 +36,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -228,27 +228,24 @@ public class JacksonUtil {
         return node;
     }
 
-    public static void replaceUuidsRecursively(JsonNode node, Set<String> skipFieldsSet, Pattern includedFieldsPattern, UnaryOperator<UUID> replacer) {
+    public static void replaceUuidsRecursively(JsonNode node, Set<String> skippedRootFields, Pattern includedFieldsPattern, UnaryOperator<UUID> replacer, boolean root) {
         if (node == null) {
             return;
         }
         if (node.isObject()) {
             ObjectNode objectNode = (ObjectNode) node;
-            List<String> fieldNames = new ArrayList<>(objectNode.size());
-            objectNode.fieldNames().forEachRemaining(fieldNames::add);
+            List<String> fieldNames = Lists.newArrayList(objectNode.fieldNames());
             for (String fieldName : fieldNames) {
-                if (skipFieldsSet.contains(fieldName)) {
+                if (root && skippedRootFields.contains(fieldName)) {
                     continue;
                 }
-                if (includedFieldsPattern != null) {
-                    if (!RegexUtils.matches(fieldName, includedFieldsPattern)) {
-                        continue;
-                    }
-                }
                 var child = objectNode.get(fieldName);
                 if (child.isObject() || child.isArray()) {
-                    replaceUuidsRecursively(child, skipFieldsSet, includedFieldsPattern, replacer);
+                    replaceUuidsRecursively(child, skippedRootFields, includedFieldsPattern, replacer, false);
                 } else if (child.isTextual()) {
+                    if (includedFieldsPattern != null && !RegexUtils.matches(fieldName, includedFieldsPattern)) {
+                        continue;
+                    }
                     String text = child.asText();
                     String newText = RegexUtils.replace(text, RegexUtils.UUID_PATTERN, uuid -> replacer.apply(UUID.fromString(uuid)).toString());
                     if (!text.equals(newText)) {
@@ -261,7 +258,7 @@ public class JacksonUtil {
             for (int i = 0; i < array.size(); i++) {
                 JsonNode arrayElement = array.get(i);
                 if (arrayElement.isObject() || arrayElement.isArray()) {
-                    replaceUuidsRecursively(arrayElement, skipFieldsSet, includedFieldsPattern, replacer);
+                    replaceUuidsRecursively(arrayElement, skippedRootFields, includedFieldsPattern, replacer, false);
                 } else if (arrayElement.isTextual()) {
                     String text = arrayElement.asText();
                     String newText = RegexUtils.replace(text, RegexUtils.UUID_PATTERN, uuid -> replacer.apply(UUID.fromString(uuid)).toString());

From ece3540f969c4e0aafc67ed461be04380c781c1f Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 12 Sep 2023 13:03:00 +0300
Subject: [PATCH 8/9] UI: Allow empty array in json object edit form.

---
 .../add-attribute-dialog.component.html       |  2 +-
 .../add-attribute-dialog.component.ts         |  5 +++
 .../edit-attribute-value-panel.component.html |  2 +-
 .../edit-attribute-value-panel.component.ts   |  5 +++
 .../gateway/gateway-connectors.component.html |  2 +-
 .../lib/gateway/gateway-form.component.ts     |  1 +
 .../gateway/gateway-service-rpc.component.ts  |  6 ++-
 .../lib/json-input-widget.component.html      |  6 +--
 .../lib/json-input-widget.component.scss      |  4 ++
 .../widget/lib/json-input-widget.component.ts |  7 +--
 .../lib/multiple-input-widget.component.html  |  4 +-
 .../lib/multiple-input-widget.component.ts    | 16 ++++++-
 .../widget/widget-config.component.html       |  1 -
 .../rulechain/rule-node-config.component.html |  2 +-
 .../json-object-edit-dialog.component.html    |  3 +-
 .../json-object-edit-dialog.component.ts      |  3 ++
 .../directives/tb-json-to-string.directive.ts | 37 ++++++++++------
 .../json-object-edit.component.html           |  2 +-
 .../components/json-object-edit.component.ts  | 44 ++++++++-----------
 .../components/value-input.component.html     |  2 +-
 .../components/value-input.component.ts       |  9 ++--
 21 files changed, 101 insertions(+), 62 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
index 17e31854cc..56a6ca46c0 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
@@ -55,7 +55,7 @@
     </button>
     <button mat-raised-button color="primary"
             type="submit"
-            [disabled]="(isLoading$ | async) || attributeFormGroup.invalid || !attributeFormGroup.dirty">
+            [disabled]="(isLoading$ | async) || invalid() || !attributeFormGroup.dirty">
       {{ 'action.add' | translate }}
     </button>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
index aadb96c142..dc13dac0df 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
@@ -72,6 +72,11 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
     return originalErrorState || customErrorState;
   }
 
+  invalid(): boolean {
+    const value = this.attributeFormGroup.get('value').value;
+    return !Array.isArray(value) && this.attributeFormGroup.invalid;
+  }
+
   cancel(): void {
     this.dialogRef.close(false);
   }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.html b/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.html
index 9cefd62825..2ec3455adf 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.html
@@ -33,7 +33,7 @@
     </button>
     <button mat-button mat-raised-button color="primary"
             type="submit"
-            [disabled]="(isLoading$ | async) || attributeFormGroup.invalid || !attributeFormGroup.dirty">
+            [disabled]="(isLoading$ | async) || invalid() || !attributeFormGroup.dirty">
       {{ 'action.update' | translate }}
     </button>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.ts
index 539c9930db..4ce038a4ed 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.ts
@@ -62,6 +62,11 @@ export class EditAttributeValuePanelComponent extends PageComponent implements O
     return originalErrorState || customErrorState;
   }
 
+  invalid(): boolean {
+    const value = this.attributeFormGroup.get('value').value;
+    return !Array.isArray(value) && this.attributeFormGroup.invalid;
+  }
+
   cancel(): void {
     this.overlayRef.dispose();
   }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html
index 6e4178fccd..f3aefedbce 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-connectors.component.html
@@ -179,7 +179,7 @@
         <tb-json-object-edit
           fxFlex
           fxLayout="column"
-          required
+          jsonRequired
           label="{{ 'gateway.configuration' | translate }}"
           formControlName="configurationJson">
         </tb-json-object-edit>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-form.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-form.component.ts
index 9840db6efe..0314120995 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-form.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-form.component.ts
@@ -286,6 +286,7 @@ export class GatewayFormComponent extends PageComponent implements OnInit, OnDes
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
       data: {
         jsonValue: config,
+        required: true,
         title: this.translate.instant('gateway.title-connectors-json', {typeName: type})
       }
     }).afterClosed().subscribe(
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts
index dbda5f4db2..941731f7e0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc.component.ts
@@ -31,6 +31,7 @@ import {
   JsonObjectEditDialogComponent,
   JsonObjectEditDialogData
 } from '@shared/components/dialog/json-object-edit-dialog.component';
+import { jsonRequired } from '@shared/components/json-object-edit.component';
 
 
 @Component({
@@ -77,7 +78,7 @@ export class GatewayServiceRPCComponent extends PageComponent implements AfterVi
     this.commandForm = this.fb.group({
       command: [null,[Validators.required]],
       time: [60, [Validators.required, Validators.min(1)]],
-      params: ["{}", [Validators.required]],
+      params: [{}, [jsonRequired]],
       result: [null]
     })
 
@@ -114,7 +115,8 @@ export class GatewayServiceRPCComponent extends PageComponent implements AfterVi
       disableClose: true,
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
       data: {
-        jsonValue: JSON.parse(this.commandForm.get('params').value)
+        jsonValue: JSON.parse(this.commandForm.get('params').value),
+        required: true
       }
     }).afterClosed().subscribe(
       (res) => {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.html
index 24fe07d92b..40636a9d1b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.html
@@ -26,14 +26,14 @@
           <tb-json-object-edit
             [editorStyle]="{minHeight: '100px'}"
             fillHeight="true"
-            [required]="settings.attributeRequired"
+            [jsonRequired]="settings.attributeRequired"
             label="{{ settings.showLabel ? labelValue : '' }}"
             formControlName="currentValue"
             (focusin)="isFocused = true;"
             (focusout)="isFocused = false;"
           ></tb-json-object-edit>
         </fieldset>
-        <div class="tb-json-input-form__actions" fxLayout="row" fxLayoutAlign="end center" fxLayoutGap="20px">
+        <div class="tb-json-input__actions" fxLayout="row" fxLayoutAlign="end center" fxLayoutGap="20px">
           <button mat-button color="primary"
                   type="button"
                   [disabled]="!attributeUpdateFormGroup.dirty"
@@ -42,7 +42,7 @@
                   matTooltipPosition="above">
             {{ "action.undo" | translate }}
           </button>
-          <button mat-button mat-raised-button color="primary"
+          <button mat-raised-button color="primary"
                   type="submit"
                   [disabled]="attributeUpdateFormGroup.invalid || !attributeUpdateFormGroup.dirty">
             {{ "action.save" | translate }}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.scss
index 18a8ef8cf1..407bd9aab4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.scss
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.scss
@@ -27,6 +27,10 @@
     font-size: 18px;
     color: #a0a0a0;
   }
+
+  &__actions {
+    height: 48px;
+  }
 }
 
 .tb-toast {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.ts
index 2e9a9fb5f9..963669defc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/json-input-widget.component.ts
@@ -23,13 +23,14 @@ import { UtilsService } from '@core/services/utils.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Datasource, DatasourceData, DatasourceType, WidgetConfig } from '@shared/models/widget.models';
 import { IWidgetSubscription } from '@core/api/widget-api.models';
-import { UntypedFormBuilder, UntypedFormGroup, ValidatorFn, Validators } from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, ValidatorFn } from '@angular/forms';
 import { AttributeService } from '@core/http/attribute.service';
 import { AttributeData, AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models';
 import { EntityId } from '@shared/models/id/entity-id';
 import { EntityType } from '@shared/models/entity-type.models';
 import { createLabelFromDatasource, isDefinedAndNotNull } from '@core/utils';
 import { Observable } from 'rxjs';
+import { jsonRequired } from '@shared/components/json-object-edit.component';
 
 enum JsonInputWidgetMode {
   ATTRIBUTE = 'ATTRIBUTE',
@@ -131,7 +132,7 @@ export class JsonInputWidgetComponent extends PageComponent implements OnInit {
   private buildForm() {
     const validators: ValidatorFn[] = [];
     if (this.settings.attributeRequired) {
-      validators.push(Validators.required);
+      validators.push(jsonRequired);
     }
     this.attributeUpdateFormGroup = this.fb.group({
       currentValue: [{}, validators]
@@ -143,7 +144,7 @@ export class JsonInputWidgetComponent extends PageComponent implements OnInit {
 
   private updateWidgetData(data: Array<DatasourceData>) {
     if (!this.errorMessage) {
-      let value = {};
+      let value = null;
       if (data[0].data[0][1] !== '') {
         try {
           value = JSON.parse(data[0].data[0][1]);
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html
index 5a873ceb32..3a817ff40e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.html
@@ -91,7 +91,7 @@
                     (click)="openEditJSONDialog($event, key, source)">
               <mat-icon>open_in_new</mat-icon>
             </button>
-            <mat-error *ngIf="multipleInputFormGroup.get(key.formId).hasError('required')">
+            <mat-error *ngIf="multipleInputFormGroup.get(key.formId).hasError('required') && !multipleInputFormGroup.get(key.formId).hasError('invalidJSON')">
               {{ getErrorMessageText(key.settings,'required') }}
             </mat-error>
             <mat-error *ngIf="multipleInputFormGroup.get(key.formId).hasError('invalidJSON')">
@@ -193,7 +193,7 @@
     </button>
     <button mat-button mat-raised-button color="primary" type="submit"
             class="tb-multiple-input--buttons-container__button"
-            [disabled]="!multipleInputFormGroup.dirty || multipleInputFormGroup.invalid">
+            [disabled]="!multipleInputFormGroup.dirty || invalid()">
       {{ saveButtonLabel }}
     </button>
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
index d4c0ad2630..eb3b0c9abf 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/multiple-input-widget.component.ts
@@ -604,7 +604,8 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
   }
 
   public inputChanged(source: MultipleInputWidgetSource, key: MultipleInputWidgetDataKey) {
-    if (!this.settings.showActionButtons && !this.isSavingInProgress && this.multipleInputFormGroup.get(key.formId).valid) {
+    const control = this.multipleInputFormGroup.get(key.formId);
+    if (!this.settings.showActionButtons && !this.isSavingInProgress && (Array.isArray(control.value) || control.valid)) {
       this.isSavingInProgress = true;
       const dataToSave: MultipleInputWidgetSource = {
         datasource: source.datasource,
@@ -775,6 +776,7 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
       data: {
         jsonValue: formControl.value,
+        required: key.settings.required,
         title:  key.settings.dialogTitle,
         saveLabel: key.settings.saveButtonLabel,
         cancelLabel: key.settings.cancelButtonLabel
@@ -791,4 +793,16 @@ export class MultipleInputWidgetComponent extends PageComponent implements OnIni
       }
     );
   }
+
+  invalid(): boolean {
+    for (const source of this.sources) {
+      for (const key of this.visibleKeys(source)) {
+        const control = this.multipleInputFormGroup.get(key.formId);
+        if (!Array.isArray(control.value) && control.invalid) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
index 732d6e3119..cdd1d8e2da 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
@@ -89,7 +89,6 @@
           <ng-template matExpansionPanelContent>
             <tb-json-object-edit
               [editorStyle]="{minHeight: '100px'}"
-              required
               label="{{ 'widget-config.title-style' | translate }}"
               formControlName="titleStyle"
             ></tb-json-object-edit>
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.html b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.html
index 97f2214f2e..6d059fddec 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.html
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rule-node-config.component.html
@@ -22,7 +22,7 @@
                        class="tb-rule-node-configuration-json"
                        formControlName="configuration"
                        [label]="'rulenode.configuration' | translate"
-                       [required]="required"
+                       [jsonRequired]="required"
                        [fillHeight]="true">
   </tb-json-object-edit>
 </div>
diff --git a/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html
index 141979d8ff..3b216bda71 100644
--- a/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html
+++ b/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.html
@@ -33,8 +33,7 @@
       <tb-json-object-edit
         formControlName="json"
         label="{{ 'value.json-value' | translate }}"
-        validateContent="true"
-        [required]="true"
+        [jsonRequired]="required"
         [fillHeight]="false">
       </tb-json-object-edit>
     </fieldset>
diff --git a/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts
index e55431a327..4aeed2a360 100644
--- a/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts
+++ b/ui-ngx/src/app/shared/components/dialog/json-object-edit-dialog.component.ts
@@ -26,6 +26,7 @@ import { isNotEmptyStr } from '@core/utils';
 
 export interface JsonObjectEditDialogData {
   jsonValue: object;
+  required?: boolean;
   title?: string;
   saveLabel?: string;
   cancelLabel?: string;
@@ -43,6 +44,8 @@ export class JsonObjectEditDialogComponent extends DialogComponent<JsonObjectEdi
   saveButtonLabel = this.translate.instant('action.save');
   cancelButtonLabel = this.translate.instant('action.cancel');
 
+  required = this.data.required === true;
+
   constructor(protected store: Store<AppState>,
               protected router: Router,
               @Inject(MAT_DIALOG_DATA) public data: JsonObjectEditDialogData,
diff --git a/ui-ngx/src/app/shared/components/directives/tb-json-to-string.directive.ts b/ui-ngx/src/app/shared/components/directives/tb-json-to-string.directive.ts
index 8da5fb1396..c70de1ab48 100644
--- a/ui-ngx/src/app/shared/components/directives/tb-json-to-string.directive.ts
+++ b/ui-ngx/src/app/shared/components/directives/tb-json-to-string.directive.ts
@@ -17,19 +17,23 @@
 import { Directive, ElementRef, forwardRef, HostListener, Renderer2, SkipSelf } from '@angular/core';
 import {
   ControlValueAccessor,
-  UntypedFormControl,
   FormGroupDirective,
   NG_VALIDATORS,
   NG_VALUE_ACCESSOR,
   NgForm,
+  UntypedFormControl,
   ValidationErrors,
   Validator
 } from '@angular/forms';
 import { ErrorStateMatcher } from '@angular/material/core';
-import { isObject } from "@core/utils";
+import { isObject } from '@core/utils';
 
 @Directive({
   selector: '[tb-json-to-string]',
+  // eslint-disable-next-line @angular-eslint/no-host-metadata-property
+  host: {
+    '(blur)': 'onTouched()'
+  },
   providers: [{
     provide: NG_VALUE_ACCESSOR,
     useExisting: forwardRef(() => TbJsonToStringDirective),
@@ -48,18 +52,26 @@ import { isObject } from "@core/utils";
 
 export class TbJsonToStringDirective implements ControlValueAccessor, Validator, ErrorStateMatcher {
   private propagateChange = null;
+  public onTouched = () => {};
   private parseError: boolean;
   private data: any;
 
   @HostListener('input', ['$event.target.value']) input(newValue: any): void {
     try {
-      this.data = JSON.parse(newValue);
-      if (isObject(this.data)) {
-        this.parseError = false;
+      if (newValue) {
+        this.data = JSON.parse(newValue);
+        if (isObject(this.data)) {
+          this.parseError = false;
+        } else {
+          this.data = null;
+          this.parseError = true;
+        }
       } else {
-        this.parseError = true;
+        this.data = null;
+        this.parseError = false;
       }
     } catch (e) {
+      this.data = null;
       this.parseError = true;
     }
 
@@ -73,9 +85,7 @@ export class TbJsonToStringDirective implements ControlValueAccessor, Validator,
   }
 
   isErrorState(control: UntypedFormControl | null, form: FormGroupDirective | NgForm | null): boolean {
-    const originalErrorState = this.errorStateMatcher.isErrorState(control, form);
-    const customErrorState = !!(control && control.invalid && this.parseError);
-    return originalErrorState || customErrorState;
+    return !!(control && control.invalid && !Array.isArray(control.value) && control.touched);
   }
 
   validate(c: UntypedFormControl): ValidationErrors {
@@ -87,11 +97,9 @@ export class TbJsonToStringDirective implements ControlValueAccessor, Validator,
   }
 
   writeValue(obj: any): void {
-    if (obj) {
-      this.data = obj;
-      this.parseError = false;
-      this.render.setProperty(this.element.nativeElement, 'value', JSON.stringify(obj));
-    }
+    this.data = obj;
+    this.parseError = false;
+    this.render.setProperty(this.element.nativeElement, 'value', obj ? JSON.stringify(obj) : '');
   }
 
   registerOnChange(fn: any): void {
@@ -99,5 +107,6 @@ export class TbJsonToStringDirective implements ControlValueAccessor, Validator,
   }
 
   registerOnTouched(fn: any): void {
+    this.onTouched = fn;
   }
 }
diff --git a/ui-ngx/src/app/shared/components/json-object-edit.component.html b/ui-ngx/src/app/shared/components/json-object-edit.component.html
index c0024da9dd..3ed828e6cf 100644
--- a/ui-ngx/src/app/shared/components/json-object-edit.component.html
+++ b/ui-ngx/src/app/shared/components/json-object-edit.component.html
@@ -20,7 +20,7 @@
      [fullscreen]="fullscreen" (fullscreenChanged)="onFullscreen()" fxLayout="column">
   <div fxLayout="row" fxLayoutAlign="start center" class="tb-json-object-toolbar">
     <label class="tb-title no-padding"
-           [ngClass]="{'tb-required': required,
+           [ngClass]="{'tb-required': jsonRequired,
                        'tb-readonly': readonly,
                        'tb-error': !objectValid}">{{ label }}</label>
     <span fxFlex></span>
diff --git a/ui-ngx/src/app/shared/components/json-object-edit.component.ts b/ui-ngx/src/app/shared/components/json-object-edit.component.ts
index f7e3116b0f..f89430f98b 100644
--- a/ui-ngx/src/app/shared/components/json-object-edit.component.ts
+++ b/ui-ngx/src/app/shared/components/json-object-edit.component.ts
@@ -24,7 +24,14 @@ import {
   OnInit,
   ViewChild
 } from '@angular/core';
-import { ControlValueAccessor, UntypedFormControl, NG_VALIDATORS, NG_VALUE_ACCESSOR, Validator } from '@angular/forms';
+import {
+  ControlValueAccessor,
+  UntypedFormControl,
+  NG_VALIDATORS,
+  NG_VALUE_ACCESSOR,
+  Validator,
+  AbstractControl, ValidationErrors
+} from '@angular/forms';
 import { Ace } from 'ace-builds';
 import { coerceBooleanProperty } from '@angular/cdk/coercion';
 import { ActionNotificationHide, ActionNotificationShow } from '@core/notification/notification.actions';
@@ -34,6 +41,9 @@ import { CancelAnimationFrame, RafService } from '@core/services/raf.service';
 import { guid, isDefinedAndNotNull, isObject, isUndefined } from '@core/utils';
 import { ResizeObserver } from '@juggle/resize-observer';
 import { getAce } from '@shared/models/ace/ace.models';
+import { coerceBoolean } from '@shared/decorators/coercion';
+
+export const jsonRequired = (control: AbstractControl): ValidationErrors | null => !control.value ? {required: true} : null;
 
 @Component({
   selector: 'tb-json-object-edit',
@@ -73,27 +83,13 @@ export class JsonObjectEditComponent implements OnInit, ControlValueAccessor, Va
 
   @Input() sort: (key: string, value: any) => any;
 
-  private requiredValue: boolean;
-
-  get required(): boolean {
-    return this.requiredValue;
-  }
-
+  @coerceBoolean()
   @Input()
-  set required(value: boolean) {
-    this.requiredValue = coerceBooleanProperty(value);
-  }
-
-  private readonlyValue: boolean;
-
-  get readonly(): boolean {
-    return this.readonlyValue;
-  }
+  jsonRequired: boolean;
 
+  @coerceBoolean()
   @Input()
-  set readonly(value: boolean) {
-    this.readonlyValue = coerceBooleanProperty(value);
-  }
+  readonly: boolean;
 
   fullscreen = false;
 
@@ -245,12 +241,10 @@ export class JsonObjectEditComponent implements OnInit, ControlValueAccessor, Va
     try {
       if (isDefinedAndNotNull(this.modelValue)) {
         this.contentValue = JSON.stringify(this.modelValue, isUndefined(this.sort) ? undefined :
-          (key, objectValue) => {
-            return this.sort(key, objectValue);
-          }, 2);
+          (key, objectValue) => this.sort(key, objectValue), 2);
         this.objectValid = true;
       } else {
-        this.objectValid = !this.required;
+        this.objectValid = !this.jsonRequired;
         this.validationError = 'Json object is required.';
       }
     } catch (e) {
@@ -288,8 +282,8 @@ export class JsonObjectEditComponent implements OnInit, ControlValueAccessor, Va
           this.validationError = errorInfo;
         }
       } else {
-        this.objectValid = !this.required;
-        this.validationError = this.required ? 'Json object is required.' : '';
+        this.objectValid = !this.jsonRequired;
+        this.validationError = this.jsonRequired ? 'Json object is required.' : '';
       }
       this.modelValue = data;
       this.propagateChange(data);
diff --git a/ui-ngx/src/app/shared/components/value-input.component.html b/ui-ngx/src/app/shared/components/value-input.component.html
index 57d6954699..9f7f9d0ffc 100644
--- a/ui-ngx/src/app/shared/components/value-input.component.html
+++ b/ui-ngx/src/app/shared/components/value-input.component.html
@@ -67,7 +67,7 @@
         <button matSuffix mat-icon-button (click)="openEditJSONDialog($event)">
           <mat-icon>open_in_new</mat-icon>
         </button>
-        <mat-error *ngIf="value.hasError('required')">
+        <mat-error *ngIf="value.hasError('required') && !value.hasError('invalidJSON')">
           {{ (requiredText ? requiredText : 'value.json-value-required') | translate }}
         </mat-error>
         <mat-error *ngIf="value.hasError('invalidJSON')">
diff --git a/ui-ngx/src/app/shared/components/value-input.component.ts b/ui-ngx/src/app/shared/components/value-input.component.ts
index 4ba7abf157..52828cec35 100644
--- a/ui-ngx/src/app/shared/components/value-input.component.ts
+++ b/ui-ngx/src/app/shared/components/value-input.component.ts
@@ -15,7 +15,7 @@
 ///
 
 import { Component, forwardRef, Input, OnInit, ViewChild } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR, NgForm } from '@angular/forms';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, NgForm, NgModel } from '@angular/forms';
 import { ValueType, valueTypesMap } from '@shared/models/constants';
 import { isObject } from '@core/utils';
 import { MatDialog } from '@angular/material/dialog';
@@ -23,6 +23,7 @@ import {
   JsonObjectEditDialogComponent,
   JsonObjectEditDialogData
 } from '@shared/components/dialog/json-object-edit-dialog.component';
+import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-value-input',
@@ -73,7 +74,8 @@ export class ValueInputComponent implements OnInit, ControlValueAccessor {
       disableClose: true,
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
       data: {
-        jsonValue: this.modelValue
+        jsonValue: this.modelValue,
+        required: true
       }
     }).afterClosed().subscribe(
       (res) => {
@@ -115,7 +117,8 @@ export class ValueInputComponent implements OnInit, ControlValueAccessor {
   }
 
   updateView() {
-    if (this.inputForm.valid || this.valueType === ValueType.BOOLEAN) {
+    if (this.inputForm.valid || this.valueType === ValueType.BOOLEAN ||
+        (this.valueType === ValueType.JSON && Array.isArray(this.modelValue))) {
       this.propagateChange(this.modelValue);
     } else {
       this.propagateChange(null);

From b3a8ce17be81fd97608eb993e413c680e1806603 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 12 Sep 2023 13:08:59 +0300
Subject: [PATCH 9/9] UI: Code cleanup

---
 ui-ngx/src/app/shared/components/value-input.component.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/value-input.component.ts b/ui-ngx/src/app/shared/components/value-input.component.ts
index 52828cec35..6d57b1ddd2 100644
--- a/ui-ngx/src/app/shared/components/value-input.component.ts
+++ b/ui-ngx/src/app/shared/components/value-input.component.ts
@@ -15,7 +15,7 @@
 ///
 
 import { Component, forwardRef, Input, OnInit, ViewChild } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR, NgForm, NgModel } from '@angular/forms';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR, NgForm } from '@angular/forms';
 import { ValueType, valueTypesMap } from '@shared/models/constants';
 import { isObject } from '@core/utils';
 import { MatDialog } from '@angular/material/dialog';
@@ -23,7 +23,6 @@ import {
   JsonObjectEditDialogComponent,
   JsonObjectEditDialogData
 } from '@shared/components/dialog/json-object-edit-dialog.component';
-import { coerceBoolean } from '@shared/decorators/coercion';
 
 @Component({
   selector: 'tb-value-input',