Showing
6 changed files
with
15 additions
and
65 deletions
... | ... | @@ -14,22 +14,13 @@ |
14 | 14 | /// limitations under the License. |
15 | 15 | /// |
16 | 16 | |
17 | -import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core'; | |
17 | +import { Component, Inject, OnInit, SkipSelf } from '@angular/core'; | |
18 | 18 | import { ErrorStateMatcher } from '@angular/material/core'; |
19 | 19 | import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; |
20 | 20 | import { Store } from '@ngrx/store'; |
21 | 21 | import { AppState } from '@core/core.state'; |
22 | 22 | import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; |
23 | -import { | |
24 | - CONTAINS_TYPE, | |
25 | - EntityRelation, | |
26 | - EntitySearchDirection, | |
27 | - RelationTypeGroup | |
28 | -} from '@shared/models/relation.models'; | |
29 | -import { EntityRelationService } from '@core/http/entity-relation.service'; | |
30 | 23 | import { EntityId } from '@shared/models/id/entity-id'; |
31 | -import { forkJoin, Observable } from 'rxjs'; | |
32 | -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; | |
33 | 24 | import { Router } from '@angular/router'; |
34 | 25 | import { DialogComponent } from '@app/shared/components/dialog.component'; |
35 | 26 | import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; | ... | ... |
... | ... | @@ -14,26 +14,11 @@ |
14 | 14 | /// limitations under the License. |
15 | 15 | /// |
16 | 16 | |
17 | -import { Component, Inject, InjectionToken, OnInit, SkipSelf, ViewChild } from '@angular/core'; | |
17 | +import { Component, Inject, InjectionToken, OnInit, SkipSelf } from '@angular/core'; | |
18 | 18 | import { ErrorStateMatcher } from '@angular/material/core'; |
19 | -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; | |
20 | 19 | import { Store } from '@ngrx/store'; |
21 | 20 | import { AppState } from '@core/core.state'; |
22 | 21 | import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; |
23 | -import { | |
24 | - CONTAINS_TYPE, | |
25 | - EntityRelation, | |
26 | - EntitySearchDirection, | |
27 | - RelationTypeGroup | |
28 | -} from '@shared/models/relation.models'; | |
29 | -import { EntityRelationService } from '@core/http/entity-relation.service'; | |
30 | -import { EntityId } from '@shared/models/id/entity-id'; | |
31 | -import { forkJoin, Observable } from 'rxjs'; | |
32 | -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; | |
33 | -import { Router } from '@angular/router'; | |
34 | -import { DialogComponent } from '@app/shared/components/dialog.component'; | |
35 | -import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; | |
36 | -import { AttributeService } from '@core/http/attribute.service'; | |
37 | 22 | import { PageComponent } from '@shared/components/page.component'; |
38 | 23 | import { OverlayRef } from '@angular/cdk/overlay'; |
39 | 24 | ... | ... |
... | ... | @@ -29,9 +29,9 @@ import { |
29 | 29 | import { EntityRelationService } from '@core/http/entity-relation.service'; |
30 | 30 | import { EntityId } from '@shared/models/id/entity-id'; |
31 | 31 | import { forkJoin, Observable } from 'rxjs'; |
32 | -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; | |
32 | +import { JsonObjectEditComponent } from '@shared/components/json-object-edit.component'; | |
33 | 33 | import { Router } from '@angular/router'; |
34 | -import { DialogComponent } from '@app/shared/components/dialog.component'; | |
34 | +import { DialogComponent } from '@shared/components/dialog.component'; | |
35 | 35 | |
36 | 36 | export interface RelationDialogData { |
37 | 37 | isAdd: boolean; | ... | ... |
... | ... | @@ -20,25 +20,10 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; |
20 | 20 | import { Store } from '@ngrx/store'; |
21 | 21 | import { AppState } from '@core/core.state'; |
22 | 22 | import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; |
23 | -import { | |
24 | - CONTAINS_TYPE, | |
25 | - EntityRelation, | |
26 | - EntitySearchDirection, | |
27 | - RelationTypeGroup | |
28 | -} from '@shared/models/relation.models'; | |
29 | -import { EntityRelationService } from '@core/http/entity-relation.service'; | |
30 | -import { EntityId } from '@shared/models/id/entity-id'; | |
31 | -import { forkJoin, Observable } from 'rxjs'; | |
32 | -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; | |
33 | 23 | import { Router } from '@angular/router'; |
34 | -import { DialogComponent } from '@app/shared/components/dialog.component'; | |
35 | -import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; | |
36 | -import { AttributeService } from '@core/http/attribute.service'; | |
37 | -import { DataKey } from '@app/shared/models/widget.models'; | |
38 | -import { EntityAlias } from '@shared/models/alias.models'; | |
39 | -import { IAliasController } from '@core/api/widget-api.models'; | |
24 | +import { DialogComponent } from '@shared/components/dialog.component'; | |
25 | +import { DataKey } from '@shared/models/widget.models'; | |
40 | 26 | import { DataKeysCallbacks } from './data-keys.component.models'; |
41 | -import { JsFuncComponent } from '@shared/components/js-func.component'; | |
42 | 27 | import { DataKeyConfigComponent } from '@home/components/widget/data-key-config.component'; |
43 | 28 | |
44 | 29 | export interface DataKeyConfigDialogData { | ... | ... |
... | ... | @@ -14,26 +14,14 @@ |
14 | 14 | /// limitations under the License. |
15 | 15 | /// |
16 | 16 | |
17 | -import { Component, Inject, OnInit, SkipSelf, ViewChild } from '@angular/core'; | |
17 | +import { Component, Inject, OnInit, SkipSelf } from '@angular/core'; | |
18 | 18 | import { ErrorStateMatcher } from '@angular/material/core'; |
19 | 19 | import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; |
20 | 20 | import { Store } from '@ngrx/store'; |
21 | 21 | import { AppState } from '@core/core.state'; |
22 | 22 | import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; |
23 | -import { | |
24 | - CONTAINS_TYPE, | |
25 | - EntityRelation, | |
26 | - EntitySearchDirection, | |
27 | - RelationTypeGroup | |
28 | -} from '@shared/models/relation.models'; | |
29 | -import { EntityRelationService } from '@core/http/entity-relation.service'; | |
30 | -import { EntityId } from '@shared/models/id/entity-id'; | |
31 | -import { forkJoin, Observable } from 'rxjs'; | |
32 | -import { JsonObjectEditComponent } from '@app/shared/components/json-object-edit.component'; | |
33 | 23 | import { Router } from '@angular/router'; |
34 | -import { DialogComponent } from '@app/shared/components/dialog.component'; | |
35 | -import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models'; | |
36 | -import { AttributeService } from '@core/http/attribute.service'; | |
24 | +import { DialogComponent } from '@shared/components/dialog.component'; | |
37 | 25 | |
38 | 26 | export interface ColorPickerDialogData { |
39 | 27 | color: string; | ... | ... |
... | ... | @@ -17,11 +17,13 @@ |
17 | 17 | import { |
18 | 18 | AfterViewInit, |
19 | 19 | Component, |
20 | - ElementRef, HostBinding, | |
20 | + ElementRef, | |
21 | + HostBinding, | |
21 | 22 | Inject, |
22 | 23 | OnInit, |
23 | 24 | QueryList, |
24 | - SkipSelf, ViewChild, | |
25 | + SkipSelf, | |
26 | + ViewChild, | |
25 | 27 | ViewChildren, |
26 | 28 | ViewEncapsulation |
27 | 29 | } from '@angular/core'; |
... | ... | @@ -30,15 +32,14 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; |
30 | 32 | import { Store } from '@ngrx/store'; |
31 | 33 | import { AppState } from '@core/core.state'; |
32 | 34 | import { FormBuilder, FormControl, FormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms'; |
33 | -import { combineLatest, never, Observable, of, throwError, NEVER } from 'rxjs'; | |
35 | +import { NEVER, Observable, of } from 'rxjs'; | |
34 | 36 | import { Router } from '@angular/router'; |
35 | -import { DialogComponent } from '@app/shared/components/dialog.component'; | |
37 | +import { DialogComponent } from '@shared/components/dialog.component'; | |
36 | 38 | import { ContentType } from '@shared/models/constants'; |
37 | -import { JsonObjectEditComponent } from '@shared/components/json-object-edit.component'; | |
38 | 39 | import { JsonContentComponent } from '@shared/components/json-content.component'; |
39 | 40 | import { TestScriptInputParams } from '@shared/models/rule-node.models'; |
40 | 41 | import { RuleChainService } from '@core/http/rule-chain.service'; |
41 | -import { map, mergeMap } from 'rxjs/operators'; | |
42 | +import { mergeMap } from 'rxjs/operators'; | |
42 | 43 | import { ActionNotificationShow } from '@core/notification/notification.actions'; |
43 | 44 | |
44 | 45 | export interface NodeScriptTestDialogData { | ... | ... |