|
|
@ -172,7 +172,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
|
|
|
|
|
|
private updateObserveAttrTelemetryObjectFormGroup = (objectsList: ObjectLwM2M[]): void => { |
|
|
private updateObserveAttrTelemetryObjectFormGroup = (objectsList: ObjectLwM2M[]): void => { |
|
|
this.lwm2mDeviceProfileFormGroup.patchValue({ |
|
|
this.lwm2mDeviceProfileFormGroup.patchValue({ |
|
|
observeAttrTelemetry: this.getObserveAttrTelemetryObjects(objectsList) |
|
|
observeAttrTelemetry: deepClone(this.getObserveAttrTelemetryObjects(objectsList)) |
|
|
}, |
|
|
}, |
|
|
{emitEvent: false}); |
|
|
{emitEvent: false}); |
|
|
} |
|
|
} |
|
|
@ -195,32 +195,32 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private getObserveAttrTelemetryObjects = (listObject: ObjectLwM2M[]): object => { |
|
|
private getObserveAttrTelemetryObjects = (objectList: ObjectLwM2M[]): object => { |
|
|
const clientObserveAttrTelemetry = listObject; |
|
|
const objectLwM2MS = deepClone(objectList); |
|
|
if (this.configurationValue.observeAttr) { |
|
|
if (this.configurationValue.observeAttr && objectLwM2MS.length > 0) { |
|
|
const observeArray = this.configurationValue.observeAttr.observe; |
|
|
const observeArray = this.configurationValue.observeAttr.observe; |
|
|
const attributeArray = this.configurationValue.observeAttr.attribute; |
|
|
const attributeArray = this.configurationValue.observeAttr.attribute; |
|
|
const telemetryArray = this.configurationValue.observeAttr.telemetry; |
|
|
const telemetryArray = this.configurationValue.observeAttr.telemetry; |
|
|
let keyNameJson = this.configurationValue.observeAttr.keyName; |
|
|
let keyNameJson = this.configurationValue.observeAttr.keyName; |
|
|
if (this.includesNotZeroInstance(attributeArray, telemetryArray)) { |
|
|
if (this.includesNotZeroInstance(attributeArray, telemetryArray)) { |
|
|
this.addInstances(attributeArray, telemetryArray, clientObserveAttrTelemetry); |
|
|
this.addInstances(attributeArray, telemetryArray, objectLwM2MS); |
|
|
} |
|
|
} |
|
|
if (isDefinedAndNotNull(observeArray)) { |
|
|
if (isDefinedAndNotNull(observeArray)) { |
|
|
this.updateObserveAttrTelemetryObjects(observeArray, clientObserveAttrTelemetry, OBSERVE); |
|
|
this.updateObserveAttrTelemetryObjects(observeArray, objectLwM2MS, OBSERVE); |
|
|
} |
|
|
} |
|
|
if (isDefinedAndNotNull(attributeArray)) { |
|
|
if (isDefinedAndNotNull(attributeArray)) { |
|
|
this.updateObserveAttrTelemetryObjects(attributeArray, clientObserveAttrTelemetry, ATTRIBUTE); |
|
|
this.updateObserveAttrTelemetryObjects(attributeArray, objectLwM2MS, ATTRIBUTE); |
|
|
} |
|
|
} |
|
|
if (isDefinedAndNotNull(telemetryArray)) { |
|
|
if (isDefinedAndNotNull(telemetryArray)) { |
|
|
this.updateObserveAttrTelemetryObjects(telemetryArray, clientObserveAttrTelemetry, TELEMETRY); |
|
|
this.updateObserveAttrTelemetryObjects(telemetryArray, objectLwM2MS, TELEMETRY); |
|
|
} |
|
|
} |
|
|
if (isDefinedAndNotNull(keyNameJson)) { |
|
|
if (isDefinedAndNotNull(keyNameJson)) { |
|
|
this.configurationValue.observeAttr.keyName = this.validateKeyNameObjects(keyNameJson, attributeArray, telemetryArray); |
|
|
this.configurationValue.observeAttr.keyName = this.validateKeyNameObjects(keyNameJson, attributeArray, telemetryArray); |
|
|
this.upDateJsonAllConfig(); |
|
|
this.upDateJsonAllConfig(); |
|
|
this.updateKeyNameObjects(clientObserveAttrTelemetry); |
|
|
this.updateKeyNameObjects(objectLwM2MS); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return {clientLwM2M: clientObserveAttrTelemetry}; |
|
|
return {clientLwM2M: objectLwM2MS}; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private includesNotZeroInstance = (attribute: string[], telemetry: string[]): boolean => { |
|
|
private includesNotZeroInstance = (attribute: string[], telemetry: string[]): boolean => { |
|
|
@ -235,35 +235,39 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
.sort(this.sortPath); |
|
|
.sort(this.sortPath); |
|
|
|
|
|
|
|
|
new Set(instancesPath).forEach(path => { |
|
|
new Set(instancesPath).forEach(path => { |
|
|
const pathParameter = Array.from(path.split('/'), Number); |
|
|
const pathParameter = Array.from(path.split('/'), String); |
|
|
const objectLwM2M = clientObserveAttrTelemetry.find(x => x.id === pathParameter[0]); |
|
|
const objectLwM2M = clientObserveAttrTelemetry.find(x => x.keyId === pathParameter[0]); |
|
|
if (objectLwM2M) { |
|
|
if (objectLwM2M) { |
|
|
const instance = deepClone(objectLwM2M.instances[0]); |
|
|
const instance = deepClone(objectLwM2M.instances[0]); |
|
|
instance.id = pathParameter[1]; |
|
|
instance.id = +pathParameter[1]; |
|
|
objectLwM2M.instances.push(instance); |
|
|
objectLwM2M.instances.push(instance); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private updateObserveAttrTelemetryObjects = (parameters: string[], clientObserveAttrTelemetry: ObjectLwM2M[], |
|
|
private updateObserveAttrTelemetryObjects = (parameters: string[], objectLwM2MS: ObjectLwM2M[], |
|
|
nameParameter: string): void => { |
|
|
nameParameter: string): void => { |
|
|
parameters.forEach(parameter => { |
|
|
parameters.forEach(parameter => { |
|
|
const [objectId, instanceId, resourceId] = Array.from(parameter.substring(1).split('/'), Number); |
|
|
const [objectKeyId, instanceId, resourceId] = Array.from(parameter.substring(1).split('/'), String); |
|
|
clientObserveAttrTelemetry.find(objectLwm2m => objectLwm2m.id === objectId) |
|
|
const objectLwM2M = objectLwM2MS.find(objectLwm2m => objectLwm2m.keyId === objectKeyId); |
|
|
.instances.find(itrInstance => itrInstance.id === instanceId) |
|
|
if (objectLwM2M) { |
|
|
.resources.find(resource => resource.id === resourceId) |
|
|
objectLwM2M.instances.find(itrInstance => itrInstance.id === +instanceId) |
|
|
[nameParameter] = true; |
|
|
.resources.find(resource => resource.id === +resourceId) |
|
|
|
|
|
[nameParameter] = true; |
|
|
|
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private updateKeyNameObjects = (clientObserveAttrTelemetry: ObjectLwM2M[]): void => { |
|
|
private updateKeyNameObjects = (clientObserveAttrTelemetry: ObjectLwM2M[]): void => { |
|
|
Object.keys(this.configurationValue.observeAttr.keyName).forEach(key => { |
|
|
Object.keys(this.configurationValue.observeAttr.keyName).forEach(key => { |
|
|
const [objectId, instanceId, resourceId] = Array.from(key.substring(1).split('/'), Number); |
|
|
const [objectKeyId, instanceId, resourceId] = Array.from(key.substring(1).split('/'), String); |
|
|
clientObserveAttrTelemetry.find(objectLwm2m => objectLwm2m.id === objectId) |
|
|
const objectLwM2M = clientObserveAttrTelemetry.find(objectLwm2m => objectLwm2m.keyId === objectKeyId) |
|
|
.instances.find(instance => instance.id === instanceId) |
|
|
if (objectLwM2M) { |
|
|
.resources.find(resource => resource.id === resourceId) |
|
|
objectLwM2M.instances.find(instance => instance.id === +instanceId) |
|
|
|
|
|
.resources.find(resource => resource.id === +resourceId) |
|
|
.keyName = this.configurationValue.observeAttr.keyName[key]; |
|
|
.keyName = this.configurationValue.observeAttr.keyName[key]; |
|
|
}); |
|
|
}}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private validateKeyNameObjects = (nameJson: JsonObject, attributeArray: JsonArray, telemetryArray: JsonArray): {} => { |
|
|
private validateKeyNameObjects = (nameJson: JsonObject, attributeArray: JsonArray, telemetryArray: JsonArray): {} => { |
|
|
@ -290,7 +294,7 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
if (instance.hasOwnProperty(RESOURCES) && Array.isArray(instance.resources)) { |
|
|
if (instance.hasOwnProperty(RESOURCES) && Array.isArray(instance.resources)) { |
|
|
instance.resources.forEach(resource => { |
|
|
instance.resources.forEach(resource => { |
|
|
if (resource.attribute || resource.telemetry) { |
|
|
if (resource.attribute || resource.telemetry) { |
|
|
let pathRes = `/${obj.id}/${instance.id}/${resource.id}`; |
|
|
let pathRes = `/${obj.keyId}/${instance.id}/${resource.id}`; |
|
|
if (resource.observe) { |
|
|
if (resource.observe) { |
|
|
observeArray.push(pathRes); |
|
|
observeArray.push(pathRes); |
|
|
} |
|
|
} |
|
|
@ -345,22 +349,22 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private getObjectsFromJsonAllConfig = (): number[] => { |
|
|
private getObjectsFromJsonAllConfig = (): string[] => { |
|
|
const objectsIds = new Set<number>(); |
|
|
const objectsIds = new Set<string>(); |
|
|
if (this.configurationValue.observeAttr) { |
|
|
if (this.configurationValue.observeAttr) { |
|
|
if (this.configurationValue.observeAttr.observe) { |
|
|
if (this.configurationValue.observeAttr.observe) { |
|
|
this.configurationValue.observeAttr.observe.forEach(obj => { |
|
|
this.configurationValue.observeAttr.observe.forEach(obj => { |
|
|
objectsIds.add(Array.from(obj.substring(1).split('/'), Number)[0]); |
|
|
objectsIds.add(Array.from(obj.substring(1).split('/'), String)[0]); |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
if (this.configurationValue.observeAttr.attribute) { |
|
|
if (this.configurationValue.observeAttr.attribute) { |
|
|
this.configurationValue.observeAttr.attribute.forEach(obj => { |
|
|
this.configurationValue.observeAttr.attribute.forEach(obj => { |
|
|
objectsIds.add(Array.from(obj.substring(1).split('/'), Number)[0]); |
|
|
objectsIds.add(Array.from(obj.substring(1).split('/'), String)[0]); |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
if (this.configurationValue.observeAttr.telemetry) { |
|
|
if (this.configurationValue.observeAttr.telemetry) { |
|
|
this.configurationValue.observeAttr.telemetry.forEach(obj => { |
|
|
this.configurationValue.observeAttr.telemetry.forEach(obj => { |
|
|
objectsIds.add(Array.from(obj.substring(1).split('/'), Number)[0]); |
|
|
objectsIds.add(Array.from(obj.substring(1).split('/'), String)[0]); |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -379,21 +383,21 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
|
|
|
|
|
|
removeObjectsList = (value: ObjectLwM2M): void => { |
|
|
removeObjectsList = (value: ObjectLwM2M): void => { |
|
|
const objectsOld = this.lwm2mDeviceProfileFormGroup.get(OBSERVE_ATTR_TELEMETRY).value.clientLwM2M; |
|
|
const objectsOld = this.lwm2mDeviceProfileFormGroup.get(OBSERVE_ATTR_TELEMETRY).value.clientLwM2M; |
|
|
const isIdIndex = (element) => element.id === value.id; |
|
|
const isIdIndex = (element) => element.keyId === value.keyId; |
|
|
const index = objectsOld.findIndex(isIdIndex); |
|
|
const index = objectsOld.findIndex(isIdIndex); |
|
|
if (index >= 0) { |
|
|
if (index >= 0) { |
|
|
objectsOld.splice(index, 1); |
|
|
objectsOld.splice(index, 1); |
|
|
} |
|
|
} |
|
|
this.removeObserveAttrTelemetryFromJson(OBSERVE, value.id); |
|
|
this.removeObserveAttrTelemetryFromJson(OBSERVE, value.keyId); |
|
|
this.removeObserveAttrTelemetryFromJson(TELEMETRY, value.id); |
|
|
this.removeObserveAttrTelemetryFromJson(TELEMETRY, value.keyId); |
|
|
this.removeObserveAttrTelemetryFromJson(ATTRIBUTE, value.id); |
|
|
this.removeObserveAttrTelemetryFromJson(ATTRIBUTE, value.keyId); |
|
|
this.removeKeyNameFromJson(value.id); |
|
|
this.removeKeyNameFromJson(value.keyId); |
|
|
this.updateObserveAttrTelemetryObjectFormGroup(objectsOld); |
|
|
this.updateObserveAttrTelemetryObjectFormGroup(objectsOld); |
|
|
this.upDateJsonAllConfig(); |
|
|
this.upDateJsonAllConfig(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private removeObserveAttrTelemetryFromJson = (observeAttrTel: string, id: number): void => { |
|
|
private removeObserveAttrTelemetryFromJson = (observeAttrTel: string, keyId: string): void => { |
|
|
const isIdIndex = (element) => element.startsWith(`/${id}`); |
|
|
const isIdIndex = (element) => element.startsWith(`/${keyId}`); |
|
|
let index = this.configurationValue.observeAttr[observeAttrTel].findIndex(isIdIndex); |
|
|
let index = this.configurationValue.observeAttr[observeAttrTel].findIndex(isIdIndex); |
|
|
while (index >= 0) { |
|
|
while (index >= 0) { |
|
|
this.configurationValue.observeAttr[observeAttrTel].splice(index, 1); |
|
|
this.configurationValue.observeAttr[observeAttrTel].splice(index, 1); |
|
|
@ -401,10 +405,10 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private removeKeyNameFromJson = (id: number): void => { |
|
|
private removeKeyNameFromJson = (keyId: string): void => { |
|
|
const keyNameJson = this.configurationValue.observeAttr.keyName; |
|
|
const keyNameJson = this.configurationValue.observeAttr.keyName; |
|
|
Object.keys(keyNameJson).forEach(key => { |
|
|
Object.keys(keyNameJson).forEach(key => { |
|
|
if (key.startsWith(`/${id}`)) { |
|
|
if (key.startsWith(`/${keyId}`)) { |
|
|
delete keyNameJson[key]; |
|
|
delete keyNameJson[key]; |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
|
nickAS21
6 years ago
Andrew Shvayka