From ace148884c1dbe993597e63029971d5395448aaf Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 26 Dec 2023 15:41:56 +0200
Subject: [PATCH 1/4] UI: Image Gallery: Hide overlay buttons from image card
 in selection mode.

---
 .../app/shared/components/image/image-gallery.component.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/components/image/image-gallery.component.html b/ui-ngx/src/app/shared/components/image/image-gallery.component.html
index 43a1b39a52..78d2e4b788 100644
--- a/ui-ngx/src/app/shared/components/image/image-gallery.component.html
+++ b/ui-ngx/src/app/shared/components/image/image-gallery.component.html
@@ -324,7 +324,7 @@
 <ng-template #imageCard let-item="item" let-itemIndex="itemIndex">
   <div class="tb-image-card tb-primary-fill">
     <div class="tb-image-card-overlay">
-      <div class="tb-image-card-overlay-buttons">
+      <div *ngIf="!selectionMode" class="tb-image-card-overlay-buttons">
         <button mat-icon-button [disabled]="isLoading$ | async"
                 matTooltip="{{ 'image.download-image' | translate }}"
                 matTooltipPosition="above"

From 9a1b2c923c710093adff29d46ba0eb5f78403fa5 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 26 Dec 2023 15:46:02 +0200
Subject: [PATCH 2/4] Fixed testSyncEdge - moved creation of edge before
 device/asset creation to have time to process set edge root rule chain before
 activation

---
 .../thingsboard/server/controller/EdgeControllerTest.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
index a0b0455b9e..96c4ecde95 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
@@ -864,6 +864,8 @@ public class EdgeControllerTest extends AbstractControllerTest {
         doPost("/api/admin/jwtSettings", settings).andExpect(status().isOk());
         loginTenantAdmin();
 
+        Edge edge = doPost("/api/edge", constructEdge("Test Sync Edge", "test"), Edge.class);
+
         Asset asset = new Asset();
         asset.setName("Test Sync Edge Asset 1");
         asset.setType("test");
@@ -874,8 +876,6 @@ public class EdgeControllerTest extends AbstractControllerTest {
         device.setType("default");
         Device savedDevice = doPost("/api/device", device, Device.class);
 
-        Edge edge = doPost("/api/edge", constructEdge("Test Sync Edge", "test"), Edge.class);
-
         simulateEdgeActivation(edge);
 
         doPost("/api/edge/" + edge.getId().getId().toString()
@@ -896,6 +896,10 @@ public class EdgeControllerTest extends AbstractControllerTest {
         Assert.assertTrue(popDeviceMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "Test Sync Edge Device 1"));
         Assert.assertTrue(popAssetProfileMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "test"));
         Assert.assertTrue(popAssetMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "Test Sync Edge Asset 1"));
+        Thread.sleep(1000);
+        for (AbstractMessage downlinkMsg : edgeImitator.getDownlinkMsgs()) {
+            System.out.println(" A  " + downlinkMsg);
+        }
         Assert.assertTrue(edgeImitator.getDownlinkMsgs().isEmpty());
 
         edgeImitator.expectMessageAmount(20);

From 5915aed545aa4463c16f37093582a3115b4cf68e Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 26 Dec 2023 15:47:15 +0200
Subject: [PATCH 3/4] Code cleanup

---
 .../org/thingsboard/server/controller/EdgeControllerTest.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
index 96c4ecde95..c40955ec14 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
@@ -896,10 +896,6 @@ public class EdgeControllerTest extends AbstractControllerTest {
         Assert.assertTrue(popDeviceMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "Test Sync Edge Device 1"));
         Assert.assertTrue(popAssetProfileMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "test"));
         Assert.assertTrue(popAssetMsg(edgeImitator.getDownlinkMsgs(), UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, "Test Sync Edge Asset 1"));
-        Thread.sleep(1000);
-        for (AbstractMessage downlinkMsg : edgeImitator.getDownlinkMsgs()) {
-            System.out.println(" A  " + downlinkMsg);
-        }
         Assert.assertTrue(edgeImitator.getDownlinkMsgs().isEmpty());
 
         edgeImitator.expectMessageAmount(20);

From 22e598c36d8fe74403893ccdf8c3a6e82a7d9566 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Tue, 26 Dec 2023 18:21:34 +0200
Subject: [PATCH 4/4] Fix image's isPublic on import

---
 .../controller/ImageControllerTest.java       | 42 +++++++++----------
 .../server/common/data/ImageExportData.java   | 18 ++++----
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/ImageControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/ImageControllerTest.java
index 246eb71ace..e0eda93d58 100644
--- a/application/src/test/java/org/thingsboard/server/controller/ImageControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/ImageControllerTest.java
@@ -22,9 +22,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.mock.web.MockPart;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.ImageDescriptor;
@@ -66,7 +64,7 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testUploadPngImage() throws Exception {
         String filename = "my_png_image.png";
-        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE, false);
+        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE);
 
         assertThat(imageInfo.getTitle()).isEqualTo(filename);
         assertThat(imageInfo.getResourceType()).isEqualTo(ResourceType.IMAGE);
