From ef91b66b6ac0ddcdf5cf4d772093a2079d1e5b5a Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Thu, 13 Oct 2022 10:46:28 +0300
Subject: [PATCH] Added default dashboard id to asset profile

---
 .../edge/rpc/constructor/AssetProfileMsgConstructor.java    | 6 ++++--
 common/edge-api/src/main/proto/edge.proto                   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetProfileMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetProfileMsgConstructor.java
index 86eb106f02..ec71217955 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetProfileMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AssetProfileMsgConstructor.java
@@ -16,13 +16,11 @@
 package org.thingsboard.server.service.edge.rpc.constructor;
 
 import com.google.protobuf.ByteString;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.gen.edge.v1.AssetProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
-import org.thingsboard.server.queue.util.DataDecodingEncodingService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
 import java.nio.charset.StandardCharsets;
@@ -38,6 +36,10 @@ public class AssetProfileMsgConstructor {
                 .setIdLSB(assetProfile.getId().getId().getLeastSignificantBits())
                 .setName(assetProfile.getName())
                 .setDefault(assetProfile.isDefault());
+        if (assetProfile.getDefaultDashboardId() != null) {
+            builder.setDefaultDashboardIdMSB(assetProfile.getDefaultDashboardId().getId().getMostSignificantBits())
+                    .setDefaultDashboardIdLSB(assetProfile.getDefaultDashboardId().getId().getLeastSignificantBits());
+        }
         if (assetProfile.getDefaultQueueName() != null) {
             builder.setDefaultQueueName(assetProfile.getDefaultQueueName());
         }
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 01c5d25d5a..6333184c56 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -233,8 +233,10 @@ message AssetProfileUpdateMsg {
   bool default = 6;
   int64 defaultRuleChainIdMSB = 7;
   int64 defaultRuleChainIdLSB = 8;
-  optional string defaultQueueName = 9;
-  optional bytes image = 10;
+  int64 defaultDashboardIdMSB = 9;
+  int64 defaultDashboardIdLSB = 10;
+  optional string defaultQueueName = 11;
+  optional bytes image = 12;
 }
 
 message DeviceCredentialsUpdateMsg {