Merge with base brnach

application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java

@@ -238,12 +238,12 @@ public class EntitiesVersionControlController extends BaseController {
         }
     }
 
-    @GetMapping("/info/{versionId}/{entityType}/{internalEntityUuid}")
+    @GetMapping("/info/{versionId}/{entityType}/{externalEntityUuid}")
     public DeferredResult<EntityDataInfo> getEntityDataInfo(@PathVariable String versionId,
                                                             @PathVariable EntityType entityType,
-                                                            @PathVariable UUID internalEntityUuid) throws ThingsboardException {
+                                                            @PathVariable UUID externalEntityUuid) throws ThingsboardException {
         try {
-            EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, internalEntityUuid);
+            EntityId entityId = EntityIdFactory.getByTypeAndUuid(entityType, externalEntityUuid);
             return wrapFuture(versionControlService.getEntityDataInfo(getCurrentUser(), entityId, versionId));
         } catch (Exception e) {
             throw handleException(e);

ui-ngx/src/app/core/http/entities-version-control.service.ts

@@ -19,7 +19,7 @@ import { HttpClient } from '@angular/common/http';
 import { defaultHttpOptionsFromConfig, RequestConfig } from '@core/http/http-utils';
 import { Observable, of } from 'rxjs';
 import {
-  BranchInfo, EntityDataDiff,
+  BranchInfo, EntityDataDiff, EntityDataInfo,
   EntityVersion,
   VersionCreateRequest,
   VersionCreationResult,
@@ -71,6 +71,13 @@ export class EntitiesVersionControlService {
     }
   }
 
+  public getEntityDataInfo(externalEntityId: EntityId,
+                           versionId: string,
+                           config?: RequestConfig): Observable<EntityDataInfo> {
+    return this.http.get<EntityDataInfo>(`/api/entities/vc/info/${versionId}/${externalEntityId.entityType}/${externalEntityId.id}`,
+      defaultHttpOptionsFromConfig(config));
+  }
+
   public saveEntitiesVersion(request: VersionCreateRequest, config?: RequestConfig): Observable<VersionCreationResult> {
     return this.http.post<VersionCreationResult>('/api/entities/vc/version', request, defaultHttpOptionsFromConfig(config)).pipe(
       tap(() => {

ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.html

@@ -57,7 +57,7 @@
       <button mat-raised-button color="primary"
               type="button"
               (click)="export()"
-              [disabled]="(isLoading$ | async) || createVersionFormGroup.invalid || !createVersionFormGroup.dirty">
+              [disabled]="(isLoading$ | async) || createVersionFormGroup.invalid">
         {{ 'action.create' | translate }}
       </button>
     </div>

ui-ngx/src/app/modules/home/components/vc/entity-version-create.component.ts

@@ -41,6 +41,9 @@ export class EntityVersionCreateComponent extends PageComponent implements OnIni
   @Input()
   entityId: EntityId;
 
+  @Input()
+  entityName: string;
+
   @Input()
   onClose: (result: VersionCreationResult | null, branch: string | null) => void;
 
@@ -61,7 +64,8 @@ export class EntityVersionCreateComponent extends PageComponent implements OnIni
   ngOnInit(): void {
     this.createVersionFormGroup = this.fb.group({
       branch: [this.branch, [Validators.required]],
-      versionName: [null, [Validators.required]],
+      versionName: [this.translate.instant('version-control.default-create-entity-version-name',
+        {entityName: this.entityName}), [Validators.required]],
       saveRelations: [false, []],
       saveAttributes: [false, []]
     });

ui-ngx/src/app/modules/home/components/vc/entity-version-diff.component.ts

@@ -308,7 +308,7 @@ export class EntityVersionDiffComponent extends PageComponent implements OnInit,
       this.popoverService.hidePopover(trigger);
     } else {
       const restoreVersionPopover = this.popoverService.displayPopover(trigger, this.renderer,
-        this.viewContainerRef, EntityVersionRestoreComponent, 'left', true, null,
+        this.viewContainerRef, EntityVersionRestoreComponent, 'leftTop', true, null,
         {
           branch: this.branch,
           versionName: this.versionName,
@@ -322,6 +322,7 @@ export class EntityVersionDiffComponent extends PageComponent implements OnInit,
             }
           }
         }, {}, {}, {}, false);
+      restoreVersionPopover.tbComponentRef.instance.popoverComponent = restoreVersionPopover;
     }
   }
 }

ui-ngx/src/app/modules/home/components/vc/entity-version-restore.component.html

@@ -15,27 +15,28 @@
     limitations under the License.
 
 -->
-<section style="min-width: 400px;">
+<section [ngStyle]="entityDataInfo ? {minWidth: '400px'} : {}">
-  <mat-toolbar>
+  <mat-toolbar *ngIf="entityDataInfo">
     <h2>{{ 'version-control.restore-entity-from-version' | translate: {versionName} }}</h2>
     <span fxFlex></span>
   </mat-toolbar>
   <mat-progress-bar color="warn" style="z-index: 10; width: 100%; margin-bottom: -4px;" mode="indeterminate"
-                    *ngIf="isLoading$ | async">
+                    *ngIf="entityDataInfo && (isLoading$ | async)">
   </mat-progress-bar>
-  <form [formGroup]="restoreFormGroup" style="padding-top: 16px;">
+  <mat-spinner *ngIf="!entityDataInfo" mode="indeterminate" diameter="80"></mat-spinner>
+  <form *ngIf="entityDataInfo" [formGroup]="restoreFormGroup" style="padding-top: 16px;">
     <fieldset [disabled]="isLoading$ | async">
       <div fxFlex fxLayout="column">
-        <mat-checkbox formControlName="loadRelations" style="margin-bottom: 16px;">
+        <mat-checkbox *ngIf="entityDataInfo.hasRelations" formControlName="loadRelations" style="margin-bottom: 16px;">
           {{ 'version-control.load-relations' | translate }}
         </mat-checkbox>
-        <mat-checkbox formControlName="loadAttributes" style="margin-bottom: 16px;">
+        <mat-checkbox *ngIf="entityDataInfo.hasAttributes" formControlName="loadAttributes" style="margin-bottom: 16px;">
           {{ 'version-control.load-attributes' | translate }}
         </mat-checkbox>
       </div>
     </fieldset>
   </form>
-  <div fxLayoutAlign="end center" fxLayoutGap="8px">
+  <div *ngIf="entityDataInfo"  fxLayoutAlign="end center" fxLayoutGap="8px">
     <button mat-button color="primary"
             type="button"
             [disabled]="(isLoading$ | async)"

ui-ngx/src/app/modules/home/components/vc/entity-version-restore.component.ts

@@ -14,15 +14,22 @@
 /// limitations under the License.
 ///
 
-import { Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
 import { PageComponent } from '@shared/components/page.component';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { SingleEntityVersionLoadRequest, VersionLoadRequestType, VersionLoadResult } from '@shared/models/vc.models';
+import {
+  EntityDataInfo,
+  SingleEntityVersionLoadRequest,
+  VersionLoadRequestType,
+  VersionLoadResult
+} from '@shared/models/vc.models';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { EntitiesVersionControlService } from '@core/http/entities-version-control.service';
 import { EntityId } from '@shared/models/id/entity-id';
 import { TranslateService } from '@ngx-translate/core';
+import { TbPopoverComponent } from '@shared/components/popover.component';
+import { delay } from 'rxjs/operators';
 
 @Component({
   selector: 'tb-entity-version-restore',
@@ -46,10 +53,16 @@ export class EntityVersionRestoreComponent extends PageComponent implements OnIn
   @Input()
   onClose: (result: Array<VersionLoadResult> | null) => void;
 
+  @Input()
+  popoverComponent: TbPopoverComponent;
+
+  entityDataInfo: EntityDataInfo = null;
+
   restoreFormGroup: FormGroup;
 
   constructor(protected store: Store<AppState>,
               private entitiesVersionControlService: EntitiesVersionControlService,
+              private cd: ChangeDetectorRef,
               private translate: TranslateService,
               private fb: FormBuilder) {
     super(store);
@@ -57,8 +70,15 @@ export class EntityVersionRestoreComponent extends PageComponent implements OnIn
 
   ngOnInit(): void {
     this.restoreFormGroup = this.fb.group({
-      loadRelations: [false, []],
+      loadRelations: [true, []],
-      loadAttributes: [false, []]
+      loadAttributes: [true, []]
+    });
+    this.entitiesVersionControlService.getEntityDataInfo(this.externalEntityId, this.versionId).subscribe((data) => {
+      this.entityDataInfo = data;
+      this.cd.detectChanges();
+      if (this.popoverComponent) {
+        this.popoverComponent.updatePosition();
+      }
     });
   }
 
@@ -74,8 +94,8 @@ export class EntityVersionRestoreComponent extends PageComponent implements OnIn
       versionId: this.versionId,
       externalEntityId: this.externalEntityId,
       config: {
-        loadRelations: this.restoreFormGroup.get('loadRelations').value,
+        loadRelations: this.entityDataInfo.hasRelations ? this.restoreFormGroup.get('loadRelations').value : false,
-        loadAttributes: this.restoreFormGroup.get('loadAttributes').value
+        loadAttributes: this.entityDataInfo.hasAttributes ? this.restoreFormGroup.get('loadAttributes').value : false
       },
       type: VersionLoadRequestType.SINGLE_ENTITY
     };

ui-ngx/src/app/modules/home/components/vc/entity-versions-table.component.ts

@@ -105,6 +105,9 @@ export class EntityVersionsTableComponent extends PageComponent implements OnIni
   @Input()
   entityId: EntityId;
 
+  @Input()
+  entityName: string;
+
   @Output()
   versionRestored = new EventEmitter<void>();
 
@@ -191,6 +194,7 @@ export class EntityVersionsTableComponent extends PageComponent implements OnIni
         {
           branch: this.branch,
           entityId: this.entityId,
+          entityName: this.entityName,
           onClose: (result: VersionCreationResult | null, branch: string | null) => {
             createVersionPopover.hide();
             if (result) {
@@ -289,6 +293,7 @@ export class EntityVersionsTableComponent extends PageComponent implements OnIni
             }
           }
         }, {}, {}, {}, false);
+      restoreVersionPopover.tbComponentRef.instance.popoverComponent = restoreVersionPopover;
     }
   }
 

ui-ngx/src/app/modules/home/components/vc/version-control.component.html

@@ -22,6 +22,7 @@
   <tb-entity-versions-table [singleEntityMode]="singleEntityMode"
                             [active]="active"
                             [entityId]="entityId"
+                            [entityName]="entityName"
                             [externalEntityId]="externalEntityId"
                             (versionRestored)="versionRestored.emit()"></tb-entity-versions-table>
 </ng-template>

ui-ngx/src/app/modules/home/components/vc/version-control.component.ts

@@ -47,6 +47,9 @@ export class VersionControlComponent implements OnInit, HasConfirmForm {
   @Input()
   entityId: EntityId;
 
+  @Input()
+  entityName: string;
+
   @Output()
   versionRestored = new EventEmitter<void>();
 

ui-ngx/src/app/modules/home/pages/asset/asset-tabs.component.html

@@ -53,5 +53,5 @@
          label="{{ 'version-control.version-control' | translate }}" #versionControlTab="matTab">
   <tb-version-control detailsMode="true" singleEntityMode="true"
                       (versionRestored)="entitiesTableConfig.updateData()"
-                      [active]="versionControlTab.isActive" [entityId]="entity.id" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
+                      [active]="versionControlTab.isActive" [entityId]="entity.id" [entityName]="entity.name" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
 </mat-tab>

ui-ngx/src/app/modules/home/pages/customer/customer-tabs.component.html

@@ -53,5 +53,5 @@
          label="{{ 'version-control.version-control' | translate }}" #versionControlTab="matTab">
   <tb-version-control detailsMode="true" singleEntityMode="true"
                       (versionRestored)="entitiesTableConfig.updateData()"
-                      [active]="versionControlTab.isActive" [entityId]="entity.id" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
+                      [active]="versionControlTab.isActive" [entityId]="entity.id" [entityName]="entity.name" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
 </mat-tab>

ui-ngx/src/app/modules/home/pages/dashboard/dashboard-tabs.component.html

@@ -23,5 +23,5 @@
          label="{{ 'version-control.version-control' | translate }}" #versionControlTab="matTab">
   <tb-version-control detailsMode="true" singleEntityMode="true"
                       (versionRestored)="entitiesTableConfig.updateData()"
-                      [active]="versionControlTab.isActive" [entityId]="entity.id" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
+                      [active]="versionControlTab.isActive" [entityId]="entity.id" [entityName]="entity.name" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
 </mat-tab>

ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.html

@@ -79,5 +79,5 @@
          label="{{ 'version-control.version-control' | translate }}" #versionControlTab="matTab">
   <tb-version-control detailsMode="true" singleEntityMode="true"
                       (versionRestored)="entitiesTableConfig.updateData()"
-                      [active]="versionControlTab.isActive" [entityId]="entity.id" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
+                      [active]="versionControlTab.isActive" [entityId]="entity.id" [entityName]="entity.name" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
 </mat-tab>

ui-ngx/src/app/modules/home/pages/device/device-tabs.component.html

@@ -53,5 +53,5 @@
          label="{{ 'version-control.version-control' | translate }}" #versionControlTab="matTab">
   <tb-version-control detailsMode="true" singleEntityMode="true"
                       (versionRestored)="entitiesTableConfig.updateData()"
-                      [active]="versionControlTab.isActive" [entityId]="entity.id" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
+                      [active]="versionControlTab.isActive" [entityId]="entity.id" [entityName]="entity.name" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
 </mat-tab>

ui-ngx/src/app/modules/home/pages/rulechain/rulechain-tabs.component.html

@@ -56,5 +56,5 @@
          label="{{ 'version-control.version-control' | translate }}" #versionControlTab="matTab">
   <tb-version-control detailsMode="true" singleEntityMode="true"
                       (versionRestored)="entitiesTableConfig.updateData()"
-                      [active]="versionControlTab.isActive" [entityId]="entity.id" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
+                      [active]="versionControlTab.isActive" [entityId]="entity.id" [entityName]="entity.name" [externalEntityId]="entity.externalId || entity.id"></tb-version-control>
 </mat-tab>

ui-ngx/src/app/shared/models/vc.models.ts

@@ -184,3 +184,8 @@ export interface EntityDataDiff {
 export function entityExportDataToJsonString(data: EntityExportData<any>): string {
   return JSON.stringify(data, null, 4);
 }
+
+export interface EntityDataInfo {
+  hasRelations: boolean;
+  hasAttributes: boolean;
+}

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -3167,7 +3167,8 @@
         "updated": "{{updated}} updated",
         "deleted": "{{deleted}} deleted",
         "remove-other-entities-confirm-text": "Be careful! This will permanently <b>delete</b> <b>all</b> current entities<br/>not present in the version you want to restore.<br/><br/>Please type <b>remove other entities</b> to confirm.",
-        "auto-commit-to-branch": "auto-commit to <b>{{ branch }}</b> branch"
+        "auto-commit-to-branch": "auto-commit to <b>{{ branch }}</b> branch",
+        "default-create-entity-version-name": "{{entityName}} update"
     },
     "widget": {
         "widget-library": "Widgets Library",