Merge branch 'feature/queue-entity' of github.com:YevhenBondarenko/thingsboard into feature/queue-entity

ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts

@@ -130,12 +130,8 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, Valid
     });
   }
 
-  public trackByQueue(index: number, queueControl: AbstractControl): string {
-    if (queueControl) {
-      return queueControl.value.id;
-    } else {
-      return null;
-    }
+  public trackByQueue(index: number, queueControl: AbstractControl) {
+    return queueControl;
   }
 
   public removeQueue(index: number) {

ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.html

@@ -68,6 +68,7 @@
           <div class="tb-hint">{{'tenant.isolated-tb-rule-engine-details' | translate}}</div>
         </mat-checkbox>
       </div>
+      <div class="expansion-panel-block">
         <mat-accordion formGroupName="profileData" multi>
           <mat-expansion-panel [expanded]="true" *ngIf="entityForm.get('isolatedTbRuleEngine').value">
             <mat-expansion-panel-header>
@@ -97,6 +98,7 @@
             </ng-template>
           </mat-expansion-panel>
         </mat-accordion>
+      </div>
       <mat-form-field class="mat-block">
         <mat-label translate>tenant-profile.description</mat-label>
         <textarea matInput formControlName="description" rows="2"></textarea>

ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.scss

@@ -35,4 +35,7 @@
       width: fit-content;
     }
   }
+  .expansion-panel-block {
+    padding-bottom: 16px;
+  }
 }