|
|
@ -14,23 +14,24 @@ |
|
|
/// limitations under the License.
|
|
|
/// limitations under the License.
|
|
|
///
|
|
|
///
|
|
|
|
|
|
|
|
|
import { Component, EventEmitter, forwardRef, Input, OnInit, Output } from '@angular/core'; |
|
|
import { Component, EventEmitter, forwardRef, Input, OnDestroy, OnInit, Output } from '@angular/core'; |
|
|
import { |
|
|
import { |
|
|
AbstractControl, |
|
|
AbstractControl, |
|
|
ControlValueAccessor, |
|
|
ControlValueAccessor, |
|
|
FormArray, |
|
|
FormArray, |
|
|
FormBuilder, FormControl, |
|
|
FormBuilder, |
|
|
|
|
|
FormControl, |
|
|
FormGroup, |
|
|
FormGroup, |
|
|
NG_VALIDATORS, |
|
|
NG_VALIDATORS, |
|
|
NG_VALUE_ACCESSOR |
|
|
NG_VALUE_ACCESSOR |
|
|
} from '@angular/forms'; |
|
|
} from '@angular/forms'; |
|
|
import { of, Subscription } from 'rxjs'; |
|
|
import { of, Subject } from 'rxjs'; |
|
|
import { ServerSecurityConfig } from '@home/components/profile/device/lwm2m/lwm2m-profile-config.models'; |
|
|
import { ServerSecurityConfig } from '@home/components/profile/device/lwm2m/lwm2m-profile-config.models'; |
|
|
import { TranslateService } from '@ngx-translate/core'; |
|
|
import { TranslateService } from '@ngx-translate/core'; |
|
|
import { DialogService } from '@core/services/dialog.service'; |
|
|
import { DialogService } from '@core/services/dialog.service'; |
|
|
import { MatDialog } from '@angular/material/dialog'; |
|
|
import { MatDialog } from '@angular/material/dialog'; |
|
|
import { Lwm2mBootstrapAddConfigServerDialogComponent } from '@home/components/profile/device/lwm2m/lwm2m-bootstrap-add-config-server-dialog.component'; |
|
|
import { Lwm2mBootstrapAddConfigServerDialogComponent } from '@home/components/profile/device/lwm2m/lwm2m-bootstrap-add-config-server-dialog.component'; |
|
|
import { mergeMap } from 'rxjs/operators'; |
|
|
import { mergeMap, takeUntil } from 'rxjs/operators'; |
|
|
import { DeviceProfileService } from '@core/http/device-profile.service'; |
|
|
import { DeviceProfileService } from '@core/http/device-profile.service'; |
|
|
import { Lwm2mSecurityType } from '@shared/models/lwm2m-security-config.models'; |
|
|
import { Lwm2mSecurityType } from '@shared/models/lwm2m-security-config.models'; |
|
|
|
|
|
|
|
|
@ -50,7 +51,7 @@ import { Lwm2mSecurityType } from '@shared/models/lwm2m-security-config.models'; |
|
|
} |
|
|
} |
|
|
] |
|
|
] |
|
|
}) |
|
|
}) |
|
|
export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValueAccessor { |
|
|
export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValueAccessor, OnDestroy { |
|
|
|
|
|
|
|
|
bootstrapConfigServersFormGroup: FormGroup; |
|
|
bootstrapConfigServersFormGroup: FormGroup; |
|
|
|
|
|
|
|
|
@ -72,8 +73,7 @@ export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValu |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private valueChangeSubscription: Subscription = null; |
|
|
private destroy$ = new Subject(); |
|
|
|
|
|
|
|
|
private propagateChange = (v: any) => { }; |
|
|
private propagateChange = (v: any) => { }; |
|
|
|
|
|
|
|
|
constructor(public translate: TranslateService, |
|
|
constructor(public translate: TranslateService, |
|
|
@ -94,9 +94,17 @@ export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValu |
|
|
this.bootstrapConfigServersFormGroup = this.fb.group({ |
|
|
this.bootstrapConfigServersFormGroup = this.fb.group({ |
|
|
serverConfigs: this.fb.array([]) |
|
|
serverConfigs: this.fb.array([]) |
|
|
}); |
|
|
}); |
|
|
|
|
|
this.bootstrapConfigServersFormGroup.valueChanges.pipe( |
|
|
|
|
|
takeUntil(this.destroy$) |
|
|
|
|
|
).subscribe(() => this.updateModel()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ngOnDestroy() { |
|
|
|
|
|
this.destroy$.next(); |
|
|
|
|
|
this.destroy$.complete(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
serverConfigsFromArray(): FormArray { |
|
|
get serverConfigsFromArray(): FormArray { |
|
|
return this.bootstrapConfigServersFormGroup.get('serverConfigs') as FormArray; |
|
|
return this.bootstrapConfigServersFormGroup.get('serverConfigs') as FormArray; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -110,24 +118,22 @@ export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValu |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
writeValue(serverConfigs: Array<ServerSecurityConfig> | null): void { |
|
|
writeValue(serverConfigs: Array<ServerSecurityConfig> | null): void { |
|
|
if (this.valueChangeSubscription) { |
|
|
if (serverConfigs?.length === this.serverConfigsFromArray.length) { |
|
|
this.valueChangeSubscription.unsubscribe(); |
|
|
this.serverConfigsFromArray.patchValue(serverConfigs, {emitEvent: false}); |
|
|
} |
|
|
|
|
|
const serverConfigsControls: Array<AbstractControl> = []; |
|
|
|
|
|
if (serverConfigs) { |
|
|
|
|
|
serverConfigs.forEach((serverConfig) => { |
|
|
|
|
|
serverConfigsControls.push(this.fb.control(serverConfig)); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
this.bootstrapConfigServersFormGroup.setControl('serverConfigs', this.fb.array(serverConfigsControls)); |
|
|
|
|
|
if (this.disabled) { |
|
|
|
|
|
this.bootstrapConfigServersFormGroup.disable({emitEvent: false}); |
|
|
|
|
|
} else { |
|
|
} else { |
|
|
this.bootstrapConfigServersFormGroup.enable({emitEvent: false}); |
|
|
const serverConfigsControls: Array<AbstractControl> = []; |
|
|
|
|
|
if (serverConfigs) { |
|
|
|
|
|
serverConfigs.forEach((serverConfig) => { |
|
|
|
|
|
serverConfigsControls.push(this.fb.control(serverConfig)); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
this.bootstrapConfigServersFormGroup.setControl('serverConfigs', this.fb.array(serverConfigsControls), {emitEvent: false}); |
|
|
|
|
|
if (this.disabled) { |
|
|
|
|
|
this.bootstrapConfigServersFormGroup.disable({emitEvent: false}); |
|
|
|
|
|
} else { |
|
|
|
|
|
this.bootstrapConfigServersFormGroup.enable({emitEvent: false}); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
this.valueChangeSubscription = this.bootstrapConfigServersFormGroup.valueChanges.subscribe(() => { |
|
|
|
|
|
this.updateModel(); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
trackByParams(index: number): number { |
|
|
trackByParams(index: number): number { |
|
|
@ -147,7 +153,7 @@ export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValu |
|
|
true |
|
|
true |
|
|
).subscribe((result) => { |
|
|
).subscribe((result) => { |
|
|
if (result) { |
|
|
if (result) { |
|
|
this.serverConfigsFromArray().removeAt(index); |
|
|
this.serverConfigsFromArray.removeAt(index); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
@ -169,7 +175,7 @@ export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValu |
|
|
addServerConfigObs.subscribe((serverConfig) => { |
|
|
addServerConfigObs.subscribe((serverConfig) => { |
|
|
if (serverConfig) { |
|
|
if (serverConfig) { |
|
|
serverConfig.securityMode = Lwm2mSecurityType.NO_SEC; |
|
|
serverConfig.securityMode = Lwm2mSecurityType.NO_SEC; |
|
|
this.serverConfigsFromArray().push(this.fb.control(serverConfig)); |
|
|
this.serverConfigsFromArray.push(this.fb.control(serverConfig)); |
|
|
this.updateModel(); |
|
|
this.updateModel(); |
|
|
} else { |
|
|
} else { |
|
|
this.isTransportWasRunWithBootstrap = false; |
|
|
this.isTransportWasRunWithBootstrap = false; |
|
|
@ -196,7 +202,7 @@ export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValu |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private isBootstrapAdded(): boolean { |
|
|
private isBootstrapAdded(): boolean { |
|
|
const serverConfigsArray = this.serverConfigsFromArray().getRawValue(); |
|
|
const serverConfigsArray = this.serverConfigsFromArray.getRawValue(); |
|
|
for (let i = 0; i < serverConfigsArray.length; i++) { |
|
|
for (let i = 0; i < serverConfigsArray.length; i++) { |
|
|
if (serverConfigsArray[i].bootstrapServerIs) { |
|
|
if (serverConfigsArray[i].bootstrapServerIs) { |
|
|
return true; |
|
|
return true; |
|
|
@ -207,15 +213,15 @@ export class Lwm2mBootstrapConfigServersComponent implements OnInit, ControlValu |
|
|
|
|
|
|
|
|
private removeBootstrapServerConfig(): void { |
|
|
private removeBootstrapServerConfig(): void { |
|
|
if (this.bootstrapConfigServersFormGroup) { |
|
|
if (this.bootstrapConfigServersFormGroup) { |
|
|
const bootstrapServerIndex = this.serverConfigsFromArray().getRawValue().findIndex(server => server.bootstrapServerIs === true); |
|
|
const bootstrapServerIndex = this.serverConfigsFromArray.getRawValue().findIndex(server => server.bootstrapServerIs === true); |
|
|
if (bootstrapServerIndex !== -1) { |
|
|
if (bootstrapServerIndex !== -1) { |
|
|
this.serverConfigsFromArray().removeAt(bootstrapServerIndex); |
|
|
this.serverConfigsFromArray.removeAt(bootstrapServerIndex); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private updateModel() { |
|
|
private updateModel() { |
|
|
const serverConfigs: Array<ServerSecurityConfig> = this.serverConfigsFromArray().value; |
|
|
const serverConfigs: Array<ServerSecurityConfig> = this.serverConfigsFromArray.value; |
|
|
this.propagateChange(serverConfigs); |
|
|
this.propagateChange(serverConfigs); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
Artem Dzhereleiko
4 years ago