Commit 5a3dfec7f2ba1cfce54c86bf46a49df893cec0a0

Authored by Vladyslav_Prykhodko
1 parent bccbecad

UI: Rename component security-config

ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.html renamed from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m-server.component.html
ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m-server.component.ts renamed from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m-server.component.ts
@@ -39,24 +39,24 @@ import { takeUntil } from 'rxjs/operators'; @@ -39,24 +39,24 @@ import { takeUntil } from 'rxjs/operators';
39 import { Subject } from 'rxjs'; 39 import { Subject } from 'rxjs';
40 40
41 @Component({ 41 @Component({
42 - selector: 'tb-security-config-lwm2m-server',  
43 - templateUrl: './security-config-lwm2m-server.component.html', 42 + selector: 'tb-device-credentials-lwm2m-server',
  43 + templateUrl: './device-credentials-lwm2m-server.component.html',
44 styleUrls: [], 44 styleUrls: [],
45 providers: [ 45 providers: [
46 { 46 {
47 provide: NG_VALUE_ACCESSOR, 47 provide: NG_VALUE_ACCESSOR,
48 - useExisting: forwardRef(() => SecurityConfigLwm2mServerComponent), 48 + useExisting: forwardRef(() => DeviceCredentialsLwm2mServerComponent),
49 multi: true 49 multi: true
50 }, 50 },
51 { 51 {
52 provide: NG_VALIDATORS, 52 provide: NG_VALIDATORS,
53 - useExisting: forwardRef(() => SecurityConfigLwm2mServerComponent), 53 + useExisting: forwardRef(() => DeviceCredentialsLwm2mServerComponent),
54 multi: true 54 multi: true
55 } 55 }
56 ] 56 ]
57 }) 57 })
58 58
59 -export class SecurityConfigLwm2mServerComponent implements OnDestroy, ControlValueAccessor, Validator { 59 +export class DeviceCredentialsLwm2mServerComponent implements OnDestroy, ControlValueAccessor, Validator {
60 60
61 serverFormGroup: FormGroup; 61 serverFormGroup: FormGroup;
62 securityConfigLwM2MType = Lwm2mSecurityType; 62 securityConfigLwM2MType = Lwm2mSecurityType;
ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.html renamed from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.html
@@ -89,9 +89,9 @@ @@ -89,9 +89,9 @@
89 </mat-panel-title> 89 </mat-panel-title>
90 </mat-expansion-panel-header> 90 </mat-expansion-panel-header>
91 <ng-template matExpansionPanelContent> 91 <ng-template matExpansionPanelContent>
92 - <tb-security-config-lwm2m-server 92 + <tb-device-credentials-lwm2m-server
93 formControlName="bootstrapServer"> 93 formControlName="bootstrapServer">
94 - </tb-security-config-lwm2m-server> 94 + </tb-device-credentials-lwm2m-server>
95 </ng-template> 95 </ng-template>
96 </mat-expansion-panel> 96 </mat-expansion-panel>
97 <mat-expansion-panel> 97 <mat-expansion-panel>
@@ -101,9 +101,9 @@ @@ -101,9 +101,9 @@
101 </mat-panel-title> 101 </mat-panel-title>
102 </mat-expansion-panel-header> 102 </mat-expansion-panel-header>
103 <ng-template matExpansionPanelContent> 103 <ng-template matExpansionPanelContent>
104 - <tb-security-config-lwm2m-server 104 + <tb-device-credentials-lwm2m-server
105 formControlName="lwm2mServer"> 105 formControlName="lwm2mServer">
106 - </tb-security-config-lwm2m-server> 106 + </tb-device-credentials-lwm2m-server>
107 </ng-template> 107 </ng-template>
108 </mat-expansion-panel> 108 </mat-expansion-panel>
109 </mat-accordion> 109 </mat-accordion>
ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.scss renamed from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.scss
ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.ts renamed from ui-ngx/src/app/modules/home/components/device/security-config-lwm2m.component.ts
@@ -40,24 +40,24 @@ import { takeUntil } from 'rxjs/operators'; @@ -40,24 +40,24 @@ import { takeUntil } from 'rxjs/operators';
40 import { isDefinedAndNotNull } from '@core/utils'; 40 import { isDefinedAndNotNull } from '@core/utils';
41 41
42 @Component({ 42 @Component({
43 - selector: 'tb-security-config-lwm2m',  
44 - templateUrl: './security-config-lwm2m.component.html',  
45 - styleUrls: ['./security-config-lwm2m.component.scss'], 43 + selector: 'tb-device-credentials-lwm2m',
  44 + templateUrl: './device-credentials-lwm2m.component.html',
  45 + styleUrls: ['./device-credentials-lwm2m.component.scss'],
46 providers: [ 46 providers: [
47 { 47 {
48 provide: NG_VALUE_ACCESSOR, 48 provide: NG_VALUE_ACCESSOR,
49 - useExisting: forwardRef(() => SecurityConfigLwm2mComponent), 49 + useExisting: forwardRef(() => DeviceCredentialsLwm2mComponent),
50 multi: true 50 multi: true
51 }, 51 },
52 { 52 {
53 provide: NG_VALIDATORS, 53 provide: NG_VALIDATORS,
54 - useExisting: forwardRef(() => SecurityConfigLwm2mComponent), 54 + useExisting: forwardRef(() => DeviceCredentialsLwm2mComponent),
55 multi: true 55 multi: true
56 } 56 }
57 ] 57 ]
58 }) 58 })
59 59
60 -export class SecurityConfigLwm2mComponent implements ControlValueAccessor, Validator, OnDestroy { 60 +export class DeviceCredentialsLwm2mComponent implements ControlValueAccessor, Validator, OnDestroy {
61 61
62 lwm2mConfigFormGroup: FormGroup; 62 lwm2mConfigFormGroup: FormGroup;
63 securityConfigLwM2MType = Lwm2mSecurityType; 63 securityConfigLwM2MType = Lwm2mSecurityType;
@@ -51,8 +51,8 @@ @@ -51,8 +51,8 @@
51 </tb-device-credentials-mqtt-basic> 51 </tb-device-credentials-mqtt-basic>
52 </ng-template> 52 </ng-template>
53 <ng-template [ngSwitchCase]="deviceCredentialsType.LWM2M_CREDENTIALS"> 53 <ng-template [ngSwitchCase]="deviceCredentialsType.LWM2M_CREDENTIALS">
54 - <tb-security-config-lwm2m formControlName="credentialsValue">  
55 - </tb-security-config-lwm2m> 54 + <tb-device-credentials-lwm2m formControlName="credentialsValue">
  55 + </tb-device-credentials-lwm2m>
56 </ng-template> 56 </ng-template>
57 </div> 57 </div>
58 </section> 58 </section>
@@ -19,16 +19,16 @@ import { CommonModule } from '@angular/common'; @@ -19,16 +19,16 @@ import { CommonModule } from '@angular/common';
19 import { SharedModule } from '@shared/shared.module'; 19 import { SharedModule } from '@shared/shared.module';
20 import { CopyDeviceCredentialsComponent } from './copy-device-credentials.component'; 20 import { CopyDeviceCredentialsComponent } from './copy-device-credentials.component';
21 import { DeviceCredentialsComponent } from './device-credentials.component'; 21 import { DeviceCredentialsComponent } from './device-credentials.component';
22 -import { SecurityConfigLwm2mComponent } from './security-config-lwm2m.component';  
23 -import { SecurityConfigLwm2mServerComponent } from './security-config-lwm2m-server.component'; 22 +import { DeviceCredentialsLwm2mComponent } from './device-credentials-lwm2m.component';
  23 +import { DeviceCredentialsLwm2mServerComponent } from './device-credentials-lwm2m-server.component';
24 import { DeviceCredentialsMqttBasicComponent } from './device-credentials-mqtt-basic.component'; 24 import { DeviceCredentialsMqttBasicComponent } from './device-credentials-mqtt-basic.component';
25 25
26 @NgModule({ 26 @NgModule({
27 declarations: [ 27 declarations: [
28 CopyDeviceCredentialsComponent, 28 CopyDeviceCredentialsComponent,
29 DeviceCredentialsComponent, 29 DeviceCredentialsComponent,
30 - SecurityConfigLwm2mComponent,  
31 - SecurityConfigLwm2mServerComponent, 30 + DeviceCredentialsLwm2mComponent,
  31 + DeviceCredentialsLwm2mServerComponent,
32 DeviceCredentialsMqttBasicComponent 32 DeviceCredentialsMqttBasicComponent
33 ], 33 ],
34 imports: [ 34 imports: [
@@ -38,8 +38,8 @@ import { DeviceCredentialsMqttBasicComponent } from './device-credentials-mqtt-b @@ -38,8 +38,8 @@ import { DeviceCredentialsMqttBasicComponent } from './device-credentials-mqtt-b
38 exports: [ 38 exports: [
39 CopyDeviceCredentialsComponent, 39 CopyDeviceCredentialsComponent,
40 DeviceCredentialsComponent, 40 DeviceCredentialsComponent,
41 - SecurityConfigLwm2mComponent,  
42 - SecurityConfigLwm2mServerComponent, 41 + DeviceCredentialsLwm2mComponent,
  42 + DeviceCredentialsLwm2mServerComponent,
43 DeviceCredentialsMqttBasicComponent 43 DeviceCredentialsMqttBasicComponent
44 ] 44 ]
45 }) 45 })