From 1569ac6dafb4bf6ddbb2bcd257fbaaeacbfa2bc6 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Fri, 18 Aug 2023 12:16:23 +0200
Subject: [PATCH] updateAttributesOnValueChange is true for rule chain
 templates

---
 .../data/json/edge/rule_chains/edge_root_rule_chain.json     | 4 +++-
 .../data/json/tenant/device_profile/rule_chain_template.json | 5 ++++-
 .../main/data/json/tenant/rule_chains/root_rule_chain.json   | 4 +++-
 .../engine/telemetry/TbMsgAttributesNodeConfiguration.java   | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json b/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json
index ec1341cc71..8d3c9a9af4 100644
--- a/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json
+++ b/application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json
@@ -50,7 +50,9 @@
         "debugMode": false,
         "configuration": {
           "scope": "CLIENT_SCOPE",
-          "notifyDevice": "false"
+          "notifyDevice": "false",
+          "sendAttributesUpdatedNotification": "false",
+          "updateAttributesOnValueChange": "true"
         },
         "externalId": null
       },
diff --git a/application/src/main/data/json/tenant/device_profile/rule_chain_template.json b/application/src/main/data/json/tenant/device_profile/rule_chain_template.json
index 4776ef2aae..a11cba1b9e 100644
--- a/application/src/main/data/json/tenant/device_profile/rule_chain_template.json
+++ b/application/src/main/data/json/tenant/device_profile/rule_chain_template.json
@@ -33,7 +33,10 @@
         "name": "Save Client Attributes",
         "debugMode": false,
         "configuration": {
-          "scope": "CLIENT_SCOPE"
+          "scope": "CLIENT_SCOPE",
+          "notifyDevice": "false",
+          "sendAttributesUpdatedNotification": "false",
+          "updateAttributesOnValueChange": "true"
         }
       },
       {
diff --git a/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json b/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json
index 88ef27e2f8..faf411680e 100644
--- a/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json
+++ b/application/src/main/data/json/tenant/rule_chains/root_rule_chain.json
@@ -33,7 +33,9 @@
         "debugMode": false,
         "configuration": {
           "scope": "CLIENT_SCOPE",
-          "notifyDevice": "false"
+          "notifyDevice": "false",
+          "sendAttributesUpdatedNotification": "false",
+          "updateAttributesOnValueChange": "true"
         }
       },
       {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeConfiguration.java
index 6512c45cdf..7da27e7fe9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeConfiguration.java
@@ -34,6 +34,7 @@ public class TbMsgAttributesNodeConfiguration implements NodeConfiguration<TbMsg
         configuration.setScope(DataConstants.SERVER_SCOPE);
         configuration.setNotifyDevice(false);
         configuration.setSendAttributesUpdatedNotification(false);
+        // backward compatibility for existing tenants, but rule chain templates will have the true value for new tenants
         configuration.setUpdateAttributesOnValueChange(false);
         return configuration;
     }