|
|
@ -14,35 +14,36 @@ |
|
|
/// limitations under the License.
|
|
|
/// limitations under the License.
|
|
|
///
|
|
|
///
|
|
|
|
|
|
|
|
|
import { Component, forwardRef, Input, OnInit } from '@angular/core'; |
|
|
import { Component, forwardRef, Input, OnDestroy } from '@angular/core'; |
|
|
import { |
|
|
import { |
|
|
AbstractControl, |
|
|
AbstractControl, |
|
|
ControlValueAccessor, |
|
|
ControlValueAccessor, |
|
|
FormArray, |
|
|
FormArray, |
|
|
FormBuilder, |
|
|
FormBuilder, |
|
|
FormControl, |
|
|
|
|
|
FormGroup, |
|
|
FormGroup, |
|
|
NG_VALIDATORS, |
|
|
NG_VALIDATORS, |
|
|
NG_VALUE_ACCESSOR, |
|
|
NG_VALUE_ACCESSOR, |
|
|
Validator, |
|
|
Validator, |
|
|
Validators |
|
|
Validators |
|
|
} from '@angular/forms'; |
|
|
} from '@angular/forms'; |
|
|
import { Subscription } from 'rxjs'; |
|
|
import { Subject, Subscription } from 'rxjs'; |
|
|
import { |
|
|
import { |
|
|
ATTRIBUTE_KEYS, |
|
|
AttributeName, |
|
|
ATTRIBUTE_LWM2M_ENUM, |
|
|
AttributeNameTranslationMap, |
|
|
ATTRIBUTE_LWM2M_MAP |
|
|
AttributesNameValue, |
|
|
|
|
|
AttributesNameValueMap, |
|
|
|
|
|
valueValidatorByAttributeName |
|
|
} from './lwm2m-profile-config.models'; |
|
|
} from './lwm2m-profile-config.models'; |
|
|
import { isDefinedAndNotNull, isEmpty, isEmptyStr, isUndefinedOrNull } from '@core/utils'; |
|
|
import { isUndefinedOrNull } from '@core/utils'; |
|
|
import { Store } from '@ngrx/store'; |
|
|
import { Store } from '@ngrx/store'; |
|
|
import { AppState } from '@core/core.state'; |
|
|
import { AppState } from '@core/core.state'; |
|
|
import { PageComponent } from '@shared/components/page.component'; |
|
|
import { PageComponent } from '@shared/components/page.component'; |
|
|
|
|
|
import { takeUntil } from 'rxjs/operators'; |
|
|
|
|
|
|
|
|
@Component({ |
|
|
@Component({ |
|
|
selector: 'tb-lwm2m-attributes-key-list', |
|
|
selector: 'tb-lwm2m-attributes-key-list', |
|
|
templateUrl: './lwm2m-attributes-key-list.component.html', |
|
|
templateUrl: './lwm2m-attributes-key-list.component.html', |
|
|
styleUrls: ['./lwm2m-attributes.component.scss'], |
|
|
styleUrls: ['./lwm2m-attributes-key-list.component.scss'], |
|
|
providers: [ |
|
|
providers: [ |
|
|
{ |
|
|
{ |
|
|
provide: NG_VALUE_ACCESSOR, |
|
|
provide: NG_VALUE_ACCESSOR, |
|
|
@ -56,39 +57,46 @@ import { PageComponent } from '@shared/components/page.component'; |
|
|
} |
|
|
} |
|
|
] |
|
|
] |
|
|
}) |
|
|
}) |
|
|
export class Lwm2mAttributesKeyListComponent extends PageComponent implements ControlValueAccessor, OnInit, Validator { |
|
|
export class Lwm2mAttributesKeyListComponent extends PageComponent implements ControlValueAccessor, OnDestroy, OnDestroy, Validator { |
|
|
|
|
|
|
|
|
attrKeys = ATTRIBUTE_KEYS; |
|
|
|
|
|
|
|
|
|
|
|
attrKey = ATTRIBUTE_LWM2M_ENUM; |
|
|
|
|
|
|
|
|
|
|
|
attributeLwm2mMap = ATTRIBUTE_LWM2M_MAP; |
|
|
attributeNames; |
|
|
|
|
|
attributeNameTranslationMap = AttributeNameTranslationMap; |
|
|
|
|
|
|
|
|
@Input() disabled: boolean; |
|
|
@Input() disabled: boolean; |
|
|
|
|
|
|
|
|
@Input() titleText: string; |
|
|
@Input() |
|
|
|
|
|
isResource = false; |
|
|
|
|
|
|
|
|
@Input() noDataText: string; |
|
|
attributesValueFormGroup: FormGroup; |
|
|
|
|
|
|
|
|
kvListFormGroup: FormGroup; |
|
|
|
|
|
|
|
|
|
|
|
private propagateChange = null; |
|
|
private propagateChange = null; |
|
|
|
|
|
private valueChange$: Subscription = null; |
|
|
private valueChangeSubscription: Subscription = null; |
|
|
private destroy$ = new Subject(); |
|
|
|
|
|
private usedAttributesName: AttributeName[] = []; |
|
|
|
|
|
|
|
|
constructor(protected store: Store<AppState>, |
|
|
constructor(protected store: Store<AppState>, |
|
|
private fb: FormBuilder) { |
|
|
private fb: FormBuilder) { |
|
|
super(store); |
|
|
super(store); |
|
|
|
|
|
this.attributesValueFormGroup = this.fb.group({ |
|
|
|
|
|
attributesValue: this.fb.array([]) |
|
|
|
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
ngOnInit() { |
|
|
this.kvListFormGroup = this.fb.group({}); |
|
|
if (this.isResource) { |
|
|
this.kvListFormGroup.addControl('keyVals', |
|
|
this.attributeNames = Object.values(AttributeName); |
|
|
this.fb.array([])); |
|
|
} else { |
|
|
|
|
|
this.attributeNames = Object.values(AttributeName) |
|
|
|
|
|
.filter(item => ![AttributeName.lt, AttributeName.gt, AttributeName.st].includes(item)); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
keyValsFormArray(): FormArray { |
|
|
ngOnDestroy() { |
|
|
return this.kvListFormGroup.get('keyVals') as FormArray; |
|
|
if (this.valueChange$) { |
|
|
|
|
|
this.valueChange$.unsubscribe(); |
|
|
|
|
|
} |
|
|
|
|
|
this.destroy$.next(); |
|
|
|
|
|
this.destroy$.complete(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
registerOnChange(fn: any): void { |
|
|
registerOnChange(fn: any): void { |
|
|
@ -101,127 +109,111 @@ export class Lwm2mAttributesKeyListComponent extends PageComponent implements Co |
|
|
setDisabledState(isDisabled: boolean): void { |
|
|
setDisabledState(isDisabled: boolean): void { |
|
|
this.disabled = isDisabled; |
|
|
this.disabled = isDisabled; |
|
|
if (this.disabled) { |
|
|
if (this.disabled) { |
|
|
this.kvListFormGroup.disable({emitEvent: false}); |
|
|
this.attributesValueFormGroup.disable({emitEvent: false}); |
|
|
} else { |
|
|
} else { |
|
|
this.kvListFormGroup.enable({emitEvent: false}); |
|
|
this.attributesValueFormGroup.enable({emitEvent: false}); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
writeValue(keyValMap: { [key: string]: string }): void { |
|
|
writeValue(keyValMap: AttributesNameValueMap): void { |
|
|
if (this.valueChangeSubscription) { |
|
|
if (this.valueChange$) { |
|
|
this.valueChangeSubscription.unsubscribe(); |
|
|
this.valueChange$.unsubscribe(); |
|
|
} |
|
|
} |
|
|
const keyValsControls: Array<AbstractControl> = []; |
|
|
const attributesValueControls: Array<AbstractControl> = []; |
|
|
if (keyValMap) { |
|
|
if (keyValMap) { |
|
|
for (const property of Object.keys(keyValMap)) { |
|
|
(Object.keys(keyValMap) as AttributeName[]).forEach(name => { |
|
|
if (Object.prototype.hasOwnProperty.call(keyValMap, property)) { |
|
|
attributesValueControls.push(this.createdFormGroup({name, value: keyValMap[name]})); |
|
|
keyValsControls.push(this.fb.group({ |
|
|
}); |
|
|
key: [property, [Validators.required, this.attributeLwm2mKeyValidator]], |
|
|
|
|
|
value: [keyValMap[property], this.attributeLwm2mValueValidator(property)] |
|
|
|
|
|
})); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
this.kvListFormGroup.setControl('keyVals', this.fb.array(keyValsControls)); |
|
|
this.attributesValueFormGroup.setControl('attributesValue', this.fb.array(attributesValueControls)); |
|
|
this.valueChangeSubscription = this.kvListFormGroup.valueChanges.subscribe(() => { |
|
|
|
|
|
// this.updateValidate();
|
|
|
|
|
|
this.updateModel(); |
|
|
|
|
|
}); |
|
|
|
|
|
if (this.disabled) { |
|
|
if (this.disabled) { |
|
|
this.kvListFormGroup.disable({emitEvent: false}); |
|
|
this.attributesValueFormGroup.disable({emitEvent: false}); |
|
|
} else { |
|
|
} else { |
|
|
this.kvListFormGroup.enable({emitEvent: false}); |
|
|
this.attributesValueFormGroup.enable({emitEvent: false}); |
|
|
} |
|
|
} |
|
|
|
|
|
this.valueChange$ = this.attributesValueFormGroup.valueChanges.subscribe(() => { |
|
|
|
|
|
this.updateModel(); |
|
|
|
|
|
}); |
|
|
|
|
|
this.updateUsedAttributesName(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
attributesValueFormArray(): FormArray { |
|
|
|
|
|
return this.attributesValueFormGroup.get('attributesValue') as FormArray; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public removeKeyVal(index: number) { |
|
|
public removeKeyVal(index: number) { |
|
|
(this.kvListFormGroup.get('keyVals') as FormArray).removeAt(index); |
|
|
this.attributesValueFormArray().removeAt(index); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public addKeyVal() { |
|
|
public addKeyVal() { |
|
|
const keyValsFormArray = this.kvListFormGroup.get('keyVals') as FormArray; |
|
|
this.attributesValueFormArray().push(this.createdFormGroup()); |
|
|
keyValsFormArray.push(this.fb.group({ |
|
|
this.attributesValueFormGroup.updateValueAndValidity({emitEvent: false}); |
|
|
key: ['', [Validators.required, this.attributeLwm2mKeyValidator]], |
|
|
if (this.attributesValueFormGroup.invalid) { |
|
|
value: ['', []] |
|
|
this.updateModel(); |
|
|
})); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public validate(c?: FormControl) { |
|
|
|
|
|
const kvList: { key: string; value: string }[] = this.kvListFormGroup.get('keyVals').value; |
|
|
|
|
|
let valid = true; |
|
|
|
|
|
for (const entry of kvList) { |
|
|
|
|
|
if (isUndefinedOrNull(entry.key) || isEmptyStr(entry.key) || !ATTRIBUTE_KEYS.includes(entry.key)) { |
|
|
|
|
|
valid = false; |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
if (entry.key !== 'ver' && isNaN(Number(entry.value))) { |
|
|
|
|
|
valid = false; |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
return (valid) ? null : { |
|
|
|
|
|
keyVals: { |
|
|
|
|
|
valid: false, |
|
|
|
|
|
}, |
|
|
|
|
|
}; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private updateValidate() { |
|
|
private createdFormGroup(value?: AttributesNameValue): FormGroup { |
|
|
const kvList = this.kvListFormGroup.get('keyVals') as FormArray; |
|
|
if (isUndefinedOrNull(value)) { |
|
|
kvList.controls.forEach(fg => { |
|
|
value = { |
|
|
if (fg.get('key').value === 'ver') { |
|
|
name: this.getFirstUnusedAttributesName(), |
|
|
fg.get('value').setValidators(null); |
|
|
value: null |
|
|
fg.get('value').setErrors(null); |
|
|
}; |
|
|
} |
|
|
} |
|
|
else { |
|
|
const form = this.fb.group({ |
|
|
fg.get('value').setValidators(this.attributeLwm2mValueNumberValidator); |
|
|
name: [value.name, Validators.required], |
|
|
fg.get('value').setErrors(this.attributeLwm2mValueNumberValidator(fg.get('value'))); |
|
|
value: [value.value, valueValidatorByAttributeName(value.name)] |
|
|
} |
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
form.get('name').valueChanges.pipe( |
|
|
|
|
|
takeUntil(this.destroy$) |
|
|
|
|
|
).subscribe(name => { |
|
|
|
|
|
form.get('value').setValidators(valueValidatorByAttributeName(name)); |
|
|
|
|
|
form.get('value').updateValueAndValidity(); |
|
|
|
|
|
}); |
|
|
|
|
|
return form; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public validate() { |
|
|
|
|
|
return this.attributesValueFormGroup.valid ? null : { |
|
|
|
|
|
attributesValue: { |
|
|
|
|
|
valid: false |
|
|
|
|
|
} |
|
|
|
|
|
}; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private updateModel() { |
|
|
private updateModel() { |
|
|
this.updateValidate(); |
|
|
const value: AttributesNameValue[] = this.attributesValueFormGroup.get('attributesValue').value; |
|
|
if (this.validate() === null) { |
|
|
const attributesNameValueMap: AttributesNameValueMap = {}; |
|
|
const kvList: { key: string; value: string }[] = this.kvListFormGroup.get('keyVals').value; |
|
|
value.forEach(attribute => { |
|
|
const keyValMap: { [key: string]: string | number } = {}; |
|
|
attributesNameValueMap[attribute.name] = attribute.value; |
|
|
kvList.forEach((entry) => { |
|
|
}); |
|
|
if (isUndefinedOrNull(entry.value) || entry.key === 'ver' || isEmptyStr(entry.value.toString())) { |
|
|
this.updateUsedAttributesName(); |
|
|
keyValMap[entry.key] = entry.value.toString(); |
|
|
this.propagateChange(attributesNameValueMap); |
|
|
} else { |
|
|
|
|
|
keyValMap[entry.key] = Number(entry.value); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
this.propagateChange(keyValMap); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
this.propagateChange(null); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public isDisabledAttributeName(type: AttributeName, index: number): boolean { |
|
|
|
|
|
const usedIndex = this.usedAttributesName.indexOf(type); |
|
|
|
|
|
return usedIndex > -1 && usedIndex !== index; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private attributeLwm2mKeyValidator = (control: AbstractControl) => { |
|
|
private getFirstUnusedAttributesName(): AttributeName { |
|
|
const key = control.value as string; |
|
|
for (const attributeName of this.attributeNames) { |
|
|
if (isDefinedAndNotNull(key) && !isEmpty(key)) { |
|
|
if (this.usedAttributesName.indexOf(attributeName) === -1) { |
|
|
if (!ATTRIBUTE_KEYS.includes(key)) { |
|
|
return attributeName; |
|
|
return { |
|
|
|
|
|
validAttributeKey: true |
|
|
|
|
|
}; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private attributeLwm2mValueNumberValidator = (control: AbstractControl) => { |
|
|
private updateUsedAttributesName() { |
|
|
if (isNaN(Number(control.value)) || Number(control.value) < 0) { |
|
|
this.usedAttributesName = []; |
|
|
return { |
|
|
const value: AttributesNameValue[] = this.attributesValueFormGroup.get('attributesValue').value; |
|
|
validAttributeValue: true |
|
|
value.forEach((attributesValue, index) => { |
|
|
}; |
|
|
this.usedAttributesName[index] = attributesValue.name; |
|
|
} |
|
|
}); |
|
|
return null; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private attributeLwm2mValueValidator = (property: string): object[] => { |
|
|
get isAddEnabled(): boolean { |
|
|
return property === 'ver' ? [] : [this.attributeLwm2mValueNumberValidator]; |
|
|
return this.attributesValueFormArray().length !== this.attributeNames.length; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
Vladyslav_Prykhodko
5 years ago