Merge branch 'feature/lts-4.3-iot-hub' into feature/4.4-iot-hub

application/src/test/java/org/thingsboard/server/service/iot_hub/DefaultIotHubServiceTest.java

@@ -180,7 +180,7 @@ class DefaultIotHubServiceTest {
         String versionId = UUID.randomUUID().toString();
         UUID rootItemId = UUID.randomUUID();
         when(iotHubRestClient.getVersionInfo(versionId))
-                .thenReturn(version(versionId, rootItemId.toString(), "DASHBOARD", "Root", "1.0"));
+                .thenReturn(version(versionId, rootItemId.toString(), "WIDGET", "Root", "1.0"));
         when(iotHubInstalledItemService.findInstalledItemIdsByTenantIdAndItemIdIn(eq(tenantId), any())).thenReturn(List.of(rootItemId));
 
         InstallPlan plan = service.resolveInstallPlan(user, versionId);
@@ -231,6 +231,7 @@ class DefaultIotHubServiceTest {
         InstallPlanEntry entry = new InstallPlanEntry();
         entry.setItemId(itemId.toString());
         entry.setVersionId(UUID.randomUUID().toString());
+        entry.setType("WIDGET");
         entry.setStatus(InstallPlanEntry.Status.WILL_INSTALL);
         entry.setRoot(true);
         // The item is reported as already installed at install time, even though the plan says WILL_INSTALL.

ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.html

@@ -41,7 +41,7 @@
           <mat-icon>chevron_left</mat-icon>
           {{ 'iot-hub.back-to-iot-hub' | translate }}
         </button>
-        <div class="flex flex-col gap-4">
+        <div class="flex min-h-0 flex-1 flex-col gap-4">
           <div class="tb-creator-avatar">
             @if (getAvatarUrl(); as avatarUrl) {
               <img [src]="avatarUrl" alt="">
@@ -57,46 +57,48 @@
                         matTooltipPosition="above">verified</mat-icon>
             }
           </div>
-          @if (creator.description) {
-            <p class="tb-creator-desc">{{ creator.description }}</p>
-          }
-          <div class="flex flex-col gap-1">
-            @if (creator.website) {
-              <a class="tb-creator-link tb-creator-link-primary" [href]="creator.website" target="_blank">
-                <mat-icon>language</mat-icon>
-                <span>{{ getWebsiteLabel() }}</span>
-              </a>
+          <div class="tb-creator-desc-container">
+            @if (creator.description) {
+              <p class="tb-creator-desc">{{ creator.description }}</p>
             }
-            @if (creator.contactEmail) {
-              <span class="tb-creator-link">
+            <div class="flex flex-col gap-1">
+              @if (creator.website) {
+                <a class="tb-creator-link tb-creator-link-primary" [href]="creator.website" target="_blank">
+                  <mat-icon>language</mat-icon>
+                  <span>{{ getWebsiteLabel() }}</span>
+                </a>
+              }
+              @if (creator.contactEmail) {
+                <span class="tb-creator-link">
                 <tb-icon>mdi:email-outline</tb-icon>
                 <span>{{ creator.contactEmail }}</span>
               </span>
-            }
-            @if (creator.githubUrl) {
-              <a class="tb-creator-link" [href]="creator.githubUrl" target="_blank">
-                <tb-icon>mdi:github</tb-icon>
-                <span>GitHub</span>
-              </a>
-            }
-            @if (creator.linkedinUrl) {
-              <a class="tb-creator-link" [href]="creator.linkedinUrl" target="_blank">
-                <tb-icon>mdi:linkedin</tb-icon>
-                <span>LinkedIn</span>
-              </a>
-            }
-            @if (creator.twitterUrl) {
-              <a class="tb-creator-link" [href]="creator.twitterUrl" target="_blank">
-                <tb-icon>mdi:twitter</tb-icon>
-                <span>X</span>
-              </a>
-            }
-            @if (creator.youtubeUrl) {
-              <a class="tb-creator-link" [href]="creator.youtubeUrl" target="_blank">
-                <tb-icon>mdi:youtube</tb-icon>
-                <span>YouTube</span>
-              </a>
-            }
+              }
+              @if (creator.githubUrl) {
+                <a class="tb-creator-link" [href]="creator.githubUrl" target="_blank">
+                  <tb-icon>mdi:github</tb-icon>
+                  <span>GitHub</span>
+                </a>
+              }
+              @if (creator.linkedinUrl) {
+                <a class="tb-creator-link" [href]="creator.linkedinUrl" target="_blank">
+                  <tb-icon>mdi:linkedin</tb-icon>
+                  <span>LinkedIn</span>
+                </a>
+              }
+              @if (creator.twitterUrl) {
+                <a class="tb-creator-link" [href]="creator.twitterUrl" target="_blank">
+                  <tb-icon>mdi:twitter</tb-icon>
+                  <span>X</span>
+                </a>
+              }
+              @if (creator.youtubeUrl) {
+                <a class="tb-creator-link" [href]="creator.youtubeUrl" target="_blank">
+                  <tb-icon>mdi:youtube</tb-icon>
+                  <span>YouTube</span>
+                </a>
+              }
+            </div>
           </div>
         </div>
       </div>

ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-creator-profile.component.scss

@@ -68,6 +68,7 @@
   width: 140px;
   height: 140px;
   min-width: 140px;
+  min-height: 140px;
   border-radius: 50%;
   overflow: hidden;
   display: flex;
@@ -107,6 +108,18 @@
   cursor: default;
 }
 
+.tb-creator-desc-container {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+  @media #{$mat-gt-md} {
+    padding-bottom: 1rem;
+  }
+}
+
 // Description
 .tb-creator-desc {
   font-size: 16px;