From 83ebce8ab5475fac09d100adc97dee9cb246276c Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Tue, 18 Jun 2024 18:08:14 +0300
Subject: [PATCH 01/22] Made JSON content toolbar visible

---
 ui-ngx/src/app/shared/components/json-content.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/components/json-content.component.html b/ui-ngx/src/app/shared/components/json-content.component.html
index 1a09d539c8..67727591a4 100644
--- a/ui-ngx/src/app/shared/components/json-content.component.html
+++ b/ui-ngx/src/app/shared/components/json-content.component.html
@@ -18,7 +18,7 @@
 <div class="tb-json-content" style="background: #fff;" [ngClass]="{'fill-height': fillHeight}"
      tb-fullscreen
      [fullscreen]="fullscreen" (fullscreenChanged)="onFullscreen()" fxLayout="column">
-  <div fxLayout="row" fxLayoutAlign="start center" style="height: 40px;" class="tb-json-content-toolbar" *ngIf="hideToolbar">
+  <div fxLayout="row" fxLayoutAlign="start center" style="height: 40px;" class="tb-json-content-toolbar" *ngIf="!hideToolbar">
     <label class="tb-title no-padding" [ngClass]="{'tb-error': !disabled && (!contentValid || required && !contentBody), 'tb-required': !disabled && required}">{{ label }}</label>
     <span fxFlex></span>
     <button type="button"

From 0142af37d1e9d818013f47ed1ef45f2ed3b9238b Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 19 Jun 2024 12:36:09 +0300
Subject: [PATCH 02/22] Fix MD5 SNMP authentication protocol

---
 ui-ngx/src/app/shared/models/device.models.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/models/device.models.ts b/ui-ngx/src/app/shared/models/device.models.ts
