From 2ca3a86c96f1e948d2ff28d6b0025be606791514 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Fri, 15 Mar 2024 16:51:00 +0200
Subject: [PATCH] UI: Add in VC support new property rollback on error

---
 .../home/components/vc/complex-version-load.component.html | 7 ++++++-
 .../home/components/vc/complex-version-load.component.ts   | 1 +
 .../components/vc/entity-types-version-load.component.html | 5 -----
 ui-ngx/src/assets/locale/locale.constant-en_US.json        | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.html b/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.html
index 0ef7f3bc7c..ccab83b9aa 100644
--- a/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.html
@@ -23,11 +23,16 @@
   <mat-progress-bar color="warn" style="z-index: 10; width: 100%; margin-bottom: -4px;" mode="indeterminate"
                     *ngIf="isLoading$ | async">
   </mat-progress-bar>
-  <form [formGroup]="loadVersionFormGroup" fxLayout="column" style="flex: 1; padding-top: 16px; overflow: auto;">
+  <form [formGroup]="loadVersionFormGroup" fxLayout="column" style="flex: 1; padding: 16px 0; overflow-y: auto; overflow-x: hidden">
     <tb-entity-types-version-load
       formControlName="entityTypes">
     </tb-entity-types-version-load>
   </form>
+  <div tb-hint-tooltip-icon="{{ 'version-control.rollback-on-error-hint' | translate }}" [formGroup]="loadVersionFormGroup">
+    <mat-slide-toggle formControlName="rollbackOnError">
+      {{ 'version-control.rollback-on-error' | translate }}
+    </mat-slide-toggle>
+  </div>
   <div fxLayoutAlign="end center" fxLayoutGap="8px" style="padding-top: 16px;">
     <button mat-button color="primary"
             type="button"
diff --git a/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.ts b/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.ts
index a9c05a5640..77a3ca3194 100644
--- a/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.ts
+++ b/ui-ngx/src/app/modules/home/components/vc/complex-version-load.component.ts
@@ -79,6 +79,7 @@ export class ComplexVersionLoadComponent extends PageComponent implements OnInit
   ngOnInit(): void {
     this.loadVersionFormGroup = this.fb.group({
       entityTypes: [createDefaultEntityTypesVersionLoad(), []],
+      rollbackOnError: [false]
     });
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-load.component.html b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-load.component.html
index 0deb31e3f4..620d406132 100644
--- a/ui-ngx/src/app/modules/home/components/vc/entity-types-version-load.component.html
+++ b/ui-ngx/src/app/modules/home/components/vc/entity-types-version-load.component.html
@@ -99,8 +99,3 @@
     </button>
   </div>
 </fieldset>
-<div [formGroup]="entityTypesVersionLoadFormGroup" fxLayout="row">
-  <mat-checkbox formControlName="rollbackOnError">
-    {{ 'version-control.rollback-on-error' | translate }}
-  </mat-checkbox>
-</div>
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 571773f389..3fc05736e8 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4917,7 +4917,7 @@
         "runtime-failed": "<b>Failed:</b> {{message}}",
         "auto-commit-settings-read-only-hint": "Auto-commit feature doesn't work with enabled read-only option in Repository settings.",
         "rollback-on-error": "Rollback on error",
-        "rollback-on-error-hint": "If you have a large amount of entities to restore, consider disabling this option to increase performance.<br><b>Note</b>, if an error occurs over the course of version loading, already persisted entities (with relations, attributes, etc.) will stay as is"
+        "rollback-on-error-hint": "If you have a large amount of entities to restore, consider disabling this option to increase performance.\n Note, if an error occurs over the course of version loading, already persisted entities (with relations, attributes, etc.) will stay as is"
     },
     "widget": {
         "widget-library": "Widgets library",