@@ -85,7 +83,7 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testUploadJpegImage() throws Exception {
         String filename = "my_jpeg_image.jpg";
-        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/jpeg", JPEG_IMAGE, false);
+        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/jpeg", JPEG_IMAGE);
 
         ImageDescriptor imageDescriptor = imageInfo.getDescriptor(ImageDescriptor.class);
         checkJpegImageDescriptor(imageDescriptor);
@@ -97,7 +95,7 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testUploadSvgImage() throws Exception {
         String filename = "my_svg_image.svg";
-        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/svg+xml", SVG_IMAGE, false);
+        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/svg+xml", SVG_IMAGE);
 
         ImageDescriptor imageDescriptor = imageInfo.getDescriptor(ImageDescriptor.class);
         checkSvgImageDescriptor(imageDescriptor);
@@ -109,17 +107,17 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testUploadImageWithSameFilename() throws Exception {
         String filename = "my_jpeg_image.jpg";
-        TbResourceInfo imageInfo1 = uploadImage(HttpMethod.POST, "/api/image", filename, "image/jpeg", JPEG_IMAGE, false);
+        TbResourceInfo imageInfo1 = uploadImage(HttpMethod.POST, "/api/image", filename, "image/jpeg", JPEG_IMAGE);
         assertThat(imageInfo1.getTitle()).isEqualTo(filename);
         assertThat(imageInfo1.getFileName()).isEqualTo(filename);
         assertThat(imageInfo1.getResourceKey()).isEqualTo(filename);
 
-        TbResourceInfo imageInfo2 = uploadImage(HttpMethod.POST, "/api/image", filename, "image/jpeg", JPEG_IMAGE, false);
+        TbResourceInfo imageInfo2 = uploadImage(HttpMethod.POST, "/api/image", filename, "image/jpeg", JPEG_IMAGE);
         assertThat(imageInfo2.getTitle()).isEqualTo(filename);
         assertThat(imageInfo2.getFileName()).isEqualTo(filename);
         assertThat(imageInfo2.getResourceKey()).isEqualTo("my_jpeg_image_(1).jpg");
 
-        TbResourceInfo imageInfo3 = uploadImage(HttpMethod.POST, "/api/image", filename, "image/jpeg", JPEG_IMAGE, false);
+        TbResourceInfo imageInfo3 = uploadImage(HttpMethod.POST, "/api/image", filename, "image/jpeg", JPEG_IMAGE);
         assertThat(imageInfo3.getTitle()).isEqualTo(filename);
         assertThat(imageInfo3.getFileName()).isEqualTo(filename);
         assertThat(imageInfo3.getResourceKey()).isEqualTo("my_jpeg_image_(2).jpg");
@@ -128,11 +126,11 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testUpdateImage() throws Exception {
         String filename = "my_png_image.png";
-        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE, false);
+        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE);
         checkPngImageDescriptor(imageInfo.getDescriptor(ImageDescriptor.class));
 
         String newFilename = "my_jpeg_image.png";
-        imageInfo = uploadImage(HttpMethod.PUT, "/api/images/tenant/" + filename, newFilename, "image/jpeg", JPEG_IMAGE, false);
+        imageInfo = uploadImage(HttpMethod.PUT, "/api/images/tenant/" + filename, newFilename, "image/jpeg", JPEG_IMAGE);
 
         assertThat(imageInfo.getTitle()).isEqualTo(filename);
         assertThat(imageInfo.getResourceKey()).isEqualTo(filename);
@@ -148,7 +146,7 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testUpdateImageInfo() throws Exception {
         String filename = "my_png_image.png";
-        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE, false);
+        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE);
         ImageDescriptor imageDescriptor = imageInfo.getDescriptor(ImageDescriptor.class);
 
         assertThat(imageInfo.getTitle()).isEqualTo(filename);
@@ -167,7 +165,7 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testExportImportImage() throws Exception {
         String filename = "my_png_image.png";
-        uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE, false);
+        uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE);
 
         ImageExportData exportData = doGet("/api/images/tenant/" + filename + "/export", ImageExportData.class);
         assertThat(exportData.getMediaType()).isEqualTo("image/png");
