Revert unnecessary changes

dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java

@@ -46,7 +46,6 @@ import org.thingsboard.server.dao.relation.RelationService;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
 

ui-ngx/src/app/core/utils.ts

@@ -26,7 +26,6 @@ import { TranslateService } from '@ngx-translate/core';
 import { serverErrorCodesTranslations } from '@shared/models/constants';
 
 const varsRegex = /\${([^}]*)}/g;
-export const noLeadTrailSpacesRegex: RegExp = /^(?! )[\S\s]*(?<! )$/;
 
 export function onParentScrollOrWindowResize(el: Node): Observable<Event> {
   const scrollSubject = new Subject<Event>();

ui-ngx/src/app/modules/home/components/widget/lib/gateway/gateway-service-rpc-connector.component.ts

@@ -51,7 +51,9 @@ import {
   JsonObjectEditDialogData
 } from '@shared/components/dialog/json-object-edit-dialog.component';
 import { jsonRequired } from '@shared/components/json-object-edit.component';
-import { deepClone, noLeadTrailSpacesRegex } from '@core/utils';
+import { deepClone } from '@core/utils';
+
+export const noLeadTrailSpacesRegex: RegExp = /^(?! )[\S\s]*(?<! )$/;
 
 @Component({
   selector: 'tb-gateway-service-rpc-connector',

ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts

@@ -22,9 +22,7 @@ import { DisplayColumnsPanelComponent } from '@home/components/widget/lib/displa
 import { AlarmsTableWidgetComponent } from '@home/components/widget/lib/alarm/alarms-table-widget.component';
 import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module';
 import { TimeseriesTableWidgetComponent } from '@home/components/widget/lib/timeseries-table-widget.component';
-import {
+import { EntitiesHierarchyWidgetComponent } from '@home/components/widget/lib/entity/entities-hierarchy-widget.component';
-  EntitiesHierarchyWidgetComponent
-} from '@home/components/widget/lib/entity/entities-hierarchy-widget.component';
 import { RpcWidgetsModule } from '@home/components/widget/lib/rpc/rpc-widgets.module';
 import {
   DateRangeNavigatorPanelComponent,
@@ -179,7 +177,7 @@ import {
         BarChartWithLabelsWidgetComponent
     ],
   providers: [
-    {provide: WIDGET_COMPONENTS_MODULE_TOKEN, useValue: WidgetComponentsModule}
+    {provide: WIDGET_COMPONENTS_MODULE_TOKEN, useValue: WidgetComponentsModule }
   ]
 })
 export class WidgetComponentsModule {

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

@@ -691,7 +691,7 @@
         "assign-assets": "Assign assets",
         "assign-assets-text": "Assign { count, plural, =1 {1 asset} other {# assets} } to customer",
         "assign-asset-to-edge-title": "Assign Asset(s) To Edge",
-        "assign-asset-to-edge-text": "Please select the assets to assign to the edge",
+        "assign-asset-to-edge-text":"Please select the assets to assign to the edge",
         "delete-assets": "Delete assets",
         "unassign-assets": "Unassign assets",
         "unassign-assets-action-title": "Unassign { count, plural, =1 {1 asset} other {# assets} } from customer",
@@ -1314,7 +1314,7 @@
         "assign-device-to-customer": "Assign Device(s) To Customer",
         "assign-device-to-customer-text": "Please select the devices to assign to the customer",
         "assign-device-to-edge-title": "Assign Device(s) To Edge",
-        "assign-device-to-edge-text": "Please select the devices to assign to the edge",
+        "assign-device-to-edge-text":"Please select the devices to assign to the edge",
         "make-public": "Make device public",
         "make-private": "Make device private",
         "no-devices-text": "No devices found",
@@ -2349,7 +2349,7 @@
         "make-private-entity-view-title": "Are you sure you want to make the entity view '{{entityViewName}}' private?",
         "make-private-entity-view-text": "After the confirmation the entity view and all its data will be made private and won't be accessible by others.",
         "assign-entity-view-to-edge": "Assign Entity View(s) To Edge",
-        "assign-entity-view-to-edge-text": "Please select the entity views to assign to the edge",
+        "assign-entity-view-to-edge-text":"Please select the entity views to assign to the edge",
         "unassign-entity-view-from-edge-title": "Are you sure you want to unassign the entity view '{{entityViewName}}'?",
         "unassign-entity-view-from-edge-text": "After the confirmation the entity view will be unassigned and won't be accessible by the edge.",
         "unassign-entity-views-from-edge-action-title": "Unassign { count, plural, =1 {1 entity view} other {# entity views} } from edge",
@@ -3169,7 +3169,7 @@
             "routing-key": "Edge key",
             "secret": "Edge secret"
         },
-        "stepper-text": {
+        "stepper-text":{
             "select-file": "Select a file",
             "configuration": "Import configuration",
             "column-type": "Select columns type",
@@ -3991,7 +3991,7 @@
         "delete-queue-text": "Be careful, after the confirmation the queue and all related data will become unrecoverable.",
         "delete-queues-text": "After the confirmation all selected queues will be deleted and won't be accessible.",
         "search": "Search queue",
-        "add": "Add queue",
+        "add" : "Add queue",
         "details": "Queue details",
         "topic": "Topic",
         "submit-settings": "Submit settings",
@@ -6780,7 +6780,7 @@
             "card-click": "On card click"
         }
     },
-    "paginator": {
+    "paginator" : {
         "items-per-page": "Items per page:",
         "first-page-label": "First page",
         "last-page-label": "Last page",