diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts index 88607d55c2..277c7fdbdc 100644 --- a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts @@ -14,22 +14,13 @@ /// limitations under the License. /// -import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core'; +import { Component, Inject, OnInit, SkipSelf } from '@angular/core'; import { ErrorStateMatcher } from '@angular/material/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; -import { - CONTAINS_TYPE, - EntityRelation, - EntitySearchDirection, - RelationTypeGroup -} from '@shared/models/relation.models'; -import { EntityRelationService } from '@core/http/entity-relation.service'; import { EntityId } from '@shared/models/id/entity-id'; -import { forkJoin, Observable } from 'rxjs'; -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; import { Router } from '@angular/router'; import { DialogComponent } from '@app/shared/components/dialog.component'; import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; diff --git a/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.ts b/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.ts index ef3e185479..1339382b83 100644 --- a/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.ts +++ b/ui-ngx/src/app/modules/home/components/attribute/edit-attribute-value-panel.component.ts @@ -14,26 +14,11 @@ /// limitations under the License. /// -import { Component, Inject, InjectionToken, OnInit, SkipSelf, ViewChild } from '@angular/core'; +import { Component, Inject, InjectionToken, OnInit, SkipSelf } from '@angular/core'; import { ErrorStateMatcher } from '@angular/material/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; -import { - CONTAINS_TYPE, - EntityRelation, - EntitySearchDirection, - RelationTypeGroup -} from '@shared/models/relation.models'; -import { EntityRelationService } from '@core/http/entity-relation.service'; -import { EntityId } from '@shared/models/id/entity-id'; -import { forkJoin, Observable } from 'rxjs'; -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; -import { Router } from '@angular/router'; -import { DialogComponent } from '@app/shared/components/dialog.component'; -import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; -import { AttributeService } from '@core/http/attribute.service'; import { PageComponent } from '@shared/components/page.component'; import { OverlayRef } from '@angular/cdk/overlay'; diff --git a/ui-ngx/src/app/modules/home/components/relation/relation-dialog.component.ts b/ui-ngx/src/app/modules/home/components/relation/relation-dialog.component.ts index 91a6356146..d96c0770e0 100644 --- a/ui-ngx/src/app/modules/home/components/relation/relation-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/relation/relation-dialog.component.ts @@ -29,9 +29,9 @@ import { import { EntityRelationService } from '@core/http/entity-relation.service'; import { EntityId } from '@shared/models/id/entity-id'; import { forkJoin, Observable } from 'rxjs'; -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; +import { JsonObjectEditComponent } from '@shared/components/json-object-edit.component'; import { Router } from '@angular/router'; -import { DialogComponent } from '@app/shared/components/dialog.component'; +import { DialogComponent } from '@shared/components/dialog.component'; export interface RelationDialogData { isAdd: boolean; diff --git a/ui-ngx/src/app/modules/home/components/widget/data-key-config-dialog.component.ts b/ui-ngx/src/app/modules/home/components/widget/data-key-config-dialog.component.ts index 00280e6b12..7fbe987d01 100644 --- a/ui-ngx/src/app/modules/home/components/widget/data-key-config-dialog.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/data-key-config-dialog.component.ts @@ -20,25 +20,10 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; -import { - CONTAINS_TYPE, - EntityRelation, - EntitySearchDirection, - RelationTypeGroup -} from '@shared/models/relation.models'; -import { EntityRelationService } from '@core/http/entity-relation.service'; -import { EntityId } from '@shared/models/id/entity-id'; -import { forkJoin, Observable } from 'rxjs'; -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; import { Router } from '@angular/router'; -import { DialogComponent } from '@app/shared/components/dialog.component'; -import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; -import { AttributeService } from '@core/http/attribute.service'; -import { DataKey } from '@app/shared/models/widget.models'; -import { EntityAlias } from '@shared/models/alias.models'; -import { IAliasController } from '@core/api/widget-api.models'; +import { DialogComponent } from '@shared/components/dialog.component'; +import { DataKey } from '@shared/models/widget.models'; import { DataKeysCallbacks } from './data-keys.component.models'; -import { JsFuncComponent } from '@shared/components/js-func.component'; import { DataKeyConfigComponent } from '@home/components/widget/data-key-config.component'; export interface DataKeyConfigDialogData { diff --git a/ui-ngx/src/app/shared/components/dialog/color-picker-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/color-picker-dialog.component.ts index 23b89e8536..dce9b69bdf 100644 --- a/ui-ngx/src/app/shared/components/dialog/color-picker-dialog.component.ts +++ b/ui-ngx/src/app/shared/components/dialog/color-picker-dialog.component.ts @@ -14,26 +14,14 @@ /// limitations under the License. /// -import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core'; +import { Component, Inject, OnInit, SkipSelf } from '@angular/core'; import { ErrorStateMatcher } from '@angular/material/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; -import { - CONTAINS_TYPE, - EntityRelation, - EntitySearchDirection, - RelationTypeGroup -} from '@shared/models/relation.models'; -import { EntityRelationService } from '@core/http/entity-relation.service'; -import { EntityId } from '@shared/models/id/entity-id'; -import { forkJoin, Observable } from 'rxjs'; -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; import { Router } from '@angular/router'; -import { DialogComponent } from '@app/shared/components/dialog.component'; -import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; -import { AttributeService } from '@core/http/attribute.service'; +import { DialogComponent } from '@shared/components/dialog.component'; export interface ColorPickerDialogData { color: string; diff --git a/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.ts index 5359bf4d19..87610b7f5f 100644 --- a/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.ts +++ b/ui-ngx/src/app/shared/components/dialog/node-script-test-dialog.component.ts @@ -17,11 +17,13 @@ import { AfterViewInit, Component, - ElementRef, HostBinding, + ElementRef, + HostBinding, Inject, OnInit, QueryList, - SkipSelf, ViewChild, + SkipSelf, + ViewChild, ViewChildren, ViewEncapsulation } from '@angular/core'; @@ -30,15 +32,14 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; -import { combineLatest, never, Observable, of, throwError, NEVER } from 'rxjs'; +import { NEVER, Observable, of } from 'rxjs'; import { Router } from '@angular/router'; -import { DialogComponent } from '@app/shared/components/dialog.component'; +import { DialogComponent } from '@shared/components/dialog.component'; import { ContentType } from '@shared/models/constants'; -import { JsonObjectEditComponent } from '@shared/components/json-object-edit.component'; import { JsonContentComponent } from '@shared/components/json-content.component'; import { TestScriptInputParams } from '@shared/models/rule-node.models'; import { RuleChainService } from '@core/http/rule-chain.service'; -import { map, mergeMap } from 'rxjs/operators'; +import { mergeMap } from 'rxjs/operators'; import { ActionNotificationShow } from '@core/notification/notification.actions'; export interface NodeScriptTestDialogData {