@@ -175,6 +173,8 @@ public class ImageControllerTest extends AbstractControllerTest {
         assertThat(exportData.getTitle()).isEqualTo(filename);
         assertThat(exportData.getResourceKey()).isEqualTo(filename);
         assertThat(exportData.getData()).isEqualTo(Base64.getEncoder().encodeToString(PNG_IMAGE));
+        assertThat(exportData.isPublic()).isTrue();
+        assertThat(exportData.getPublicResourceKey()).isNotEmpty();
 
         doDelete("/api/images/tenant/" + filename).andExpect(status().isOk());
 
@@ -182,6 +182,8 @@ public class ImageControllerTest extends AbstractControllerTest {
         assertThat(importedImageInfo.getTitle()).isEqualTo(filename);
         assertThat(importedImageInfo.getResourceKey()).isEqualTo(filename);
         assertThat(importedImageInfo.getFileName()).isEqualTo(filename);
+        assertThat(importedImageInfo.isPublic()).isTrue();
+        assertThat(importedImageInfo.getPublicResourceKey()).isEqualTo(exportData.getPublicResourceKey());
         checkPngImageDescriptor(importedImageInfo.getDescriptor(ImageDescriptor.class));
         assertThat(downloadImage("tenant", filename)).containsExactly(PNG_IMAGE);
     }
@@ -190,11 +192,11 @@ public class ImageControllerTest extends AbstractControllerTest {
     public void testGetImages() throws Exception {
         loginSysAdmin();
         String systemImageName = "my_system_png_image.png";
-        TbResourceInfo systemImage = uploadImage(HttpMethod.POST, "/api/image", systemImageName, "image/png", PNG_IMAGE, false);
+        TbResourceInfo systemImage = uploadImage(HttpMethod.POST, "/api/image", systemImageName, "image/png", PNG_IMAGE);
 
         loginTenantAdmin();
         String tenantImageName = "my_jpeg_image.jpg";
-        TbResourceInfo tenantImage = uploadImage(HttpMethod.POST, "/api/image", tenantImageName, "image/jpeg", JPEG_IMAGE, false);
+        TbResourceInfo tenantImage = uploadImage(HttpMethod.POST, "/api/image", tenantImageName, "image/jpeg", JPEG_IMAGE);
 
         List<TbResourceInfo> tenantImages = getImages(null, false, 10);
         assertThat(tenantImages).containsOnly(tenantImage);
@@ -211,7 +213,7 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testUploadPublicImage() throws Exception {
         String filename = "my_public_image.png";
-        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE, true);
+        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE);
 
         assertThat(imageInfo.isPublic()).isTrue();
         assertThat(imageInfo.getPublicResourceKey()).hasSize(32);
@@ -225,7 +227,7 @@ public class ImageControllerTest extends AbstractControllerTest {
     @Test
     public void testMakeImagePublic() throws Exception {
         String filename = "my_public_image.png";
-        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE, false);
+        TbResourceInfo imageInfo = uploadImage(HttpMethod.POST, "/api/image", filename, "image/png", PNG_IMAGE);
         String publicKey = imageInfo.getPublicResourceKey();
         assertThat(publicKey).hasSize(32);
 
@@ -325,13 +327,9 @@ public class ImageControllerTest extends AbstractControllerTest {
                 .andReturn().getResponse().getContentAsByteArray();
     }
 
-    private <R> TbResourceInfo uploadImage(HttpMethod httpMethod, String url, String filename, String mediaType, byte[] content, boolean isPublic) throws Exception {
+    private <R> TbResourceInfo uploadImage(HttpMethod httpMethod, String url, String filename, String mediaType, byte[] content) throws Exception {
         MockMultipartFile file = new MockMultipartFile("file", filename, mediaType, content);
-        MockPart publicPart = new MockPart("isPublic", String.valueOf(isPublic).getBytes());
-        publicPart.getHeaders().setContentType(MediaType.APPLICATION_JSON);
-        var request = MockMvcRequestBuilders.multipart(httpMethod, url)
-                .file(file)
-                .part(publicPart);
+        var request = MockMvcRequestBuilders.multipart(httpMethod, url).file(file);
         setJwtToken(request);
         return readResponse(mockMvc.perform(request).andExpect(status().isOk()), TbResourceInfo.class);
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ImageExportData.java b/common/data/src/main/java/org/thingsboard/server/common/data/ImageExportData.java
index 2e6d387dff..a5339c98f0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ImageExportData.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ImageExportData.java
@@ -16,22 +16,26 @@
 package org.thingsboard.server.common.data;
 
 import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 @ApiModel
 @Slf4j
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Builder
 public class ImageExportData {
 
-    private final String mediaType;
-    private final String fileName;
-    private final String title;
-    private final String resourceKey;
-    private final boolean isPublic;
-    private final String publicResourceKey;
-    private final String data;
+    private String mediaType;
+    private String fileName;
+    private String title;
+    private String resourceKey;
+    private boolean isPublic;
+    private String publicResourceKey;
+    private String data;
 
 }