From 36629fddb38070a854b3376eae305db55629a3a2 Mon Sep 17 00:00:00 2001
From: Andrii Landiak <andriylandiak@gmail.com>
Date: Mon, 4 Dec 2023 14:51:31 +0200
Subject: [PATCH] Fix test and change upgrade instructions title

---
 .../server/controller/EdgeControllerTest.java        | 12 ++++++++++++
 .../pages/edge/edge-instructions-dialog.component.ts |  3 +++
 2 files changed, 15 insertions(+)

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 cacc5b86c8..fe5cceb206 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
@@ -48,6 +48,7 @@ import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.UpgradeInfo;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.asset.AssetProfile;
@@ -83,9 +84,11 @@ import org.thingsboard.server.gen.edge.v1.TenantUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
 import org.thingsboard.server.gen.edge.v1.UserCredentialsUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
+import org.thingsboard.server.service.edge.instructions.EdgeUpgradeInstructionsService;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -116,6 +119,9 @@ public class EdgeControllerTest extends AbstractControllerTest {
     @Autowired
     private EdgeDao edgeDao;
 
+    @Autowired
+    private EdgeUpgradeInstructionsService edgeUpgradeInstructionsService;
+
     static class Config {
         @Bean
         @Primary
@@ -1180,6 +1186,12 @@ public class EdgeControllerTest extends AbstractControllerTest {
 
     @Test
     public void testGetEdgeUpgradeInstructions() throws Exception {
+        // UpdateInfo config is updating from Thingsboard Update server
+        HashMap<String, UpgradeInfo> upgradeInfoHashMap = new HashMap<>();
+        upgradeInfoHashMap.put("3.6.0", new UpgradeInfo(true, "3.6.1"));
+        upgradeInfoHashMap.put("3.6.1", new UpgradeInfo(true, "3.6.2"));
+        upgradeInfoHashMap.put("3.6.2", new UpgradeInfo(true, null));
+        edgeUpgradeInstructionsService.updateInstructionMap(upgradeInfoHashMap);
         Edge edge = constructEdge("Edge for Test Docker Upgrade Instructions", "default");
         Edge savedEdge = doPost("/api/edge", edge, Edge.class);
         String body = "{\"edgeVersion\": \"V_3_6_0\"}";
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.ts
index c618df96bb..6c9511d709 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.ts
@@ -65,6 +65,9 @@ export class EdgeInstructionsDialogComponent extends DialogComponent<EdgeInstruc
     if (this.data.afterAdd) {
       this.dialogTitle = 'edge.install-connect-instructions-edge-created';
       this.showDontShowAgain = true;
+    } else if (this.data.upgradeAvailable) {
+      this.dialogTitle = 'edge.upgrade-instructions';
+      this.showDontShowAgain = false;
     } else {
       this.dialogTitle = 'edge.install-connect-instructions';
       this.showDontShowAgain = false;