From 6702aabc314c21b91a70ec2d74b1b1a35719836c Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Mon, 19 Jul 2021 19:01:35 +0300
Subject: [PATCH] Added image field for device profile and description field
 for widget bundle

---
 .../edge/rpc/constructor/DeviceProfileMsgConstructor.java    | 5 +++++
 .../edge/rpc/constructor/WidgetsBundleMsgConstructor.java    | 3 +++
 common/edge-api/src/main/proto/edge.proto                    | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java
index a4ab0167a2..965b7c9e67 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/DeviceProfileMsgConstructor.java
@@ -25,6 +25,8 @@ import org.thingsboard.server.gen.edge.v1.DeviceProfileUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
+import java.nio.charset.StandardCharsets;
+
 @Component
 @TbCoreComponent
 public class DeviceProfileMsgConstructor {
@@ -61,6 +63,9 @@ public class DeviceProfileMsgConstructor {
         if (deviceProfile.getProvisionDeviceKey() != null) {
             builder.setProvisionDeviceKey(deviceProfile.getProvisionDeviceKey());
         }
+        if (deviceProfile.getImage() != null) {
+            builder.setImage(ByteString.copyFrom(deviceProfile.getImage().getBytes(StandardCharsets.UTF_8)));
+        }
         return builder.build();
     }
 
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleMsgConstructor.java
index 7412fffcae..7a2a9d00cd 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleMsgConstructor.java
@@ -40,6 +40,9 @@ public class WidgetsBundleMsgConstructor {
         if (widgetsBundle.getImage() != null) {
             builder.setImage(ByteString.copyFrom(widgetsBundle.getImage().getBytes(StandardCharsets.UTF_8)));
         }
+        if (widgetsBundle.getDescription() != null) {
+            builder.setDescription(widgetsBundle.getDescription());
+        }
         if (widgetsBundle.getTenantId().equals(TenantId.SYS_TENANT_ID)) {
             builder.setIsSystem(true);
         }
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 52f1c76f61..9e0a180dcf 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -210,6 +210,7 @@ message DeviceProfileUpdateMsg {
   string defaultQueueName = 12;
   bytes profileDataBytes = 13;
   string provisionDeviceKey = 14;
+  bytes image = 15;
 }
 
 message DeviceCredentialsUpdateMsg {
@@ -312,6 +313,7 @@ message WidgetsBundleUpdateMsg {
   string alias = 5;
   bytes image = 6;
   bool isSystem = 7;
+  string description = 8;
 }
 
 message WidgetTypeUpdateMsg {