index b38833bbaa..94d1bc0add 100644
--- a/ui-ngx/src/app/shared/models/device.models.ts
+++ b/ui-ngx/src/app/shared/models/device.models.ts
@@ -655,7 +655,7 @@ export enum SnmpAuthenticationProtocol {
   SHA_256 = 'SHA_256',
   SHA_384 = 'SHA_384',
   SHA_512 = 'SHA_512',
-  MD5 = 'MD%'
+  MD5 = 'MD5'
 }
 
 export const SnmpAuthenticationProtocolTranslationMap = new Map<SnmpAuthenticationProtocol, string>([

From be2fb6d0b370670f1820dd38f445915f31eb87c6 Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Thu, 20 Jun 2024 11:27:35 +0300
Subject: [PATCH 03/22] added missed version to the mqtt node

---
 .../main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
index 5074024be5..2baf26206f 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/TbMqttNode.java
@@ -53,6 +53,7 @@ import java.util.concurrent.TimeoutException;
         type = ComponentType.EXTERNAL,
         name = "mqtt",
         configClazz = TbMqttNodeConfiguration.class,
+        version = 1,
         clusteringMode = ComponentClusteringMode.USER_PREFERENCE,
         nodeDescription = "Publish messages to the MQTT broker",
         nodeDetails = "Will publish message payload to the MQTT broker with QoS <b>AT_LEAST_ONCE</b>.",

From b48387a733b336ad4c2a92d4bcefb3d1c4a00361 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Thu, 20 Jun 2024 18:34:06 +0300
Subject: [PATCH 04/22] Edge install instructions update. Use Java 17. Fix tag
 usage

---
 .../install/centos/instructions.md            | 14 ++--
 .../install/ubuntu/instructions.md            | 14 ++--
 ...EdgeInstallUpgradeInstructionsService.java | 65 +++++++++++++++++
 ...DefaultEdgeInstallInstructionsService.java | 71 +++++--------------
 ...DefaultEdgeUpgradeInstructionsService.java | 55 ++++----------
 5 files changed, 110 insertions(+), 109 deletions(-)
 create mode 100644 application/src/main/java/org/thingsboard/server/service/edge/instructions/BaseEdgeInstallUpgradeInstructionsService.java

diff --git a/application/src/main/data/json/edge/instructions/install/centos/instructions.md b/application/src/main/data/json/edge/instructions/install/centos/instructions.md
index 22bb3f63a0..bcc1967dfd 100644
--- a/application/src/main/data/json/edge/instructions/install/centos/instructions.md
+++ b/application/src/main/data/json/edge/instructions/install/centos/instructions.md
@@ -8,15 +8,15 @@ sudo yum install -y nano wget
 sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 ```
 
-#### Install Java 11 (OpenJDK)
-ThingsBoard service is running on Java 11. Follow these instructions to install OpenJDK 11:
+#### Install Java 17 (OpenJDK)
+ThingsBoard service is running on Java 17. Follow these instructions to install OpenJDK 17:
 
 ```bash
-sudo yum install java-11-openjdk
+sudo yum install java-17-openjdk
 {:copy-code}
 ```
 
-Please don't forget to configure your operating system to use OpenJDK 11 by default.
+Please don't forget to configure your operating system to use OpenJDK 17 by default.
 You can configure which version is the default using the following command:
 
 ```bash
@@ -34,7 +34,7 @@ java -version
 Expected command output is:
 
 ```text
-openjdk version "11.0.xx"
+openjdk version "17.x.xx"
 OpenJDK Runtime Environment (...)
 OpenJDK 64-Bit Server VM (build ...)
 ```
@@ -144,14 +144,14 @@ CREATE DATABASE tb_edge;
 Download installation package:
 
 ```bash
-wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_VERSION}/tb-edge-${TB_EDGE_VERSION}.rpm
+wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.rpm
 {:copy-code}
 ```
 
 Go to the download repository and install ThingsBoard Edge service:
 
 ```bash
-sudo rpm -Uvh tb-edge-${TB_EDGE_VERSION}.rpm
+sudo rpm -Uvh tb-edge-${TB_EDGE_TAG}.rpm
 {:copy-code}
 ```
 
diff --git a/application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md b/application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md
index 6fcdcd50f2..fe9601443f 100644
--- a/application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md
+++ b/application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md
@@ -1,15 +1,15 @@
 Here is the list of commands, that can be used to quickly install ThingsBoard Edge on Ubuntu Server and connect to the server.
 
-#### Install Java 11 (OpenJDK)
-ThingsBoard service is running on Java 11. Follow these instructions to install OpenJDK 11:
+#### Install Java 17 (OpenJDK)
+ThingsBoard service is running on Java 17. Follow these instructions to install OpenJDK 17:
 
 ```bash
 sudo apt update
-sudo apt install openjdk-11-jdk
+sudo apt install openjdk-17-jdk
 {:copy-code}
 ```
 
-Please don't forget to configure your operating system to use OpenJDK 11 by default.
+Please don't forget to configure your operating system to use OpenJDK 17 by default.
 You can configure which version is the default using the following command:
 
 ```bash
@@ -27,7 +27,7 @@ java -version
 Expected command output is:
 
 ```text
-openjdk version "11.0.xx"
+openjdk version "17.x.xx"
 OpenJDK Runtime Environment (...)
 OpenJDK 64-Bit Server VM (build ...)
 ```
@@ -76,14 +76,14 @@ CREATE DATABASE tb_edge;
 Download installation package:
 
 ```bash
-wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_VERSION}/tb-edge-${TB_EDGE_VERSION}.deb
+wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.deb
 {:copy-code}
 ```
 
 Go to the download repository and install ThingsBoard Edge service:
 
 ```bash
-sudo dpkg -i tb-edge-${TB_EDGE_VERSION}.deb
+sudo dpkg -i tb-edge-${TB_EDGE_TAG}.deb
 {:copy-code}
 ```
 
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/instructions/BaseEdgeInstallUpgradeInstructionsService.java b/application/src/main/java/org/thingsboard/server/service/edge/instructions/BaseEdgeInstallUpgradeInstructionsService.java
new file mode 100644
index 0000000000..c82f7babc5
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/edge/instructions/BaseEdgeInstallUpgradeInstructionsService.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright © 2016-2024 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.service.edge.instructions;
+
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.thingsboard.server.service.install.InstallScripts;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+@Slf4j
+@RequiredArgsConstructor
+public abstract class BaseEdgeInstallUpgradeInstructionsService {
+
+    private static final String EDGE_DIR = "edge";
+    private static final String INSTRUCTIONS_DIR = "instructions";
+
+    private final InstallScripts installScripts;
+
+    @Value("${app.version:unknown}")
+    @Setter
+    protected String appVersion;
+
+    protected String readFile(Path file) {
+        try {
+            return Files.readString(file);
+        } catch (IOException e) {
+            log.warn("Failed to read file: {}", file, e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected String getTagVersion(String version) {
+        return version.endsWith(".0") ? version.substring(0, version.length() - 2) : version;
+    }
+
+    protected Path resolveFile(String subDir, String... subDirs) {
+        return getEdgeInstructionsDir().resolve(Paths.get(subDir, subDirs));
+    }
+
+    protected Path getEdgeInstructionsDir() {
+        return Paths.get(installScripts.getDataDir(), InstallScripts.JSON_DIR, EDGE_DIR, INSTRUCTIONS_DIR, getBaseDirName());
+    }
+
+    protected abstract String getBaseDirName();
+
+}
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java
index fd0d9fc2dd..64f96aa4e4 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java
@@ -15,8 +15,7 @@
  */
 package org.thingsboard.server.service.edge.instructions;
 
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -27,47 +26,32 @@ import org.thingsboard.server.dao.util.DeviceConnectivityUtil;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.install.InstallScripts;
 
-import jakarta.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
 @Service
 @Slf4j
-@RequiredArgsConstructor
 @ConditionalOnProperty(prefix = "edges", value = "enabled", havingValue = "true")
 @TbCoreComponent
-public class DefaultEdgeInstallInstructionsService implements EdgeInstallInstructionsService {
+public class DefaultEdgeInstallInstructionsService extends BaseEdgeInstallUpgradeInstructionsService implements EdgeInstallInstructionsService {
 
-    private static final String EDGE_DIR = "edge";
-    private static final String INSTRUCTIONS_DIR = "instructions";
     private static final String INSTALL_DIR = "install";
 
-    private final InstallScripts installScripts;
-
     @Value("${edges.rpc.port}")
     private int rpcPort;
 
     @Value("${edges.rpc.ssl.enabled}")
     private boolean sslEnabled;
 
-    @Value("${app.version:unknown}")
-    @Setter
-    private String appVersion;
+    public DefaultEdgeInstallInstructionsService(InstallScripts installScripts) {
+        super(installScripts);
+    }
 
     @Override
     public EdgeInstructions getInstallInstructions(Edge edge, String installationMethod, HttpServletRequest request) {
-        switch (installationMethod.toLowerCase()) {
-            case "docker":
-                return getDockerInstallInstructions(edge, request);
-            case "ubuntu":
-                return getUbuntuInstallInstructions(edge, request);
-            case "centos":
-                return getCentosInstallInstructions(edge, request);
-            default:
-                throw new IllegalArgumentException("Unsupported installation method for Edge: " + installationMethod);
-        }
+        return switch (installationMethod.toLowerCase()) {
+            case "docker" -> getDockerInstallInstructions(edge, request);
+            case "ubuntu", "centos" -> getLinuxInstallInstructions(edge, request, installationMethod.toLowerCase());
+            default ->
+                    throw new IllegalArgumentException("Unsupported installation method for Edge: " + installationMethod);
+        };
     }
 
     private EdgeInstructions getDockerInstallInstructions(Edge edge, HttpServletRequest request) {
@@ -88,25 +72,16 @@ public class DefaultEdgeInstallInstructionsService implements EdgeInstallInstruc
         return new EdgeInstructions(dockerInstallInstructions);
     }
 
-    private EdgeInstructions getUbuntuInstallInstructions(Edge edge, HttpServletRequest request) {
-        String ubuntuInstallInstructions = readFile(resolveFile("ubuntu", "instructions.md"));
+    private EdgeInstructions getLinuxInstallInstructions(Edge edge, HttpServletRequest request, String os) {
+        String ubuntuInstallInstructions = readFile(resolveFile(os, "instructions.md"));
         ubuntuInstallInstructions = replacePlaceholders(ubuntuInstallInstructions, edge);
         ubuntuInstallInstructions = ubuntuInstallInstructions.replace("${BASE_URL}", request.getServerName());
         String edgeVersion = appVersion.replace("-SNAPSHOT", "");
         ubuntuInstallInstructions = ubuntuInstallInstructions.replace("${TB_EDGE_VERSION}", edgeVersion);
+        ubuntuInstallInstructions = ubuntuInstallInstructions.replace("${TB_EDGE_TAG}", getTagVersion(edgeVersion));
         return new EdgeInstructions(ubuntuInstallInstructions);
     }
 
-
-    private EdgeInstructions getCentosInstallInstructions(Edge edge, HttpServletRequest request) {
-        String centosInstallInstructions = readFile(resolveFile("centos", "instructions.md"));
-        centosInstallInstructions = replacePlaceholders(centosInstallInstructions, edge);
-        centosInstallInstructions = centosInstallInstructions.replace("${BASE_URL}", request.getServerName());
-        String edgeVersion = appVersion.replace("-SNAPSHOT", "");
-        centosInstallInstructions = centosInstallInstructions.replace("${TB_EDGE_VERSION}", edgeVersion);
-        return new EdgeInstructions(centosInstallInstructions);
-    }
-
     private String replacePlaceholders(String instructions, Edge edge) {
         instructions = instructions.replace("${CLOUD_ROUTING_KEY}", edge.getRoutingKey());
         instructions = instructions.replace("${CLOUD_ROUTING_SECRET}", edge.getSecret());
@@ -115,20 +90,8 @@ public class DefaultEdgeInstallInstructionsService implements EdgeInstallInstruc
         return instructions;
     }
 
-    private String readFile(Path file) {
-        try {
-            return Files.readString(file);
-        } catch (IOException e) {
-            log.warn("Failed to read file: {}", file, e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    private Path resolveFile(String subDir, String... subDirs) {
-        return getEdgeInstallInstructionsDir().resolve(Paths.get(subDir, subDirs));
-    }
-
-    private Path getEdgeInstallInstructionsDir() {
-        return Paths.get(installScripts.getDataDir(), InstallScripts.JSON_DIR, EDGE_DIR, INSTRUCTIONS_DIR, INSTALL_DIR);
+    @Override
+    protected String getBaseDirName() {
+        return INSTALL_DIR;
     }
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java
index 3ff8ae784a..7113123a45 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.service.edge.instructions;
 
-import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,47 +31,37 @@ import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.install.InstallScripts;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
 @Service
 @Slf4j
-@RequiredArgsConstructor
 @ConditionalOnProperty(prefix = "edges", value = "enabled", havingValue = "true")
 @TbCoreComponent
-public class DefaultEdgeUpgradeInstructionsService implements EdgeUpgradeInstructionsService {
+public class DefaultEdgeUpgradeInstructionsService extends BaseEdgeInstallUpgradeInstructionsService implements EdgeUpgradeInstructionsService {
 
     private static final Map<String, EdgeUpgradeInfo> upgradeVersionHashMap = new HashMap<>();
 
-    private static final String EDGE_DIR = "edge";
-    private static final String INSTRUCTIONS_DIR = "instructions";
     private static final String UPGRADE_DIR = "upgrade";
 
-    private final InstallScripts installScripts;
     private final AttributesService attributesService;
 
-    @Value("${app.version:unknown}")
-    @Setter
-    private String appVersion;
+    public DefaultEdgeUpgradeInstructionsService(AttributesService attributesService, InstallScripts installScripts) {
+        super(installScripts);
+        this.attributesService = attributesService;
+    }
 
     @Override
     public EdgeInstructions getUpgradeInstructions(String edgeVersion, String upgradeMethod) {
         String tbVersion = appVersion.replace("-SNAPSHOT", "");
         String currentEdgeVersion = convertEdgeVersionToDocsFormat(edgeVersion);
-        switch (upgradeMethod.toLowerCase()) {
-            case "docker":
-                return getDockerUpgradeInstructions(tbVersion, currentEdgeVersion);
-            case "ubuntu":
-            case "centos":
-                return getLinuxUpgradeInstructions(tbVersion, currentEdgeVersion, upgradeMethod.toLowerCase());
-            default:
-                throw new IllegalArgumentException("Unsupported upgrade method for Edge: " + upgradeMethod);
-        }
+        return switch (upgradeMethod.toLowerCase()) {
+            case "docker" -> getDockerUpgradeInstructions(tbVersion, currentEdgeVersion);
+            case "ubuntu", "centos" ->
+                    getLinuxUpgradeInstructions(tbVersion, currentEdgeVersion, upgradeMethod.toLowerCase());
+            default -> throw new IllegalArgumentException("Unsupported upgrade method for Edge: " + upgradeMethod);
+        };
     }
 
     @Override
@@ -167,28 +156,12 @@ public class DefaultEdgeUpgradeInstructionsService implements EdgeUpgradeInstruc
         return new EdgeInstructions(result.toString());
     }
 
-    private String getTagVersion(String version) {
-        return version.endsWith(".0") ? version.substring(0, version.length() - 2) : version;
-    }
-
     private String convertEdgeVersionToDocsFormat(String edgeVersion) {
         return edgeVersion.replace("_", ".").substring(2);
     }
 
-    private String readFile(Path file) {
-        try {
-            return Files.readString(file);
-        } catch (IOException e) {
-            log.warn("Failed to read file: {}", file, e);
-            throw new RuntimeException(e);
-        }
-    }
-
-    private Path resolveFile(String subDir, String... subDirs) {
-        return getEdgeInstallInstructionsDir().resolve(Paths.get(subDir, subDirs));
-    }
-
-    private Path getEdgeInstallInstructionsDir() {
-        return Paths.get(installScripts.getDataDir(), InstallScripts.JSON_DIR, EDGE_DIR, INSTRUCTIONS_DIR, UPGRADE_DIR);
+    @Override
+    protected String getBaseDirName() {
+        return UPGRADE_DIR;
     }
 }

From 7be99bb01f7c0939d8998edbfe8aeb4129d6b1ec Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Wed, 26 Jun 2024 16:35:16 +0300
Subject: [PATCH 05/22] UI: Hotfix for range settings

---
 .../widget/lib/chart/range-chart-widget.models.ts      | 10 +---------
 .../lib/settings/common/color-range-list.component.ts  |  8 +++++---
 .../settings/common/color-range-settings.component.ts  |  8 ++++----
 ui-ngx/src/app/shared/models/widget-settings.models.ts |  4 ++--
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
index 5b3fb52689..1cd9bae402 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
@@ -104,15 +104,7 @@ export interface RangeChartWidgetSettings extends TimeSeriesChartTooltipWidgetSe
 
 export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
   dataZoom: true,
-  rangeColors: [
-    {to: -20, color: '#234CC7'},
-    {from: -20, to: 0, color: '#305AD7'},
-    {from: 0, to: 10, color: '#7191EF'},
-    {from: 10, to: 20, color: '#FFA600'},
-    {from: 20, to: 30, color: '#F36900'},
-    {from: 30, to: 40, color: '#F04022'},
-    {from: 40, color: '#D81838'}
-  ],
+  rangeColors: [],
   outOfRangeColor: '#ccc',
   showRangeThresholds: true,
   rangeThreshold: mergeDeep({} as Partial<TimeSeriesChartThreshold>,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-list.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-list.component.ts
index fcfd5f47e5..1c71850cb5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-list.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-list.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, forwardRef, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectorRef, Component, forwardRef, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import {
   AbstractControl,
   ControlValueAccessor,
@@ -97,7 +97,8 @@ export class ColorRangeListComponent implements OnInit, ControlValueAccessor, On
 
   private propagateChange = (v: any) => { };
 
-  constructor(private fb: UntypedFormBuilder) {}
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef) {}
 
   ngOnInit(): void {
     this.colorRangeListFormGroup = this.fb.group({
@@ -139,7 +140,7 @@ export class ColorRangeListComponent implements OnInit, ControlValueAccessor, On
       } else {
         rangeList = deepClone(value);
       }
-      this.colorRangeListFormGroup.get('advancedMode').patchValue(rangeList.advancedMode, {emitEvent: false});
+      this.colorRangeListFormGroup.get('advancedMode').patchValue(rangeList.advancedMode || false, {emitEvent: false});
       if (isDefinedAndNotNull(rangeList?.range)) {
         rangeList.range.forEach((r) => this.rangeListFormArray.push(this.colorRangeControl(r), {emitEvent: false}));
       }
@@ -225,6 +226,7 @@ export class ColorRangeListComponent implements OnInit, ControlValueAccessor, On
       this.rangeListFormArray.push(this.colorRangeControl(newRange));
       this.colorRangeListFormGroup.markAsDirty();
       setTimeout(() => {this.popover?.updatePosition();}, 0);
+      this.cd.detectChanges();
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
index 5770f45c99..45180387d3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
@@ -25,7 +25,7 @@ import {
   ViewContainerRef
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { ColorRange, ComponentStyle } from '@shared/models/widget-settings.models';
+import { ColorRange, ColorRangeSettings, ComponentStyle } from '@shared/models/widget-settings.models';
 import { MatButton } from '@angular/material/button';
 import { TbPopoverService } from '@shared/components/popover.service';
 import { ColorRangePanelComponent } from '@home/components/widget/lib/settings/common/color-range-panel.component';
@@ -109,7 +109,7 @@ export class ColorRangeSettingsComponent implements OnInit, ControlValueAccessor
   }
 
   writeValue(value: Array<ColorRange>): void {
-    this.modelValue = value;
+    this.modelValue = ('range' in value) ? value.range as Array<ColorRange> : value;
     this.updateColorStyle();
   }
 
@@ -131,9 +131,9 @@ export class ColorRangeSettingsComponent implements OnInit, ControlValueAccessor
         {},
         {}, {}, true);
       colorRangeSettingsPanelPopover.tbComponentRef.instance.popover = colorRangeSettingsPanelPopover;
-      colorRangeSettingsPanelPopover.tbComponentRef.instance.colorRangeApplied.subscribe((colorRangeSettings) => {
+      colorRangeSettingsPanelPopover.tbComponentRef.instance.colorRangeApplied.subscribe((colorRangeSettings: ColorRangeSettings) => {
         colorRangeSettingsPanelPopover.hide();
-        this.modelValue = colorRangeSettings;
+        this.modelValue = colorRangeSettings.range;
         this.updateColorStyle();
         this.propagateChange(this.modelValue);
       });
diff --git a/ui-ngx/src/app/shared/models/widget-settings.models.ts b/ui-ngx/src/app/shared/models/widget-settings.models.ts
index 5124458ff0..186ffede00 100644
--- a/ui-ngx/src/app/shared/models/widget-settings.models.ts
+++ b/ui-ngx/src/app/shared/models/widget-settings.models.ts
@@ -195,8 +195,8 @@ export const colorRangeIncludes = (range: ColorRange, toCheck: ColorRange): bool
   }
 };
 
-export const filterIncludingColorRanges = (ranges: Array<ColorRange>): Array<ColorRange> => {
-  const result = [...ranges];
+export const filterIncludingColorRanges = (ranges: Array<ColorRange> | ColorRangeSettings): Array<ColorRange> => {
+  const result = [...(Array.isArray(ranges) ? ranges : ranges.range)];
   let includes = true;
   while (includes) {
     let index = -1;

From c4c55980fb922d1d013a9b95ee695039a968a8a2 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Wed, 26 Jun 2024 16:42:03 +0300
Subject: [PATCH 06/22] UI: Refactoring

---
 .../lib/settings/common/color-range-list.component.ts       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-list.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-list.component.ts
index 1c71850cb5..aa69b05d75 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-list.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-list.component.ts
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { ChangeDetectorRef, Component, forwardRef, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, forwardRef, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import {
   AbstractControl,
   ControlValueAccessor,
@@ -97,8 +97,7 @@ export class ColorRangeListComponent implements OnInit, ControlValueAccessor, On
 
   private propagateChange = (v: any) => { };
 
-  constructor(private fb: UntypedFormBuilder,
-              private cd: ChangeDetectorRef) {}
+  constructor(private fb: UntypedFormBuilder) {}
 
   ngOnInit(): void {
     this.colorRangeListFormGroup = this.fb.group({
@@ -226,7 +225,6 @@ export class ColorRangeListComponent implements OnInit, ControlValueAccessor, On
       this.rangeListFormArray.push(this.colorRangeControl(newRange));
       this.colorRangeListFormGroup.markAsDirty();
       setTimeout(() => {this.popover?.updatePosition();}, 0);
-      this.cd.detectChanges();
     }
   }
 

From 583ef8fe02c875da02804e06bee8c34286cf7f8c Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 1 Jul 2024 15:04:36 +0300
Subject: [PATCH 07/22] UI: Add func merge deep ignore array

---
 ui-ngx/src/app/core/utils.ts                           | 10 ++++++++++
 .../basic/chart/range-chart-basic-config.component.ts  |  4 ++--
 .../widget/lib/chart/range-chart-widget.models.ts      | 10 +++++++++-
 .../chart/range-chart-widget-settings.component.ts     |  4 ++--
 .../settings/common/color-range-settings.component.ts  |  4 ++--
 ui-ngx/src/app/shared/models/widget.models.ts          |  4 ++--
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index dc9ed5004b..f1283523e1 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -364,6 +364,16 @@ export function mergeDeep<T>(target: T, ...sources: T[]): T {
   return _.merge(target, ...sources);
 }
 
+function customizer(target: any, sources: any) {
+  if (_.isArray(target)) {
+    return sources;
+  }
+}
+
+export function mergeDeepIgnoreArray<T>(target: T, ...sources: T[]): T {
+  return _.mergeWith(target, ...sources, customizer);
+}
+
 export function guid(): string {
   function s4(): string {
     return Math.floor((1 + Math.random()) * 0x10000)
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
index 8e29d43a3e..85666ef91e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.ts
@@ -33,7 +33,7 @@ import {
   getTimewindowConfig,
   setTimewindowConfig
 } from '@home/components/widget/config/timewindow-config-panel.component';
-import { formatValue, isUndefined, mergeDeep } from '@core/utils';
+import { formatValue, isUndefined, mergeDeepIgnoreArray } from '@core/utils';
 import {
   cssSizeToStrSize,
   DateFormatProcessor,
@@ -117,7 +117,7 @@ export class RangeChartBasicConfigComponent extends BasicWidgetConfigComponent {
   }
 
   protected onConfigSet(configData: WidgetConfigComponentData) {
-    const settings: RangeChartWidgetSettings = mergeDeep<RangeChartWidgetSettings>({} as RangeChartWidgetSettings,
+    const settings: RangeChartWidgetSettings = mergeDeepIgnoreArray<RangeChartWidgetSettings>({} as RangeChartWidgetSettings,
       rangeChartDefaultSettings, configData.config.settings as RangeChartWidgetSettings);
     const iconSize = resolveCssSize(configData.config.iconSize);
     this.rangeChartWidgetConfigForm = this.fb.group({
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
index 1cd9bae402..5b3fb52689 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/range-chart-widget.models.ts
@@ -104,7 +104,15 @@ export interface RangeChartWidgetSettings extends TimeSeriesChartTooltipWidgetSe
 
 export const rangeChartDefaultSettings: RangeChartWidgetSettings = {
   dataZoom: true,
-  rangeColors: [],
+  rangeColors: [
+    {to: -20, color: '#234CC7'},
+    {from: -20, to: 0, color: '#305AD7'},
+    {from: 0, to: 10, color: '#7191EF'},
+    {from: 10, to: 20, color: '#FFA600'},
+    {from: 20, to: 30, color: '#F36900'},
+    {from: 30, to: 40, color: '#F04022'},
+    {from: 40, color: '#D81838'}
+  ],
   outOfRangeColor: '#ccc',
   showRangeThresholds: true,
   rangeThreshold: mergeDeep({} as Partial<TimeSeriesChartThreshold>,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
index 2dd34a10d7..9392c9f277 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/range-chart-widget-settings.component.ts
@@ -25,7 +25,7 @@ import {
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { formatValue, mergeDeep } from '@core/utils';
+import { formatValue, mergeDeepIgnoreArray } from '@core/utils';
 import {
   rangeChartDefaultSettings,
   RangeChartWidgetSettings
@@ -99,7 +99,7 @@ export class RangeChartWidgetSettingsComponent extends WidgetSettingsComponent {
   }
 
   protected defaultSettings(): WidgetSettings {
-    return mergeDeep<RangeChartWidgetSettings>({} as RangeChartWidgetSettings, rangeChartDefaultSettings);
+    return mergeDeepIgnoreArray<RangeChartWidgetSettings>({} as RangeChartWidgetSettings, rangeChartDefaultSettings);
   }
 
   protected onSettingsSet(settings: WidgetSettings) {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
index 45180387d3..0db430c943 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
@@ -108,8 +108,8 @@ export class ColorRangeSettingsComponent implements OnInit, ControlValueAccessor
     this.updateColorStyle();
   }
 
-  writeValue(value: Array<ColorRange>): void {
-    this.modelValue = ('range' in value) ? value.range as Array<ColorRange> : value;
+  writeValue(value: Array<ColorRange> | ColorRangeSettings): void {
+    this.modelValue = Array.isArray(value) ? value : value.range;
     this.updateColorStyle();
   }
 
diff --git a/ui-ngx/src/app/shared/models/widget.models.ts b/ui-ngx/src/app/shared/models/widget.models.ts
index 050c655de9..b4b47cd75f 100644
--- a/ui-ngx/src/app/shared/models/widget.models.ts
+++ b/ui-ngx/src/app/shared/models/widget.models.ts
@@ -37,7 +37,7 @@ import { AbstractControl, UntypedFormGroup } from '@angular/forms';
 import { Observable } from 'rxjs';
 import { Dashboard } from '@shared/models/dashboard.models';
 import { IAliasController } from '@core/api/widget-api.models';
-import { isNotEmptyStr, mergeDeep } from '@core/utils';
+import { isNotEmptyStr, mergeDeepIgnoreArray } from '@core/utils';
 import { WidgetConfigComponentData } from '@home/models/widget-component.models';
 import { ComponentStyle, Font, TimewindowStyle } from '@shared/models/widget-settings.models';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
@@ -878,7 +878,7 @@ export abstract class WidgetSettingsComponent extends PageComponent implements
     if (!value) {
       this.settingsValue = this.defaultSettings();
     } else {
-      this.settingsValue = mergeDeep(this.defaultSettings(), value);
+      this.settingsValue = mergeDeepIgnoreArray(this.defaultSettings(), value);
     }
     if (!this.settingsSet) {
       this.settingsSet = true;

From aa23fa27229ae3d7b68bfe7a8f8a033f087f02f2 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 1 Jul 2024 15:10:14 +0300
Subject: [PATCH 08/22] UI: Refactoring function name

---
 ui-ngx/src/app/core/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index f1283523e1..a534f157b7 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -364,14 +364,14 @@ export function mergeDeep<T>(target: T, ...sources: T[]): T {
   return _.merge(target, ...sources);
 }
 
-function customizer(target: any, sources: any) {
+function ignoreArrayMergeFunc(target: any, sources: any) {
   if (_.isArray(target)) {
     return sources;
   }
 }
 
 export function mergeDeepIgnoreArray<T>(target: T, ...sources: T[]): T {
-  return _.mergeWith(target, ...sources, customizer);
+  return _.mergeWith(target, ...sources, ignoreArrayMergeFunc);
 }
 
 export function guid(): string {

From 17fdef4ce116184095a3c94b012785413adc42e7 Mon Sep 17 00:00:00 2001
From: Artem Dzhereleiko <Dgerik2015@gmail.com>
Date: Mon, 1 Jul 2024 17:00:21 +0300
Subject: [PATCH 09/22] UI: Refactoring

---
 .../lib/settings/common/color-range-panel.component.ts      | 6 +++---
 .../lib/settings/common/color-range-settings.component.ts   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-panel.component.ts
index b4baf12dad..18ec18963f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-panel.component.ts
@@ -16,7 +16,7 @@
 
 import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { PageComponent } from '@shared/components/page.component';
-import { ColorRange } from '@shared/models/widget-settings.models';
+import { ColorRange, ColorRangeSettings } from '@shared/models/widget-settings.models';
 import { TbPopoverComponent } from '@shared/components/popover.component';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { Store } from '@ngrx/store';
@@ -71,8 +71,8 @@ export class ColorRangePanelComponent extends PageComponent implements OnInit {
   }
 
   applyColorRangeSettings() {
-    const colorRangeSettings = this.colorRangeFormGroup.get('rangeList').value;
-    this.colorRangeApplied.emit(colorRangeSettings);
+    const colorRangeSettings: ColorRangeSettings = this.colorRangeFormGroup.get('rangeList').value;
+    this.colorRangeApplied.emit(colorRangeSettings.range);
   }
 
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
index 0db430c943..54c8be65b8 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/color-range-settings.component.ts
@@ -131,9 +131,9 @@ export class ColorRangeSettingsComponent implements OnInit, ControlValueAccessor
         {},
         {}, {}, true);
       colorRangeSettingsPanelPopover.tbComponentRef.instance.popover = colorRangeSettingsPanelPopover;
-      colorRangeSettingsPanelPopover.tbComponentRef.instance.colorRangeApplied.subscribe((colorRangeSettings: ColorRangeSettings) => {
+      colorRangeSettingsPanelPopover.tbComponentRef.instance.colorRangeApplied.subscribe((colorRangeSettings: Array<ColorRange>) => {
         colorRangeSettingsPanelPopover.hide();
-        this.modelValue = colorRangeSettings.range;
+        this.modelValue = colorRangeSettings;
         this.updateColorStyle();
         this.propagateChange(this.modelValue);
       });

From 31e1d082f26dc991a9243288f30ad30fce54c3f2 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 3 Jul 2024 12:35:13 +0300
Subject: [PATCH 10/22] Proper error message when deleting dashboard referenced
 by asset profile

---
 .../controller/DashboardControllerTest.java   | 31 +++++++++++++++++++
 .../dao/dashboard/DashboardServiceImpl.java   | 15 +++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
index 7e1b9b30c9..d427c26d05 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
@@ -27,13 +27,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.DashboardInfo;
+import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.ShortCustomerInfo;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -48,6 +51,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -547,6 +551,33 @@ public class DashboardControllerTest extends AbstractControllerTest {
         testEntityDaoWithRelationsTransactionalException(dashboardDao, savedTenant.getId(), dashboardId, "/api/dashboard/" + dashboardId);
     }
 
+    @Test
+    public void whenDeletingDashboard_ifReferencedByDeviceProfile_thenReturnError() throws Exception {
+        Dashboard dashboard = createDashboard("test");
+        DeviceProfile deviceProfile = createDeviceProfile("test");
+        deviceProfile.setDefaultDashboardId(dashboard.getId());
+        doPost("/api/deviceProfile", deviceProfile, DeviceProfile.class);
+
+        String response = doDelete("/api/dashboard/" + dashboard.getUuidId()).andExpect(status().isBadRequest())
+                .andReturn().getResponse().getContentAsString();
+        String errorMessage = JacksonUtil.toJsonNode(response).get("message").asText();
+        assertThat(errorMessage).containsIgnoringCase("referenced by a device profile");
+    }
+
+    @Test
+    public void whenDeletingDashboard_ifReferencedByAssetProfile_thenReturnError() throws Exception {
+        Dashboard dashboard = createDashboard("test");
+        AssetProfile assetProfile = createAssetProfile("test");
+        assetProfile.setDefaultDashboardId(dashboard.getId());
+        doPost("/api/assetProfile", assetProfile, AssetProfile.class);
+
+        String response = doDelete("/api/dashboard/" + dashboard.getUuidId()).andExpect(status().isBadRequest())
+                .andReturn().getResponse().getContentAsString();
+        String errorMessage = JacksonUtil.toJsonNode(response).get("message").asText();
+        assertThat(errorMessage).containsIgnoringCase("referenced by an asset profile");
+
+    }
+
     private Dashboard createDashboard(String title) {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle(title);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
index 6a0de28bf2..5c7430ebc8 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
@@ -18,7 +18,6 @@ package org.thingsboard.server.dao.dashboard;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.hibernate.exception.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
@@ -57,6 +56,7 @@ import org.thingsboard.server.dao.service.Validator;
 import org.thingsboard.server.dao.sql.JpaExecutorService;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static org.thingsboard.server.dao.service.Validator.validateId;
@@ -235,13 +235,12 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
             publishEvictEvent(new DashboardTitleEvictEvent(dashboardId));
             countService.publishCountEntityEvictEvent(tenantId, EntityType.DASHBOARD);
             eventPublisher.publishEvent(DeleteEntityEvent.builder().tenantId(tenantId).entityId(dashboardId).build());
-        } catch (Exception t) {
-            ConstraintViolationException e = extractConstraintViolationException(t).orElse(null);
-            if (e != null && e.getConstraintName() != null && e.getConstraintName().equalsIgnoreCase("fk_default_dashboard_device_profile")) {
-                throw new DataValidationException("The dashboard referenced by the device profiles cannot be deleted!");
-            } else {
-                throw t;
-            }
+        } catch (Exception e) {
+            checkConstraintViolation(e, Map.of(
+                    "fk_default_dashboard_device_profile", "The dashboard is referenced by a device profile",
+                    "fk_default_dashboard_asset_profile", "The dashboard is referenced by an asset profile"
+            ));
+            throw e;
         }
     }
 

From 3e509630052e080afa6b2789f33a681c1b5a0d24 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 3 Jul 2024 12:37:13 +0300
Subject: [PATCH 11/22] Return error details for unhandled
 ConstraintViolationException; log tenant and user ids on failure

---
 .../server/controller/BaseController.java     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
index 0942329f40..f9d1fe7a2f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -22,6 +22,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.ConstraintViolation;
 import lombok.Getter;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.hibernate.exception.ConstraintViolationException;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -358,29 +359,33 @@ public abstract class BaseController {
 
     private ThingsboardException handleException(Exception exception, boolean logException) {
         if (logException && logControllerErrorStackTrace) {
-            log.error("Error [{}]", exception.getMessage(), exception);
-        }
-
-        String cause = "";
-        if (exception.getCause() != null) {
-            cause = exception.getCause().getClass().getCanonicalName();
+            try {
+                SecurityUser user = getCurrentUser();
+                log.error("[{}][{}] Error", user.getTenantId(), user.getId(), exception);
+            } catch (Exception e) {
+                log.error("Error", exception);
+            }
         }
 
+        Throwable cause = exception.getCause();
         if (exception instanceof ThingsboardException) {
             return (ThingsboardException) exception;
         } else if (exception instanceof IllegalArgumentException || exception instanceof IncorrectParameterException
-                || exception instanceof DataValidationException || cause.contains("IncorrectParameterException")) {
+                || exception instanceof DataValidationException || cause instanceof IncorrectParameterException) {
             return new ThingsboardException(exception.getMessage(), ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         } else if (exception instanceof MessagingException) {
             return new ThingsboardException("Unable to send mail: " + exception.getMessage(), ThingsboardErrorCode.GENERAL);
         } else if (exception instanceof AsyncRequestTimeoutException) {
             return new ThingsboardException("Request timeout", ThingsboardErrorCode.GENERAL);
         } else if (exception instanceof DataAccessException) {
-            String errorType = exception.getClass().getSimpleName();
             if (!logControllerErrorStackTrace) { // not to log the error twice
-                log.warn("Database error: {} - {}", errorType, ExceptionUtils.getRootCauseMessage(exception));
+                log.warn("Database error: {} - {}", exception.getClass().getSimpleName(), ExceptionUtils.getRootCauseMessage(exception));
+            }
+            if (cause instanceof ConstraintViolationException) {
+                return new ThingsboardException(ExceptionUtils.getRootCause(exception).getMessage(), ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            } else {
+                return new ThingsboardException("Database error", ThingsboardErrorCode.GENERAL);
             }
-            return new ThingsboardException("Database error", ThingsboardErrorCode.GENERAL);
         }
         return new ThingsboardException(exception.getMessage(), exception, ThingsboardErrorCode.GENERAL);
     }

From 1d79f1e213f07ac2eddfe179e9a837947b3810fd Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 4 Jul 2024 11:42:15 +0200
Subject: [PATCH 12/22] send resourse change/delete events only for lwm2m

---
 .../queue/DefaultTbClusterService.java        | 58 +++++++++++++------
 .../service/DefaultTransportService.java      |  6 +-
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
index bce5dece3b..612d10a976 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
@@ -24,12 +24,14 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.ApiUsageState;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasRuleEngineProfile;
+import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
@@ -340,29 +342,33 @@ public class DefaultTbClusterService implements TbClusterService {
 
     @Override
     public void onResourceChange(TbResourceInfo resource, TbQueueCallback callback) {
-        TenantId tenantId = resource.getTenantId();
-        log.trace("[{}][{}][{}] Processing change resource", tenantId, resource.getResourceType(), resource.getResourceKey());
-        TransportProtos.ResourceUpdateMsg resourceUpdateMsg = TransportProtos.ResourceUpdateMsg.newBuilder()
-                .setTenantIdMSB(tenantId.getId().getMostSignificantBits())
-                .setTenantIdLSB(tenantId.getId().getLeastSignificantBits())
-                .setResourceType(resource.getResourceType().name())
-                .setResourceKey(resource.getResourceKey())
-                .build();
-        ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setResourceUpdateMsg(resourceUpdateMsg).build();
-        broadcast(transportMsg, callback);
+        if (resource.getResourceType() == ResourceType.LWM2M_MODEL) {
+            TenantId tenantId = resource.getTenantId();
+            log.trace("[{}][{}][{}] Processing change resource", tenantId, resource.getResourceType(), resource.getResourceKey());
+            TransportProtos.ResourceUpdateMsg resourceUpdateMsg = TransportProtos.ResourceUpdateMsg.newBuilder()
+                    .setTenantIdMSB(tenantId.getId().getMostSignificantBits())
+                    .setTenantIdLSB(tenantId.getId().getLeastSignificantBits())
+                    .setResourceType(resource.getResourceType().name())
+                    .setResourceKey(resource.getResourceKey())
+                    .build();
+            ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setResourceUpdateMsg(resourceUpdateMsg).build();
+            broadcast(transportMsg, DataConstants.LWM2M_TRANSPORT_NAME, callback);
+        }
     }
 
     @Override
     public void onResourceDeleted(TbResourceInfo resource, TbQueueCallback callback) {
-        log.trace("[{}] Processing delete resource", resource);
-        TransportProtos.ResourceDeleteMsg resourceUpdateMsg = TransportProtos.ResourceDeleteMsg.newBuilder()
-                .setTenantIdMSB(resource.getTenantId().getId().getMostSignificantBits())
-                .setTenantIdLSB(resource.getTenantId().getId().getLeastSignificantBits())
-                .setResourceType(resource.getResourceType().name())
-                .setResourceKey(resource.getResourceKey())
-                .build();
-        ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setResourceDeleteMsg(resourceUpdateMsg).build();
-        broadcast(transportMsg, callback);
+        if (resource.getResourceType() == ResourceType.LWM2M_MODEL) {
+            log.trace("[{}] Processing delete resource", resource);
+            TransportProtos.ResourceDeleteMsg resourceUpdateMsg = TransportProtos.ResourceDeleteMsg.newBuilder()
+                    .setTenantIdMSB(resource.getTenantId().getId().getMostSignificantBits())
+                    .setTenantIdLSB(resource.getTenantId().getId().getLeastSignificantBits())
+                    .setResourceType(resource.getResourceType().name())
+                    .setResourceKey(resource.getResourceKey())
+                    .build();
+            ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setResourceDeleteMsg(resourceUpdateMsg).build();
+            broadcast(transportMsg, DataConstants.LWM2M_TRANSPORT_NAME, callback);
+        }
     }
 
     private <T> void broadcastEntityChangeToTransport(TenantId tenantId, EntityId entityid, T entity, TbQueueCallback callback) {
@@ -394,6 +400,20 @@ public class DefaultTbClusterService implements TbClusterService {
         }
     }
 
+    private void broadcast(ToTransportMsg transportMsg, String transportType, TbQueueCallback callback) {
+        TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> toTransportNfProducer = producerProvider.getTransportNotificationsMsgProducer();
+        Set<TransportProtos.ServiceInfo> tbTransportInfos = partitionService.getAllServices(ServiceType.TB_TRANSPORT);
+        TbQueueCallback proxyCallback = callback != null ? new MultipleTbQueueCallbackWrapper(tbTransportInfos.size(), callback) : null;
+        tbTransportInfos.stream()
+                .filter(info -> info.getTransportsList().contains(transportType))
+                .map(TransportProtos.ServiceInfo::getServiceId)
+                .forEach(transportServiceId -> {
+                    TopicPartitionInfo tpi = topicService.getNotificationsTopic(ServiceType.TB_TRANSPORT, transportServiceId);
+                    toTransportNfProducer.send(tpi, new TbProtoQueueMsg<>(UUID.randomUUID(), transportMsg), proxyCallback);
+                    toTransportNfs.incrementAndGet();
+                });
+    }
+
     @Override
     public void onEdgeEventUpdate(TenantId tenantId, EdgeId edgeId) {
         log.trace("[{}] Processing edge {} event update ", tenantId, edgeId);
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
index cc91baca0c..a422fe3a36 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
@@ -931,7 +931,7 @@ public class DefaultTransportService extends TransportActivityManager implements
                     rateLimitService.remove(new DeviceId(entityUuid));
                     onDeviceDeleted(new DeviceId(entityUuid));
                 }
-            } else if (toSessionMsg.hasResourceUpdateMsg()) {
+            } else if (toSessionMsg.hasResourceUpdateMsg() && serviceInfoProvider.getServiceInfo().getTransportsList().contains(DataConstants.LWM2M_TRANSPORT_NAME)) {
                 TransportProtos.ResourceUpdateMsg msg = toSessionMsg.getResourceUpdateMsg();
                 TenantId tenantId = TenantId.fromUUID(new UUID(msg.getTenantIdMSB(), msg.getTenantIdLSB()));
                 ResourceType resourceType = ResourceType.valueOf(msg.getResourceType());
@@ -941,14 +941,14 @@ public class DefaultTransportService extends TransportActivityManager implements
                     log.trace("ResourceUpdate - [{}] [{}]", id, mdRez);
                     transportCallbackExecutor.submit(() -> mdRez.getListener().onResourceUpdate(msg));
                 });
-            } else if (toSessionMsg.hasResourceDeleteMsg()) {
+            } else if (toSessionMsg.hasResourceDeleteMsg() && serviceInfoProvider.getServiceInfo().getTransportsList().contains(DataConstants.LWM2M_TRANSPORT_NAME)) {
                 TransportProtos.ResourceDeleteMsg msg = toSessionMsg.getResourceDeleteMsg();
                 TenantId tenantId = TenantId.fromUUID(new UUID(msg.getTenantIdMSB(), msg.getTenantIdLSB()));
                 ResourceType resourceType = ResourceType.valueOf(msg.getResourceType());
                 String resourceId = msg.getResourceKey();
                 transportResourceCache.evict(tenantId, resourceType, resourceId);
                 sessions.forEach((id, mdRez) -> {
-                    log.warn("ResourceDelete - [{}] [{}]", id, mdRez);
+                    log.trace("ResourceDelete - [{}] [{}]", id, mdRez);
                     transportCallbackExecutor.submit(() -> mdRez.getListener().onResourceDelete(msg));
                 });
             } else if (toSessionMsg.getQueueUpdateMsgsCount() > 0) {

From 6c00802d818ab07ae01801ead47b00b640cf4600 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 4 Jul 2024 12:53:21 +0200
Subject: [PATCH 13/22] removed redundant check

---
 .../common/transport/service/DefaultTransportService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
index a422fe3a36..8e48061db6 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
@@ -931,7 +931,7 @@ public class DefaultTransportService extends TransportActivityManager implements
                     rateLimitService.remove(new DeviceId(entityUuid));
                     onDeviceDeleted(new DeviceId(entityUuid));
                 }
-            } else if (toSessionMsg.hasResourceUpdateMsg() && serviceInfoProvider.getServiceInfo().getTransportsList().contains(DataConstants.LWM2M_TRANSPORT_NAME)) {
+            } else if (toSessionMsg.hasResourceUpdateMsg()) {
                 TransportProtos.ResourceUpdateMsg msg = toSessionMsg.getResourceUpdateMsg();
                 TenantId tenantId = TenantId.fromUUID(new UUID(msg.getTenantIdMSB(), msg.getTenantIdLSB()));
                 ResourceType resourceType = ResourceType.valueOf(msg.getResourceType());
@@ -941,7 +941,7 @@ public class DefaultTransportService extends TransportActivityManager implements
                     log.trace("ResourceUpdate - [{}] [{}]", id, mdRez);
                     transportCallbackExecutor.submit(() -> mdRez.getListener().onResourceUpdate(msg));
                 });
-            } else if (toSessionMsg.hasResourceDeleteMsg() && serviceInfoProvider.getServiceInfo().getTransportsList().contains(DataConstants.LWM2M_TRANSPORT_NAME)) {
+            } else if (toSessionMsg.hasResourceDeleteMsg()) {
                 TransportProtos.ResourceDeleteMsg msg = toSessionMsg.getResourceDeleteMsg();
                 TenantId tenantId = TenantId.fromUUID(new UUID(msg.getTenantIdMSB(), msg.getTenantIdLSB()));
                 ResourceType resourceType = ResourceType.valueOf(msg.getResourceType());

From 92845f60b6e4f50624b8edf1a01d8c1b6840a0f2 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 4 Jul 2024 13:13:13 +0200
Subject: [PATCH 14/22] minor refactoring

---
 .../server/service/queue/DefaultTbClusterService.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
index 612d10a976..354e8dce04 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
@@ -360,13 +360,13 @@ public class DefaultTbClusterService implements TbClusterService {
     public void onResourceDeleted(TbResourceInfo resource, TbQueueCallback callback) {
         if (resource.getResourceType() == ResourceType.LWM2M_MODEL) {
             log.trace("[{}] Processing delete resource", resource);
-            TransportProtos.ResourceDeleteMsg resourceUpdateMsg = TransportProtos.ResourceDeleteMsg.newBuilder()
+            TransportProtos.ResourceDeleteMsg resourceDeleteMsg = TransportProtos.ResourceDeleteMsg.newBuilder()
                     .setTenantIdMSB(resource.getTenantId().getId().getMostSignificantBits())
                     .setTenantIdLSB(resource.getTenantId().getId().getLeastSignificantBits())
                     .setResourceType(resource.getResourceType().name())
                     .setResourceKey(resource.getResourceKey())
                     .build();
-            ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setResourceDeleteMsg(resourceUpdateMsg).build();
+            ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setResourceDeleteMsg(resourceDeleteMsg).build();
             broadcast(transportMsg, DataConstants.LWM2M_TRANSPORT_NAME, callback);
         }
     }

From 88af44870efc5c14b815a1e6d0f81b36693ed657 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Thu, 4 Jul 2024 14:22:32 +0300
Subject: [PATCH 15/22] Check for queueName emptiness on partition resolve

---
 .../server/controller/TenantControllerTest.java          | 9 +++++++++
 .../server/queue/discovery/HashPartitionService.java     | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
index 3160d542f1..14e597378c 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
@@ -616,6 +616,14 @@ public class TenantControllerTest extends AbstractControllerTest {
             assertThat(usedTpi.getTopic()).isEqualTo(DataConstants.HP_QUEUE_TOPIC);
             assertThat(usedTpi.getTenantId()).get().isEqualTo(TenantId.SYS_TENANT_ID);
         });
+        assertThat(partitionService.resolve(ServiceType.TB_RULE_ENGINE, null, tenantId, tenantId)).satisfies(tpi -> {
+            assertThat(tpi.getTopic()).isEqualTo(MAIN_QUEUE_TOPIC);
+            assertThat(tpi.getTenantId()).get().isEqualTo(tenantId);
+        });
+        assertThat(partitionService.resolve(ServiceType.TB_RULE_ENGINE, "", tenantId, tenantId)).satisfies(tpi -> {
+            assertThat(tpi.getTopic()).isEqualTo(MAIN_QUEUE_TOPIC);
+            assertThat(tpi.getTenantId()).get().isEqualTo(tenantId);
+        });
 
         loginSysAdmin();
         tenantProfile.setIsolatedTbRuleEngine(true);
@@ -850,4 +858,5 @@ public class TenantControllerTest extends AbstractControllerTest {
         testBroadcastEntityStateChangeEventNever(createEntityId_NULL_UUID(new Tenant()));
         Mockito.reset(tbClusterService);
     }
+
 }
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java
index 04d55f91c0..53a2152782 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/HashPartitionService.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.queue.discovery;
 
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
+import jakarta.annotation.PostConstruct;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -36,7 +37,6 @@ import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.discovery.event.ServiceListChangedEvent;
 import org.thingsboard.server.queue.util.AfterStartUp;
 
-import jakarta.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -319,7 +319,7 @@ public class HashPartitionService implements PartitionService {
 
     private QueueKey getQueueKey(ServiceType serviceType, String queueName, TenantId tenantId) {
         TenantId isolatedOrSystemTenantId = getIsolatedOrSystemTenantId(serviceType, tenantId);
-        if (queueName == null) {
+        if (queueName == null || queueName.isEmpty()) {
             queueName = MAIN_QUEUE_NAME;
         }
         QueueKey queueKey = new QueueKey(serviceType, queueName, isolatedOrSystemTenantId);
@@ -672,6 +672,7 @@ public class HashPartitionService implements PartitionService {
         public QueueConfig(QueueRoutingInfo queueRoutingInfo) {
             this.duplicateMsgToAllPartitions = queueRoutingInfo.isDuplicateMsgToAllPartitions();
         }
+
     }
 
 }

From be608445eb9960c3e198596b3eeeeda837ee4857 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Thu, 4 Jul 2024 13:35:53 +0200
Subject: [PATCH 16/22] minor improvements due to comments

---
 .../queue/DefaultTbClusterService.java        | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
index 354e8dce04..eabec663a3 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java
@@ -359,7 +359,7 @@ public class DefaultTbClusterService implements TbClusterService {
     @Override
     public void onResourceDeleted(TbResourceInfo resource, TbQueueCallback callback) {
         if (resource.getResourceType() == ResourceType.LWM2M_MODEL) {
-            log.trace("[{}] Processing delete resource", resource);
+            log.trace("[{}][{}][{}] Processing delete resource", resource.getTenantId(), resource.getResourceType(), resource.getResourceKey());
             TransportProtos.ResourceDeleteMsg resourceDeleteMsg = TransportProtos.ResourceDeleteMsg.newBuilder()
                     .setTenantIdMSB(resource.getTenantId().getId().getMostSignificantBits())
                     .setTenantIdLSB(resource.getTenantId().getId().getLeastSignificantBits())
@@ -390,8 +390,19 @@ public class DefaultTbClusterService implements TbClusterService {
     }
 
     private void broadcast(ToTransportMsg transportMsg, TbQueueCallback callback) {
-        TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> toTransportNfProducer = producerProvider.getTransportNotificationsMsgProducer();
         Set<String> tbTransportServices = partitionService.getAllServiceIds(ServiceType.TB_TRANSPORT);
+        broadcast(transportMsg, tbTransportServices, callback);
+    }
+
+    private void broadcast(ToTransportMsg transportMsg, String transportType, TbQueueCallback callback) {
+        Set<String> tbTransportServices = partitionService.getAllServices(ServiceType.TB_TRANSPORT).stream()
+                .filter(info -> info.getTransportsList().contains(transportType))
+                .map(TransportProtos.ServiceInfo::getServiceId).collect(Collectors.toSet());
+        broadcast(transportMsg, tbTransportServices, callback);
+    }
+
+    private void broadcast(ToTransportMsg transportMsg, Set<String> tbTransportServices, TbQueueCallback callback) {
+        TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> toTransportNfProducer = producerProvider.getTransportNotificationsMsgProducer();
         TbQueueCallback proxyCallback = callback != null ? new MultipleTbQueueCallbackWrapper(tbTransportServices.size(), callback) : null;
         for (String transportServiceId : tbTransportServices) {
             TopicPartitionInfo tpi = topicService.getNotificationsTopic(ServiceType.TB_TRANSPORT, transportServiceId);
@@ -400,20 +411,6 @@ public class DefaultTbClusterService implements TbClusterService {
         }
     }
 
-    private void broadcast(ToTransportMsg transportMsg, String transportType, TbQueueCallback callback) {
-        TbQueueProducer<TbProtoQueueMsg<ToTransportMsg>> toTransportNfProducer = producerProvider.getTransportNotificationsMsgProducer();
-        Set<TransportProtos.ServiceInfo> tbTransportInfos = partitionService.getAllServices(ServiceType.TB_TRANSPORT);
-        TbQueueCallback proxyCallback = callback != null ? new MultipleTbQueueCallbackWrapper(tbTransportInfos.size(), callback) : null;
-        tbTransportInfos.stream()
-                .filter(info -> info.getTransportsList().contains(transportType))
-                .map(TransportProtos.ServiceInfo::getServiceId)
-                .forEach(transportServiceId -> {
-                    TopicPartitionInfo tpi = topicService.getNotificationsTopic(ServiceType.TB_TRANSPORT, transportServiceId);
-                    toTransportNfProducer.send(tpi, new TbProtoQueueMsg<>(UUID.randomUUID(), transportMsg), proxyCallback);
-                    toTransportNfs.incrementAndGet();
-                });
-    }
-
     @Override
     public void onEdgeEventUpdate(TenantId tenantId, EdgeId edgeId) {
         log.trace("[{}] Processing edge {} event update ", tenantId, edgeId);

From 14bb7fd2f785c66a0daba3085637ab731770b0ec Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 5 Jul 2024 14:56:49 +0200
Subject: [PATCH 17/22] fixed enable/disable swagger

---
 .../org/thingsboard/server/config/SwaggerConfiguration.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
index 963205c08b..1ae6da9f4b 100644
--- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
@@ -48,6 +48,7 @@ import org.springdoc.core.models.GroupedOpenApi;
 import org.springdoc.core.properties.SpringDocConfigProperties;
 import org.springdoc.core.properties.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -62,7 +63,6 @@ import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.exception.ThingsboardCredentialsExpiredResponse;
 import org.thingsboard.server.exception.ThingsboardErrorResponse;
-import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.auth.rest.LoginRequest;
 import org.thingsboard.server.service.security.auth.rest.LoginResponse;
 
@@ -79,7 +79,7 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 @Slf4j
 @Configuration
-@TbCoreComponent
+@ConditionalOnExpression("('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core') && '${springdoc.api-docs.enabled:true}'=='true'")
 @Profile("!test")
 public class SwaggerConfiguration {
 

From f69198e2b6d2deae91541f650aeccedd59205576 Mon Sep 17 00:00:00 2001
From: ShvaykaD <dshvaika@thingsboard.io>
Date: Fri, 5 Jul 2024 17:02:10 +0300
Subject: [PATCH 18/22] fixed NPE in calculate delta node & fixed false
 positive tests

---
 .../engine/metadata/CalculateDeltaNode.java   |  7 +++++--
 .../metadata/CalculateDeltaNodeTest.java      | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
index ac1741d044..329fa46c3b 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java
@@ -181,8 +181,11 @@ public class CalculateDeltaNode implements TbNode {
 
     private ListenableFuture<ValueWithTs> getLatestFromCacheOrFetchFromDb(TbContext ctx, TbMsg msg) {
         EntityId originator = msg.getOriginator();
-        ValueWithTs valueWithTs = cache.get(msg.getOriginator());
-        return valueWithTs != null ? Futures.immediateFuture(valueWithTs) : fetchLatestValueAsync(ctx, originator);
+        if (config.isUseCache()) {
+            ValueWithTs valueWithTs = cache.get(msg.getOriginator());
+            return valueWithTs != null ? Futures.immediateFuture(valueWithTs) : fetchLatestValueAsync(ctx, originator);
+        }
+        return fetchLatestValueAsync(ctx, originator);
     }
 
     private record ValueWithTs(long ts, double value) {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
index c427dcbd3b..1b2ff4f2bf 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
@@ -109,7 +109,6 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
     public void setUp() throws TbNodeException {
         config = new CalculateDeltaNodeConfiguration().defaultConfiguration();
         nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
-        node.init(ctxMock, nodeConfiguration);
     }
 
     @Test
@@ -166,8 +165,9 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     @Test
-    public void givenInvalidMsgType_whenOnMsg_thenShouldTellNextOther() {
+    public void givenInvalidMsgType_whenOnMsg_thenShouldTellNextOther() throws TbNodeException {
         // GIVEN
+        node.init(ctxMock, nodeConfiguration);
         var msgData = "{\"pulseCounter\": 42}";
         var msg = TbMsg.newMsg(TbMsgType.POST_ATTRIBUTES_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, msgData);
 
@@ -181,8 +181,9 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     @Test
-    public void givenInvalidMsgDataType_whenOnMsg_thenShouldTellNextOther() {
+    public void givenInvalidMsgDataType_whenOnMsg_thenShouldTellNextOther() throws TbNodeException {
         // GIVEN
+        node.init(ctxMock, nodeConfiguration);
         var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_ARRAY);
 
         // WHEN
@@ -196,8 +197,9 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
 
 
     @Test
-    public void givenInputKeyIsNotPresent_whenOnMsg_thenShouldTellNextOther() {
+    public void givenInputKeyIsNotPresent_whenOnMsg_thenShouldTellNextOther() throws TbNodeException {
         // GIVEN
+        node.init(ctxMock, nodeConfiguration);
         var msg = TbMsg.newMsg(TbMsgType.POST_TELEMETRY_REQUEST, DUMMY_DEVICE_ORIGINATOR, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT);
 
         // WHEN
@@ -451,8 +453,9 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     @Test
-    public void givenInvalidStringValue_whenOnMsg_thenException() {
+    public void givenInvalidStringValue_whenOnMsg_thenException() throws TbNodeException {
         // GIVEN
+        node.init(ctxMock, nodeConfiguration);
         mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new StringDataEntry("pulseCounter", "high")));
 
         var msgData = "{\"pulseCounter\":\"123\"}";
@@ -475,8 +478,9 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     @Test
-    public void givenBooleanValue_whenOnMsg_thenException() {
+    public void givenBooleanValue_whenOnMsg_thenException() throws TbNodeException {
         // GIVEN
+        node.init(ctxMock, nodeConfiguration);
         mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new BooleanDataEntry("pulseCounter", false)));
 
         var msgData = "{\"pulseCounter\":true}";
@@ -499,8 +503,9 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     @Test
-    public void givenJsonValue_whenOnMsg_thenException() {
+    public void givenJsonValue_whenOnMsg_thenException() throws TbNodeException {
         // GIVEN
+        node.init(ctxMock, nodeConfiguration);
         mockFindLatestAsync(new BasicTsKvEntry(System.currentTimeMillis(), new JsonDataEntry("pulseCounter", "{\"isActive\":false}")));
 
         var msgData = "{\"pulseCounter\":{\"isActive\":true}}";

From 0984a754b6f164a35e362816aae0336fd56f9c68 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Tue, 9 Jul 2024 17:59:24 +0300
Subject: [PATCH 19/22] Fix oauth2 edge validator

---
 .../server/service/edge/EdgeEventSourcingListener.java         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
index 651339e3a4..11974d2ebc 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
@@ -204,6 +204,9 @@ public class EdgeEventSourcingListener {
                     return false;
             }
         }
+        if (entity instanceof OAuth2Info oAuth2Info) {
+            return oAuth2Info.isEdgeEnabled();
+        }
         // Default: If the entity doesn't match any of the conditions, consider it as valid.
         return true;
     }

From c3cd5e276080c3d6ab170e8c89332e366ef5f548 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Tue, 9 Jul 2024 18:05:57 +0300
Subject: [PATCH 20/22] Improve logic: add check for oauth2 event to edge on
 convertToDownlink

---
 .../service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java       | 5 ++++-
 .../edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java
index 4412f91183..982c1a8eaf 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/OAuth2EdgeEventFetcher.java
@@ -45,8 +45,11 @@ public class OAuth2EdgeEventFetcher implements EdgeEventFetcher {
 
     @Override
     public PageData<EdgeEvent> fetchEdgeEvents(TenantId tenantId, Edge edge, PageLink pageLink) {
-        List<EdgeEvent> result = new ArrayList<>();
         OAuth2Info oAuth2Info = oAuth2Service.findOAuth2Info();
+        if (!oAuth2Info.isEdgeEnabled()) {
+            return new PageData<>();
+        }
+        List<EdgeEvent> result = new ArrayList<>();
         result.add(EdgeUtils.constructEdgeEvent(tenantId, edge.getId(), EdgeEventType.OAUTH2,
                 EdgeEventActionType.ADDED, null, JacksonUtil.valueToTree(oAuth2Info)));
         // returns PageData object to be in sync with other fetchers
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
index ce0600b491..adfb6f7d9f 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/oauth2/OAuth2EdgeProcessor.java
@@ -40,7 +40,7 @@ public class OAuth2EdgeProcessor extends BaseEdgeProcessor {
     public DownlinkMsg convertOAuth2EventToDownlink(EdgeEvent edgeEvent) {
         DownlinkMsg downlinkMsg = null;
         OAuth2Info oAuth2Info = JacksonUtil.convertValue(edgeEvent.getBody(), OAuth2Info.class);
-        if (oAuth2Info != null) {
+        if (oAuth2Info != null && oAuth2Info.isEdgeEnabled()) {
             OAuth2UpdateMsg oAuth2UpdateMsg = oAuth2MsgConstructor.constructOAuth2UpdateMsg(oAuth2Info);
             downlinkMsg = DownlinkMsg.newBuilder()
                     .setDownlinkMsgId(EdgeUtils.nextPositiveInt())

From bee9cfef9cace946924139d20b4177da42ebd8ff Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Tue, 9 Jul 2024 17:40:41 +0200
Subject: [PATCH 21/22] added ability to change swagger group name (definition)

---
 .../org/thingsboard/server/config/SwaggerConfiguration.java  | 5 +++--
 application/src/main/resources/thingsboard.yml               | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
index 963205c08b..930db24a25 100644
--- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
@@ -113,7 +113,8 @@ public class SwaggerConfiguration {
     private String version;
     @Value("${app.version:unknown}")
     private String appVersion;
-
+    @Value("${swagger.group_name}")
+    private String groupName;
 
     @Bean
     public OpenAPI thingsboardApi() {
@@ -212,7 +213,7 @@ public class SwaggerConfiguration {
     @Bean
     public GroupedOpenApi groupedApi(SpringDocParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
         return GroupedOpenApi.builder()
-                .group("thingsboard")
+                .group(groupName)
                 .pathsToMatch(apiPath)
                 .addRouterOperationCustomizer(routerOperationCustomizer(localSpringDocParameterNameDiscoverer))
                 .addOperationCustomizer(operationCustomizer())
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 4e5458bd18..03a0a4f849 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -1385,6 +1385,8 @@ swagger:
     url: "${SWAGGER_LICENSE_URL:https://github.com/thingsboard/thingsboard/blob/master/LICENSE}"
   # The version of the API doc to display. Default to the package version.
   version: "${SWAGGER_VERSION:}"
+  # The group name (definition) on the API doc UI page.
+  group_name: "${SWAGGER_GROUP_NAME:thingsboard}"
 
 # Queue configuration parameters
 queue:

From 138f95e1c0c2d8461e4466609d6f4d57f72a6dbd Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Wed, 10 Jul 2024 10:34:06 +0300
Subject: [PATCH 22/22] Default prop value for Swagger group name

---
 .../org/thingsboard/server/config/SwaggerConfiguration.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
index 930db24a25..1c6309627c 100644
--- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
+++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java
@@ -113,7 +113,7 @@ public class SwaggerConfiguration {
     private String version;
     @Value("${app.version:unknown}")
     private String appVersion;
-    @Value("${swagger.group_name}")
+    @Value("${swagger.group_name:thingsboard}")
     private String groupName;
 
     @Bean