From fc33d6430887354de65bbe7cce9d42b821683d66 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Tue, 23 Jan 2024 17:34:10 +0530 Subject: [PATCH 01/34] computed device property config implementation. --- .../asset-properties.module.ts | 6 + .../common/asset-property-constant.ts | 137 +++++++++++++++++- ...sset-property-item-selector.component.html | 8 + .../asset-property-selector.component.html | 20 ++- .../asset-property-selector.component.ts | 30 ++++ .../computed-property-config-component.html | 57 ++++++++ .../computed-property-config.component.ts | 47 ++++++ .../last-measurement-config.component.html | 22 +++ .../last-measurement-config.component.ts | 29 ++++ 9 files changed, 353 insertions(+), 3 deletions(-) create mode 100644 asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config-component.html create mode 100644 asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts create mode 100644 asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html create mode 100644 asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.ts diff --git a/asset-properties-widget/asset-properties.module.ts b/asset-properties-widget/asset-properties.module.ts index 56235ea..2f0ac89 100644 --- a/asset-properties-widget/asset-properties.module.ts +++ b/asset-properties-widget/asset-properties.module.ts @@ -15,6 +15,9 @@ import { AssetPropertiesItemComponent } from './component/asset-properties-view/ import { assetPropertyItemSelectorCtrlComponent } from './component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component'; import { AssetPropertiesSelectorComponent } from './component/asset-properties-config/asset-property-selector/asset-property-selector.component'; import { SubAssetsModule } from '@c8y/ngx-components/sub-assets'; +import { ComputedPropertyConfigComponent } from './component/asset-properties-config/computed-asset-property/computed-property-config.component'; +import { DatapointSelectorModule } from '@c8y/ngx-components/datapoint-selector'; +import { ComputedPropertyLastMeasurementConfigComponent } from './component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component'; @NgModule({ declarations: [ @@ -24,6 +27,8 @@ import { SubAssetsModule } from '@c8y/ngx-components/sub-assets'; AssetPropertiesViewComponent, AssetPropertiesComponent, AssetPropertiesItemComponent, + ComputedPropertyConfigComponent, + ComputedPropertyLastMeasurementConfigComponent ], imports: [ CoreModule, @@ -32,6 +37,7 @@ import { SubAssetsModule } from '@c8y/ngx-components/sub-assets'; DragDropModule, RealtimeModule, SubAssetsModule, + DatapointSelectorModule, ], providers: [ { diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index 1dbbd0c..dddb2f3 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -51,4 +51,139 @@ export const property = [ isEditable: false, isExistingProperty: true, }, -]; + { + c8y_JsonSchema: { + properties: { alarmCountToday: { + title: 'Alarm count today', + type: 'number', + },}, + }, + name: 'alarmCountToday', + label: 'Alarm count today', + title: 'Alarm type', + type: 'string', + config:{type:''}, + computed: true, + isEditable: false, + isExistingProperty: true, + }, + { + c8y_JsonSchema: { + properties: { alarmCount3Months: { + title: 'Alarm count 3 months', + type: 'number', + },}, + }, + name: 'alarmCount3Months', + label: 'Alarm count 3 months', + title: 'Alarm type', + type: 'string', + config:{type:''}, + computed: true, + isEditable: false, + isExistingProperty: true, + }, + { + c8y_JsonSchema: { + properties: { eventCountToday: { + title: 'Event count today', + type: 'number', + },}, + }, + name: 'eventCountToday', + label: 'Event count today', + title: 'Event type', + type: 'string', + config:{type:''}, + computed: true, + isEditable: false, + isExistingProperty: true, + }, + { + c8y_JsonSchema: { + properties: { eventCount3Months: { + title: 'Event count 3 months', + type: 'number', + },}, + }, + name: 'eventCount3Months', + label: 'Event count 3 months', + title: 'Event type', + type: 'string', + config:{type:''}, + computed: true, + isEditable: false, + isExistingProperty: true, + }, + { + c8y_JsonSchema: { + properties: { lastDeviceMessage: { + title: 'Last device message', + type: 'string', + },}, + }, + name: 'lastDeviceMessage', + label: 'Last device message', + printFormat: 'datetime', + type: 'string', + computed: true, + isEditable: false, + isExistingProperty: true, + }, + { + c8y_JsonSchema: {properties: { lastMeasurement: { + title: 'Last measurement', + type: 'string', + },},}, + name: 'lastMeasurement', + label: 'Last measurement', + type: 'string', + config:{dp:[],isValid:null}, + computed: true, + isEditable: false, + isExistingProperty: true, + description: 'sdjfvsdjfvsdfvksdfvsdhfvskdh' + }, + { + c8y_JsonSchema: { + properties: { childDevicesCount: { + title: 'Number of child devices', + type: 'number', + },}, + }, + name: 'childDevicesCount', + label: 'Number of child devices', + type: 'number', + computed: true, + isEditable: false, + isExistingProperty: true, + }, + { + c8y_JsonSchema: { + properties: { childAssetsCount: { + title: 'Number of child assets', + type: 'number', + },}, + }, + name: 'childAssetsCount', + label: 'Number of child assets', + type: 'number', + computed: true, + isEditable: false, + isExistingProperty: true, + }, + { + c8y_JsonSchema: { + properties: { configurationSnapshot: { + title: 'Configuration snapshot', + type: 'number', + },}, + }, + name: 'configurationSnapshot', + label: 'Configuration snapshot', + type: 'number', + computed: true, + isEditable: false, + isExistingProperty: true, + } +]; \ No newline at end of file diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html index 8e6f4c4..ad04f48 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html @@ -91,6 +91,14 @@ > + {{ property.label ? property.label : (property.title | translate) }} diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html index 4f21cea..7106c6b 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html @@ -45,7 +45,7 @@ cdkDrag cdkDragLockAxis="y" class="property" - *ngFor="let property of properties" + *ngFor="let property of properties; index as i" class="table-row-not-expanded" > @@ -131,7 +131,23 @@ /> - {{ + + {{ (property.name | translate) || (property.keyPath?.join(".") | translate) }} diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts index ea7f27a..775ad25 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts @@ -12,6 +12,7 @@ import { property, } from '../../../common/asset-property-constant'; import { some } from 'lodash-es'; +import { ComputedPropertyConfigComponent } from '../computed-asset-property/computed-property-config.component'; type ModalInitialState = { title: string; @@ -29,12 +30,14 @@ export class AssetPropertiesSelectorComponent implements OnChanges { isLoading: boolean = false; assetType: IManagedObject; assetPropertySelectorModalRef: BsModalRef; + computedPropertyConfigModalRef: BsModalRef; properties = cloneDeep(defaultProperty); customProperties: IManagedObject[] = cloneDeep(defaultProperty).concat( cloneDeep(property) ); ExpandedComplexProperty: any; isAtleastOnePropertySelected: boolean = true; + selectedComputedPropertyIndex: number; constructor( private assetTypes: AssetTypesService, @@ -129,6 +132,12 @@ export class AssetPropertiesSelectorComponent implements OnChanges { ); this.isAtleastOnePropertySelected = true; this.config.properties = this.properties; + this.properties.forEach((property, idx, arr) => { + console.log(property); + if(property.computed && (!property.config.dp || !property.config.type)){ + this.configComputeProperty(idx); + } + }); this.assetPropertySelectorModalRef.hide(); } ); @@ -208,4 +217,25 @@ export class AssetPropertiesSelectorComponent implements OnChanges { drop(event: CdkDragDrop) { moveItemInArray(this.properties, event.previousIndex, event.currentIndex); } + + configComputeProperty(index){ + this.selectedComputedPropertyIndex = index; + this.computedPropertyConfigModalRef = this.modalService.show( + ComputedPropertyConfigComponent, + { + backdrop: 'static', + initialState: { + title: gettext('Computed property configuration'), + property: this.properties[index], + index: index + }, + } + ); + this.computedPropertyConfigModalRef.content.savePropertySelection.subscribe( + (object: any) => { + this.config.properties[object.index] = object.property; + // this.computedPropertyConfigModalRef.hide(); + } + ); + } } diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config-component.html b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config-component.html new file mode 100644 index 0000000..71d080c --- /dev/null +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config-component.html @@ -0,0 +1,57 @@ +
+
+ + +
+
+

+ {{ tempProperty.label | translate}} +

+
+ +
+ + +
+ +
+
+
+ + +
+
diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts new file mode 100644 index 0000000..89877d6 --- /dev/null +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts @@ -0,0 +1,47 @@ +import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; +import * as cloneDeep from 'lodash/cloneDeep'; +import { BsModalRef } from 'ngx-bootstrap/modal'; +import { IManagedObject } from '@c8y/client'; + +@Component({ + selector: 'c8y-computed-property-config-component', + templateUrl: './computed-property-config-component.html', +}) + +export class ComputedPropertyConfigComponent implements OnInit { + @Input() title?: string; + @Input() property?: IManagedObject; + @Input() index?:number; + + @Output() savePropertySelection = new EventEmitter(); + @Output() cancelPropertySelection = new EventEmitter(); + + tempProperty: IManagedObject; + config2: object = {type: 's7aRealTime_47773',_id: '5140160262811182'}; + configSchema: object = {properties:{type:{title: 'Event type',type: 'string'}},type: 'string'}; + constructor(private bsModal: BsModalRef) {} + ngOnInit(): void { + this.tempProperty = cloneDeep(this.property); + // this.configSchema = this.property.c8y_JsonSchema; + console.log('hii',this.configSchema); + // this.customProperties = cloneDeep(this.constructCustomProperties()); + } + + onSaveButtonClicked(): void { + this.property = this.tempProperty; + this.savePropertySelection.emit({property:this.property,index:this.index}); + this.bsModal.hide(); + } + + onCancelButtonClicked(): void { + this.bsModal.hide(); + } + isSaveButtonDisabled(): boolean{ + if(this.tempProperty.name == 'lastMeasurement'){ + return !this.tempProperty.config?.isValid; + }else{ + return !this.tempProperty.config?.type; + } + } + +} diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html new file mode 100644 index 0000000..69263f5 --- /dev/null +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html @@ -0,0 +1,22 @@ +
+ + +
+ +
+ +
+ +
+
diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.ts b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.ts new file mode 100644 index 0000000..cbb29a7 --- /dev/null +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.ts @@ -0,0 +1,29 @@ +import { Component, Input, Output, OnInit } from '@angular/core'; +import { IManagedObject } from '@c8y/client'; +import * as cloneDeep from 'lodash/cloneDeep'; +import { Observable } from 'rxjs'; + +@Component({ + selector: 'c8y-last-measurement-config', + templateUrl: './last-measurement-config.component.html', +}) +export class ComputedPropertyLastMeasurementConfigComponent implements OnInit { + @Input() property?: any; + + @Output() measurmentChange: Observable; + + selectedProperty: IManagedObject[] = []; + dataPoints: Array = []; + minSelectCount: number = 1; + maxSelectCount: number = 1; + configSchema: object = {properties:{type:{title: 'Event type',type: 'string'}},type: 'string'}; + + ngOnInit(): void { + this.dataPoints = this.property.config?.dp; + console.log('datapoint',this.dataPoints); + } + + validationChanged(isValid){ + this.property.config.isValid= isValid; + } +} From bf297eeeee1764a420f5577281c690754e89faef Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Tue, 30 Jan 2024 01:01:23 +0530 Subject: [PATCH 02/34] device property: last measurement implemantation added. --- .../common/asset-property-constant.ts | 14 ++- .../asset-property-selector.component.ts | 20 ++-- .../computed-property-config.component.ts | 12 +-- .../last-measurement-config.component.html | 13 ++- .../last-measurement-config.component.ts | 11 +-- .../asset-properties-view.component.html | 4 + .../asset-properties-view.component.ts | 60 +++++++++++- .../asset-properties.component.ts | 94 ++++++++++++++++--- 8 files changed, 184 insertions(+), 44 deletions(-) diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index dddb2f3..8b223ea 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -1,3 +1,5 @@ +import { gettext } from "@c8y/ngx-components"; + export const defaultProperty = [ { c8y_JsonSchema: { properties: { name: { type: 'string', label: 'Name' } } }, @@ -138,11 +140,10 @@ export const property = [ name: 'lastMeasurement', label: 'Last measurement', type: 'string', - config:{dp:[],isValid:null}, + config:{dp:[],isValid:null, resultTypes:1}, computed: true, isEditable: false, isExistingProperty: true, - description: 'sdjfvsdjfvsdfvksdfvsdhfvskdh' }, { c8y_JsonSchema: { @@ -186,4 +187,11 @@ export const property = [ isEditable: false, isExistingProperty: true, } -]; \ No newline at end of file +]; + +export const RESULT_TYPES = { + VALUE: { name: 'VALUE', value: 1, label: gettext('Only value') }, + VALUE_UNIT: { name: 'VALUE_UNIT', value: 2, label: gettext('Value and unit') }, + VALUE_UNIT_TIME: { name: 'VALUE_UNIT_TIME', value: 3, label: gettext('Value, unit and time') }, + // OBJECT: { name: 'OBJECT', value: 4, label: gettext('Complete object') } +}; \ No newline at end of file diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts index 775ad25..5daeaf0 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts @@ -132,10 +132,10 @@ export class AssetPropertiesSelectorComponent implements OnChanges { ); this.isAtleastOnePropertySelected = true; this.config.properties = this.properties; - this.properties.forEach((property, idx, arr) => { - console.log(property); - if(property.computed && (!property.config.dp || !property.config.type)){ - this.configComputeProperty(idx); + this.properties.forEach((property, index) => { + if(property.computed && property.config && !(property.config.dp?.length>0 || property.config.type)){ + this.config.properties[index].config = {...this.config.properties[index].config, ...{id:String(Math.random()).substr(2)}}; + this.configComputeProperty(index); } }); this.assetPropertySelectorModalRef.hide(); @@ -183,7 +183,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { return item.name || item.title; }) .indexOf(property.name || property.title); - if (removeIndex >= 0) { + if (removeIndex >= 0 && !property.config) { this.properties[removeIndex] = property; properties.splice(index, 1); this.removeSelectedProperties(properties); @@ -231,10 +231,16 @@ export class AssetPropertiesSelectorComponent implements OnChanges { }, } ); - this.computedPropertyConfigModalRef.content.savePropertySelection.subscribe( + this.computedPropertyConfigModalRef.content.savePropertyConfiguration.subscribe( (object: any) => { this.config.properties[object.index] = object.property; - // this.computedPropertyConfigModalRef.hide(); + } + ); + this.computedPropertyConfigModalRef.content.cancelPropertyConfiguration.subscribe( + (index: number) => { + if(!(this.config.properties[index].config.dp?.length>0 || this.config.properties[index].config.type)){ + this.config.properties.splice(index, 1); + } } ); } diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts index 89877d6..85017d3 100644 --- a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts @@ -13,27 +13,23 @@ export class ComputedPropertyConfigComponent implements OnInit { @Input() property?: IManagedObject; @Input() index?:number; - @Output() savePropertySelection = new EventEmitter(); - @Output() cancelPropertySelection = new EventEmitter(); + @Output() savePropertyConfiguration = new EventEmitter(); + @Output() cancelPropertyConfiguration = new EventEmitter(); tempProperty: IManagedObject; - config2: object = {type: 's7aRealTime_47773',_id: '5140160262811182'}; - configSchema: object = {properties:{type:{title: 'Event type',type: 'string'}},type: 'string'}; constructor(private bsModal: BsModalRef) {} ngOnInit(): void { this.tempProperty = cloneDeep(this.property); - // this.configSchema = this.property.c8y_JsonSchema; - console.log('hii',this.configSchema); - // this.customProperties = cloneDeep(this.constructCustomProperties()); } onSaveButtonClicked(): void { this.property = this.tempProperty; - this.savePropertySelection.emit({property:this.property,index:this.index}); + this.savePropertyConfiguration.emit({property:this.property,index:this.index}); this.bsModal.hide(); } onCancelButtonClicked(): void { + this.cancelPropertyConfiguration.emit(this.index); this.bsModal.hide(); } isSaveButtonDisabled(): boolean{ diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html index 69263f5..14ae0da 100644 --- a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html @@ -15,8 +15,17 @@
- +
diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.ts b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.ts index cbb29a7..4fa92c3 100644 --- a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.ts +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.ts @@ -2,26 +2,21 @@ import { Component, Input, Output, OnInit } from '@angular/core'; import { IManagedObject } from '@c8y/client'; import * as cloneDeep from 'lodash/cloneDeep'; import { Observable } from 'rxjs'; +import { RESULT_TYPES } from '../../../../common/asset-property-constant'; @Component({ selector: 'c8y-last-measurement-config', templateUrl: './last-measurement-config.component.html', }) -export class ComputedPropertyLastMeasurementConfigComponent implements OnInit { +export class ComputedPropertyLastMeasurementConfigComponent { @Input() property?: any; @Output() measurmentChange: Observable; selectedProperty: IManagedObject[] = []; - dataPoints: Array = []; minSelectCount: number = 1; maxSelectCount: number = 1; - configSchema: object = {properties:{type:{title: 'Event type',type: 'string'}},type: 'string'}; - - ngOnInit(): void { - this.dataPoints = this.property.config?.dp; - console.log('datapoint',this.dataPoints); - } + resultTypes = RESULT_TYPES; validationChanged(isValid){ this.property.config.isValid= isValid; diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html index 1fa2785..fd8c532 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html @@ -1,5 +1,6 @@ {{ "No Data" | translate }} +
+ +
diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index bb6d4e6..8a3d48f 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -1,13 +1,23 @@ import { Component, OnInit, Input } from '@angular/core'; import { IManagedObject, InventoryService } from '@c8y/client'; -import { ManagedObjectRealtimeService } from '@c8y/ngx-components'; +import { ManagedObjectRealtimeService, MeasurementRealtimeService } from '@c8y/ngx-components'; import { AssetPropertiesService } from '../asset-properties-config/asset-properties.service'; import { some, cloneDeep } from 'lodash-es'; +import { KPIDetails } from '@c8y/ngx-components/datapoint-selector'; +import { Observable } from 'rxjs'; +import { filter, map } from 'rxjs/operators'; + +interface MeasurementValue { + unit?: string; + value: number; + date: string; + id: string; +} @Component({ selector: 'c8y-asset-properties-view', templateUrl: './asset-properties-view.component.html', - providers: [ManagedObjectRealtimeService], + providers: [ManagedObjectRealtimeService, MeasurementRealtimeService], }) export class AssetPropertiesViewComponent implements OnInit { selected = { id: 'asset-properties-widget' }; @@ -16,11 +26,18 @@ export class AssetPropertiesViewComponent implements OnInit { customProperties: IManagedObject[]; properties: IManagedObject[]; @Input() config: any; + computedPropertyObject:object; + isLoading = true; + + state$: Observable<{ + latestMeasurement: MeasurementValue; + }>; constructor( protected inventoryService: InventoryService, protected moRealtimeService: ManagedObjectRealtimeService, - private assetPropertiesService: AssetPropertiesService + private assetPropertiesService: AssetPropertiesService, + private measurementRealtime: MeasurementRealtimeService ) {} async ngOnInit(): Promise { @@ -45,7 +62,20 @@ export class AssetPropertiesViewComponent implements OnInit { }); this.config.properties = cloneDeep(this.properties); this.constructComplexPropertyKeys(); + this.config.properties.forEach(property =>{ + if(property.computed && property.name ==='lastMeasurement' && property.config.dp.length>0){ + // eslint-disable-next-line no-underscore-dangle + let datapoint = property.config.dp.find((dp) =>dp.__active); + datapoint = {...datapoint, ...{uniqId:property.config.id}}; + this.getLatestMeasurement$(datapoint).subscribe( + (lastMeasurement) => { + this.computedPropertyObject = {...this.computedPropertyObject, ...{[`lastMeasurement_${lastMeasurement.id}`]: lastMeasurement}}; + } + ); + } + }); this.handleRealtime(); + this.isLoading = false; }, 1000); } catch (error) { this.isEmptyWidget = true; @@ -69,7 +99,7 @@ export class AssetPropertiesViewComponent implements OnInit { if(!customizedProperty.find((prop) => prop.id === property.id)){ customizedProperty.push(property); } - }else if (element.active && !customizedProperty.find((prop) => prop.name === element.name)){ + }else if (element.active && (!customizedProperty.find((prop) => prop.name === element.name) || element.computed)){ customizedProperty.push(element); } }); @@ -102,4 +132,26 @@ export class AssetPropertiesViewComponent implements OnInit { this.selectedAsset = asset; }); } + + getLatestMeasurement$(datapoint: KPIDetails): Observable { + return this.measurementRealtime + .latestValueOfSpecificMeasurement$( + datapoint.fragment, + datapoint.series, + datapoint.__target.id, + // we only need the last two values in case we want to show a trend + 1 + ) + .pipe( + filter(measurement => !!measurement), + map(measurement => { + return { + unit: measurement[datapoint.fragment][datapoint.series].unit, + value: measurement[datapoint.fragment][datapoint.series].value, + date: measurement.time as string, + id: datapoint.uniqId + }; + }) + ); + } } diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts index 8dcca14..67d9c4e 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts @@ -3,6 +3,7 @@ import { EventEmitter, Input, OnChanges, + OnInit, Output, SimpleChanges, ViewChild, @@ -17,6 +18,7 @@ import { AlertService, AssetTypesService, DashboardChildComponent, + DatePipe, gettext, } from '@c8y/ngx-components'; import { AssetPropertiesItem } from './asset-properties.model'; @@ -25,12 +27,14 @@ import { Permissions } from '@c8y/ngx-components'; import { filter, takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; import { AssetLocationComponent } from '@c8y/ngx-components/sub-assets'; +import { RESULT_TYPES } from '../../../common/asset-property-constant'; @Component({ selector: 'c8y-asset-properties', templateUrl: './asset-properties.component.html', }) -export class AssetPropertiesComponent implements OnChanges { +export class AssetPropertiesComponent implements OnChanges, OnInit { + @Input() computedPropertyObject: IManagedObject; @Input() asset: IManagedObject; @Output() assetChange = new EventEmitter(); @Input() @@ -51,7 +55,8 @@ export class AssetPropertiesComponent implements OnChanges { private inventoryBinary: InventoryBinaryService, private alert: AlertService, private permissionsService: Permissions, - public dashboardChild: DashboardChildComponent + public dashboardChild: DashboardChildComponent, + private pipe: DatePipe ) {} async ngOnInit() { @@ -63,7 +68,7 @@ export class AssetPropertiesComponent implements OnChanges { } async ngOnChanges(changes: SimpleChanges): Promise { - if (changes.asset?.currentValue || changes.properties?.currentValue) { + if (changes.asset?.currentValue || changes.properties?.currentValue || changes.computedPropertyObject?.currentValue) { this.assetType = undefined; this.customProperties = []; this.loadAsset(); @@ -108,6 +113,9 @@ export class AssetPropertiesComponent implements OnChanges { for (const key of keys) { if (properties[key]) { let value = asset[key]; + if(mo.computed){ + value = this.getComputedPropertyValue(mo,asset); + } const {type} = properties[key]; const {title} = properties[key]; let file; @@ -237,14 +245,76 @@ export class AssetPropertiesComponent implements OnChanges { item.jsonSchema.required = [mo.c8y_JsonSchema.key]; } } - private async listenToWidgetResizeEvent(dashboardChild: DashboardChildComponent) { - dashboardChild.changeEnd - .pipe( - filter(child => child.lastChange === 'resize'), - takeUntil(this.destroy$) - ) - .subscribe(async () => { - this.clusterMap.mapView.map.invalidateSize(); - }); + + private async listenToWidgetResizeEvent(dashboardChild: DashboardChildComponent) { + dashboardChild.changeEnd + .pipe( + filter(child => child.lastChange === 'resize'), + takeUntil(this.destroy$) + ) + .subscribe(async () => { + this.clusterMap.mapView.map.invalidateSize(); + }); + } + + getComputedPropertyValue(mo,asset){ + let value = ''; + + switch (mo.name) { + case 'alarmCountToday': + value = asset.childDevices.references.length; + break; + case 'alarmCount3Months': + value = asset.childDevices.references.length; + break; + case 'eventCountToday': + value = asset.childDevices.references.length; + break; + case 'eventCount3Months': + value = asset.childDevices.references.length; + break; + case 'lastDeviceMessage': + value = asset.childDevices.references.length; + break; + case 'lastMeasurement': + value = this.computedPropertyObject ? this.getLastMeasurementWithFormat(this.computedPropertyObject[`${mo.name}_${mo.config.id}`],mo.config.resultTypes) : undefined; + break; + case 'childDevicesCount': + value = asset.childDevices.references.length; + break; + case 'childAssetsCount': + value = asset.childAssets.references.length; + break; + case 'configurationSnapshot': + value = asset.childDevices.references.length; + break; + default: + value = ''; + break; + } + return value; + } + + getLastMeasurementWithFormat ( measurementObj ,resultType) { + let out = ''; + if(measurementObj){ + const { date,value, unit } = measurementObj; + const type = resultType || RESULT_TYPES.VALUE.value; + switch (type) { + case RESULT_TYPES.VALUE.value: + out = value; + break; + case RESULT_TYPES.VALUE_UNIT.value: + out = `${value } ${ unit || ''}`; + break; + case RESULT_TYPES.VALUE_UNIT_TIME.value: + out = ` ${this.pipe.transform(date, 'short')} | ${`${value } ${ unit || ''}`}`; + break; + default: + out = ''; + break; } + } + return out; + } } From 949305aa60775e5bca1f145ee35e101bea4c7405 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Wed, 7 Feb 2024 15:09:07 +0530 Subject: [PATCH 03/34] coputed property alarms and events intigration added. --- .../asset-properties.module.ts | 6 + .../common/asset-property-constant.ts | 36 ++++- .../asset-property-item-selector.component.ts | 6 +- .../asset-property-selector.component.html | 5 +- .../asset-property-selector.component.ts | 8 +- .../last-measurement-config.component.html | 52 ++++---- .../asset-properties-view.component.spec.ts | 12 +- .../asset-properties-view.component.ts | 123 ++++++++++++++---- .../asset-properties-view.service.ts | 30 +++++ .../asset-properties.component.spec.ts | 4 +- .../asset-properties.component.ts | 16 +-- 11 files changed, 217 insertions(+), 81 deletions(-) create mode 100644 asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts diff --git a/asset-properties-widget/asset-properties.module.ts b/asset-properties-widget/asset-properties.module.ts index 2f0ac89..4123d78 100644 --- a/asset-properties-widget/asset-properties.module.ts +++ b/asset-properties-widget/asset-properties.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { + AlarmRealtimeService, CoreModule, + EventRealtimeService, HOOK_COMPONENTS, RealtimeModule, } from '@c8y/ngx-components'; @@ -18,6 +20,7 @@ import { SubAssetsModule } from '@c8y/ngx-components/sub-assets'; import { ComputedPropertyConfigComponent } from './component/asset-properties-config/computed-asset-property/computed-property-config.component'; import { DatapointSelectorModule } from '@c8y/ngx-components/datapoint-selector'; import { ComputedPropertyLastMeasurementConfigComponent } from './component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component'; +import { DatePipe } from '@angular/common'; @NgModule({ declarations: [ @@ -40,6 +43,9 @@ import { ComputedPropertyLastMeasurementConfigComponent } from './component/asse DatapointSelectorModule, ], providers: [ + AlarmRealtimeService, + DatePipe, + EventRealtimeService, { provide: HOOK_COMPONENTS, multi: true, diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index 8b223ea..90b71a5 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -53,6 +53,36 @@ export const property = [ isEditable: false, isExistingProperty: true, }, + { + label: 'Active alarms status', + type: 'object', + isEditable: false, + name: 'c8y_ActiveAlarmsStatus', + c8y_JsonSchema: { + properties: { c8y_ActiveAlarmsStatus: {key:'c8y_ActiveAlarmsStatus', type: 'object', label: 'Active alarms status',properties: { + critical: { + title: 'Critical', + type: 'number', + isEditable: false + }, + major: { + title: 'Major', + type: 'number', + isEditable: false + }, + minor: { + title: 'Minor', + type: 'number', + isEditable: false + }, + warning: { + title: 'Warning', + type: 'number', + isEditable: false + } + } } }, + }, + }, { c8y_JsonSchema: { properties: { alarmCountToday: { @@ -64,7 +94,7 @@ export const property = [ label: 'Alarm count today', title: 'Alarm type', type: 'string', - config:{type:''}, + config:{ type:'' }, computed: true, isEditable: false, isExistingProperty: true, @@ -80,7 +110,7 @@ export const property = [ label: 'Alarm count 3 months', title: 'Alarm type', type: 'string', - config:{type:''}, + config:{ type:'' }, computed: true, isEditable: false, isExistingProperty: true, @@ -112,7 +142,7 @@ export const property = [ label: 'Event count 3 months', title: 'Event type', type: 'string', - config:{type:''}, + config:{ type:'' }, computed: true, isEditable: false, isExistingProperty: true, diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts index af96621..154b156 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts @@ -28,8 +28,8 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { this.customProperties.forEach((property) => { if (this.isComplexProperty(property)) { complexProperties.push(property); - Object.keys(property.c8y_JsonSchema.properties[property.c8y_JsonSchema.key].properties).forEach((key)=>{ - const object = property.c8y_JsonSchema.properties[property.c8y_JsonSchema.key].properties[key]; + Object.keys(property.c8y_JsonSchema.properties[property.name].properties).forEach((key)=>{ + const object = property.c8y_JsonSchema.properties[property.name].properties[key]; object['keyPath'] = [property.name]; object.keyPath.push(key); complexProperties.push(object); @@ -93,7 +93,7 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { return false; } return ( - prop.c8y_JsonSchema.properties[prop.c8y_JsonSchema.key]?.type === 'object' + prop.c8y_JsonSchema.properties[prop.name]?.type === 'object' ); } } diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html index 7106c6b..583a44b 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html @@ -83,9 +83,8 @@ diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts index 5daeaf0..0f25a89 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts @@ -79,7 +79,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { const constructCustomProperties: IManagedObject[] = []; customProperties.forEach((property) => { const object = - property.c8y_JsonSchema.properties[property.c8y_JsonSchema.key]; + property.c8y_JsonSchema.properties[property.name]; if (object.type === 'object') { constructCustomProperties.push(property); } else { @@ -146,7 +146,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { this.properties.forEach((property) => { if (this.isComplexProperty(property)) { const customProperties = - property.c8y_JsonSchema.properties[property.c8y_JsonSchema.key] + property.c8y_JsonSchema.properties[property.name] ?.properties; const tempCustomProperties = {}; for (const key in customProperties) { @@ -160,7 +160,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { } if (!isEmpty(tempCustomProperties)) { property.c8y_JsonSchema.properties[ - property.c8y_JsonSchema.key + property.name ].properties = tempCustomProperties; } } @@ -172,7 +172,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { return false; } return ( - prop.c8y_JsonSchema.properties[prop.c8y_JsonSchema.key]?.type === 'object' + prop.c8y_JsonSchema.properties[prop.name]?.type === 'object' ); } diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html index 14ae0da..550afc7 100644 --- a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html @@ -1,31 +1,27 @@ -
- - -
+ + -
- -
- + - -
+ {{ item.value.label }} + +
diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts index 52868ae..2c1b684 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts @@ -11,6 +11,11 @@ describe('AssetPropertiesViewComponent', () => { let asset: any; let customPropertyObjects: any; let configCustomPropertyObjects: any; + let measurementRealtime:any; + let assetPropertiesViewService: any; + let datePipe: any; + let alarmRealtimeService: any; + let eventRealtimeService: any; beforeEach(() => { inventoryMock = { detail: jest.fn() }; @@ -21,7 +26,12 @@ describe('AssetPropertiesViewComponent', () => { component = new AssetPropertiesViewComponent( inventoryMock, moRealtimeServiceMock, - assetPropertiesServiceMock + assetPropertiesServiceMock, + measurementRealtime, + assetPropertiesViewService, + datePipe, + alarmRealtimeService, + eventRealtimeService ); asset = { diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index 8a3d48f..2bb6e03 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -1,11 +1,13 @@ import { Component, OnInit, Input } from '@angular/core'; -import { IManagedObject, InventoryService } from '@c8y/client'; -import { ManagedObjectRealtimeService, MeasurementRealtimeService } from '@c8y/ngx-components'; +import { IAlarm, IEvent, IManagedObject, InventoryService } from '@c8y/client'; +import { AlarmRealtimeService, EventRealtimeService, ManagedObjectRealtimeService, MeasurementRealtimeService } from '@c8y/ngx-components'; import { AssetPropertiesService } from '../asset-properties-config/asset-properties.service'; import { some, cloneDeep } from 'lodash-es'; import { KPIDetails } from '@c8y/ngx-components/datapoint-selector'; import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; +import { AssetPropertiesViewService } from './asset-properties-view.service'; +import { DatePipe } from '@angular/common'; interface MeasurementValue { unit?: string; @@ -37,7 +39,11 @@ export class AssetPropertiesViewComponent implements OnInit { protected inventoryService: InventoryService, protected moRealtimeService: ManagedObjectRealtimeService, private assetPropertiesService: AssetPropertiesService, - private measurementRealtime: MeasurementRealtimeService + private measurementRealtime: MeasurementRealtimeService, + private assetPropertiesViewService: AssetPropertiesViewService, + private datePipe: DatePipe, + private alarmRealtimeService: AlarmRealtimeService, + private eventRealtimeService: EventRealtimeService ) {} async ngOnInit(): Promise { @@ -47,31 +53,47 @@ export class AssetPropertiesViewComponent implements OnInit { await this.inventoryService.detail(this.config.device.id) ).data; setTimeout(async () => { - this.customProperties = + // eslint-disable-next-line no-prototype-builtins + if(this.selectedAsset.hasOwnProperty('c8y_IsAsset')){ + this.customProperties = await this.assetPropertiesService.getCustomProperties( this.selectedAsset ); - this.properties = this.config.properties.filter((property) => { - if ( - property.isExistingProperty || - ((this.customProperties.length != 0 && - this.customProperties.find((prop) => prop.id === property.id)) || this.validateComplexProperty(property)) - ) { - return property; - } - }); - this.config.properties = cloneDeep(this.properties); + this.properties = this.config.properties.filter((property) => { + if ( + property.isExistingProperty || + ((this.customProperties.length != 0 && + this.customProperties.find((prop) => prop.id === property.id)) || this.validateComplexProperty(property)) + ) { + return property; + } + }); + this.config.properties = cloneDeep(this.properties); + }else{ + this.properties = cloneDeep(this.config.properties); + } this.constructComplexPropertyKeys(); this.config.properties.forEach(property =>{ - if(property.computed && property.name ==='lastMeasurement' && property.config.dp.length>0){ - // eslint-disable-next-line no-underscore-dangle - let datapoint = property.config.dp.find((dp) =>dp.__active); - datapoint = {...datapoint, ...{uniqId:property.config.id}}; - this.getLatestMeasurement$(datapoint).subscribe( - (lastMeasurement) => { - this.computedPropertyObject = {...this.computedPropertyObject, ...{[`lastMeasurement_${lastMeasurement.id}`]: lastMeasurement}}; - } - ); + if(property.computed && property.active){ + switch (property.name) { + case 'alarmCountToday': + this.getAlarmCount(this.config.device, property,this.datePipe.transform(new Date(), 'yyyy-MM-dd')); + break; + case 'alarmCount3Months': + this.getAlarmCount(this.config.device, property, this.datePipe.transform(new Date().setMonth(new Date().getMonth() - 3), 'yyyy-MM-dd')); + break; + case 'eventCountToday': + this.getEventCount(this.config.device, property,this.datePipe.transform(new Date(), 'yyyy-MM-dd')); + break; + case 'eventCount3Months': + this.getEventCount(this.config.device, property, this.datePipe.transform(new Date().setMonth(new Date().getMonth() - 3), 'yyyy-MM-dd')); + break; + case 'lastMeasurement': + this.getLastMeasurement(property); + break; + default: + break; + } } }); this.handleRealtime(); @@ -83,6 +105,53 @@ export class AssetPropertiesViewComponent implements OnInit { } } + async getAlarmCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ + const filters = { + dateFrom: dateFrom, + dateTo: this.datePipe.transform(new Date().setDate( new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + source: device.id, + pageSize: 2000, + type: property.config.type, + }; + const alarms = (await this.assetPropertiesViewService.getAlarms(filters)); + this.alarmRealtimeService.onCreate$(this.selectedAsset.id) + .subscribe((alarm: IAlarm) => { + if(alarm.type === property.config.type){ + this.computedPropertyObject = {...this.computedPropertyObject, ...{[`${property.name}_${property.config.id}`]: ++ this.computedPropertyObject[`${property.name}_${property.config.id}`]}}; + } + }); + this.computedPropertyObject = {...this.computedPropertyObject, ...{[`${property.name}_${property.config.id}`]: alarms.length}}; + } + + async getEventCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ + const filters = { + dateFrom: dateFrom, + dateTo: this.datePipe.transform(new Date().setDate( new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + source: device.id, + pageSize: 2000, + type: property.config.type, + }; + const events = (await this.assetPropertiesViewService.getEvents(filters)); + this.eventRealtimeService.onCreate$(this.selectedAsset.id) + .subscribe((event: IEvent ) => { + if(event.type === property.config.type){ + this.computedPropertyObject = {...this.computedPropertyObject, ...{[`${property.name}_${property.config.id}`]: ++ this.computedPropertyObject[`${property.name}_${property.config.id}`]}}; + } + }); + this.computedPropertyObject = {...this.computedPropertyObject, ...{[`${property.name}_${property.config.id}`]: events.length}}; + } + + getLastMeasurement(property){ + // eslint-disable-next-line no-underscore-dangle + let datapoint = property.config.dp.find((dp) =>dp.__active); + datapoint = {...datapoint, ...{uniqId:property.config.id}}; + this.getLatestMeasurement$(datapoint).subscribe( + (lastMeasurement) => { + this.computedPropertyObject = {...this.computedPropertyObject, ...{[`lastMeasurement_${lastMeasurement.id}`]: lastMeasurement}}; + } + ); + } + constructComplexPropertyKeys(){ const customizedProperty =[]; this.properties.forEach(element => { @@ -92,9 +161,9 @@ export class AssetPropertiesViewComponent implements OnInit { if(!property.isParentKeySelected){ property.isParentKeySelected = true; property.active = true; - property.c8y_JsonSchema.properties[property.c8y_JsonSchema.key].properties = {}; + property.c8y_JsonSchema.properties[property.name].properties = {}; } - property.c8y_JsonSchema.properties[property.c8y_JsonSchema.key].properties[element.keyPath?.[1]] = {...element}; + property.c8y_JsonSchema.properties[property.name].properties[element.keyPath?.[1]] = {...element}; } if(!customizedProperty.find((prop) => prop.id === property.id)){ customizedProperty.push(property); @@ -109,7 +178,7 @@ export class AssetPropertiesViewComponent implements OnInit { validateComplexProperty(item): boolean{ if(item.keyPath){ const property = this.customProperties.find((prop) => prop.name === item.keyPath?.[0]); - return some(Object.keys(property.c8y_JsonSchema.properties[property.c8y_JsonSchema.key].properties), function(key) { + return some(Object.keys(property.c8y_JsonSchema.properties[property.name].properties), function(key) { return (key === item.keyPath?.[1]); }); } @@ -121,7 +190,7 @@ export class AssetPropertiesViewComponent implements OnInit { return false; } return ( - prop.c8y_JsonSchema.properties[prop.c8y_JsonSchema.key]?.type === 'object' + prop.c8y_JsonSchema.properties[prop.name]?.type === 'object' ); } diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts new file mode 100644 index 0000000..0b72b49 --- /dev/null +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts @@ -0,0 +1,30 @@ +import { Injectable } from '@angular/core'; +import { AlarmService, EventService, IManagedObject } from '@c8y/client'; + +@Injectable({ + providedIn: 'root', +}) +export class AssetPropertiesViewService { + constructor( + private c8yAlarms: AlarmService, + private c8yEvents: EventService + ) {} + + async getAlarms(filters): Promise { + let data = []; + await this.c8yAlarms.list(filters) + .then(function (alarms) { + data = alarms.data; + }); + return data; + } + + async getEvents(filters) { + let data = []; + await this.c8yEvents.list(filters) + .then(events => { + data = events.data; + }); + return data; + } +} diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.spec.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.spec.ts index 673b91b..8b9e849 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.spec.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.spec.ts @@ -11,6 +11,7 @@ describe('AssetPropertiesComponent', () => { let assetTypesMock: any; let permissionsServiceMock: any; let dashboardChildMock:any; + let datePipe:any; beforeEach(() => { permissionsServiceMock = { canEdit: jest.fn() }; @@ -31,7 +32,8 @@ describe('AssetPropertiesComponent', () => { inventoryBinaryMock, alertMock, permissionsServiceMock, - dashboardChildMock + dashboardChildMock, + datePipe ); }); diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts index 67d9c4e..263d8fa 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts @@ -56,7 +56,7 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { private alert: AlertService, private permissionsService: Permissions, public dashboardChild: DashboardChildComponent, - private pipe: DatePipe + private datePipe: DatePipe ) {} async ngOnInit() { @@ -239,10 +239,10 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { } const isComplexProperty = !!item?.complex?.length; if (isComplexProperty) { - const complexProperty = item.jsonSchema?.properties?.[mo.c8y_JsonSchema.key] as JSONSchema7; + const complexProperty = item.jsonSchema?.properties?.[mo.name] as JSONSchema7; complexProperty.required = item.complex.map(({ key }) => key); } else { - item.jsonSchema.required = [mo.c8y_JsonSchema.key]; + item.jsonSchema.required = [mo.name]; } } @@ -262,16 +262,10 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { switch (mo.name) { case 'alarmCountToday': - value = asset.childDevices.references.length; - break; case 'alarmCount3Months': - value = asset.childDevices.references.length; - break; case 'eventCountToday': - value = asset.childDevices.references.length; - break; case 'eventCount3Months': - value = asset.childDevices.references.length; + value = this.computedPropertyObject? this.computedPropertyObject[`${mo.name}_${mo.config.id}`] : 0; break; case 'lastDeviceMessage': value = asset.childDevices.references.length; @@ -308,7 +302,7 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { out = `${value } ${ unit || ''}`; break; case RESULT_TYPES.VALUE_UNIT_TIME.value: - out = ` ${this.pipe.transform(date, 'short')} | ${`${value } ${ unit || ''}`}`; + out = ` ${this.datePipe.transform(date, 'short')} | ${`${value } ${ unit || ''}`}`; break; default: out = ''; From 58e71da8762ed5856bfce471f36c9b7080c66d45 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Sun, 11 Feb 2024 05:36:42 +0530 Subject: [PATCH 04/34] device property changes updated and property filter added. --- .../common/asset-property-constant.ts | 422 ++++++++++++++++-- .../asset-properties-config.component.ts | 4 +- ...sset-property-item-selector.component.html | 8 +- .../asset-property-selector.component.ts | 34 +- .../asset-properties-view.component.ts | 10 +- .../asset-properties.component.ts | 2 +- 6 files changed, 403 insertions(+), 77 deletions(-) diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index 90b71a5..67072dc 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -1,4 +1,4 @@ -import { gettext } from "@c8y/ngx-components"; +import { gettext } from '@c8y/ngx-components'; export const defaultProperty = [ { @@ -32,7 +32,7 @@ export const defaultProperty = [ }, ]; -export const property = [ +export const commonProperty = [ { c8y_JsonSchema: { properties: { owner: { type: 'string', label: 'Owner' } }, @@ -53,36 +53,6 @@ export const property = [ isEditable: false, isExistingProperty: true, }, - { - label: 'Active alarms status', - type: 'object', - isEditable: false, - name: 'c8y_ActiveAlarmsStatus', - c8y_JsonSchema: { - properties: { c8y_ActiveAlarmsStatus: {key:'c8y_ActiveAlarmsStatus', type: 'object', label: 'Active alarms status',properties: { - critical: { - title: 'Critical', - type: 'number', - isEditable: false - }, - major: { - title: 'Major', - type: 'number', - isEditable: false - }, - minor: { - title: 'Minor', - type: 'number', - isEditable: false - }, - warning: { - title: 'Warning', - type: 'number', - isEditable: false - } - } } }, - }, - }, { c8y_JsonSchema: { properties: { alarmCountToday: { @@ -147,21 +117,6 @@ export const property = [ isEditable: false, isExistingProperty: true, }, - { - c8y_JsonSchema: { - properties: { lastDeviceMessage: { - title: 'Last device message', - type: 'string', - },}, - }, - name: 'lastDeviceMessage', - label: 'Last device message', - printFormat: 'datetime', - type: 'string', - computed: true, - isEditable: false, - isExistingProperty: true, - }, { c8y_JsonSchema: {properties: { lastMeasurement: { title: 'Last measurement', @@ -203,6 +158,21 @@ export const property = [ isEditable: false, isExistingProperty: true, }, + { + c8y_JsonSchema: { + properties: { lastDeviceMessage: { + title: 'Last device message', + type: 'string', + },}, + }, + name: 'lastDeviceMessage', + label: 'Last device message', + printFormat: 'datetime', + type: 'string', + computed: true, + isEditable: false, + isExistingProperty: true, + }, { c8y_JsonSchema: { properties: { configurationSnapshot: { @@ -217,6 +187,364 @@ export const property = [ isEditable: false, isExistingProperty: true, } + +]; +export const deviceProperty = [ + { + label: 'Active alarms status', + type: 'object', + isEditable: false, + name: 'c8y_ActiveAlarmsStatus', + c8y_JsonSchema: { + properties: { c8y_ActiveAlarmsStatus: {key:'c8y_ActiveAlarmsStatus', type: 'object', label: 'Active alarms status',properties: { + critical: { + title: 'Critical', + type: 'number', + }, + major: { + title: 'Major', + type: 'number', + }, + minor: { + title: 'Minor', + type: 'number', + }, + warning: { + title: 'Warning', + type: 'number', + } + } } }, + }, + }, + { + label: 'Address', + type: 'object', + isEditable: true, + name: 'c8y_Address', + c8y_JsonSchema: { + properties: { c8y_Address: {key:'c8y_Address', type: 'object', label: 'Address',properties: { + street: { + title: 'Street', + type: 'string' + }, + city: { + title: 'City', + type: 'string' + }, + cityCode: { + title: 'City code', + type: 'string' + }, + territory: { + title: 'Territory', + type: 'string' + }, + region: { + title: 'Region', + type: 'string' + }, + country: { + title: 'Country', + type: 'string' + } + }}} + }, + }, + { + label: 'Agent', + type: 'object', + isEditable: true, + name: 'c8y_Agent', + c8y_JsonSchema: { + properties: { c8y_Agent: {key:'c8y_Agent', type: 'object', label: 'Agent',properties : { + name: { + title: 'Name', + type: 'string' + }, + version: { + title: 'Version', + type: 'string' + }, + url: { + title: 'URL', + type: 'string' + }, + maintainer: { + title: 'Maintainer', + type: 'string' + } + }}} + } + }, + { + label: 'Availability', + type: 'object', + isEditable: false, + name: 'c8y_Availability', + c8y_JsonSchema: { + properties: { c8y_Availability: {key:'c8y_Availability', type: 'object', label: 'Availability',properties : { + status: { + title: 'Status', + type: 'string', + }, + lastMessage: { + title: 'Last message', + type: 'string', + printFormat: 'datetime', + } + }}} + }, + }, + { + label: 'Connection', + type: 'object', + isEditable: false, + name: 'c8y_Connection', + c8y_JsonSchema: { + properties: { c8y_Connection: {key:'c8y_Connection', type: 'object', label: 'Connection',properties : { + status: { + title: 'Status', + type: 'string', + } + }}} + }, + }, + { + label: 'Communication mode', + type: 'object', + isEditable: true, + name: 'c8y_CommunicationMode', + c8y_JsonSchema: { + properties: { c8y_CommunicationMode: {key:'c8y_CommunicationMode', type: 'object', label: 'Communication mode',properties : { + mode: { + title: 'Mode', + type: 'string' + } + }}} + } + }, + { + label: 'Firmware', + type: 'object', + isEditable: false, + name: 'c8y_Firmware', + c8y_JsonSchema: { + properties: { c8y_Firmware: {key:'c8y_Firmware', type: 'object', label: 'Firmware',properties : { + moduleVersion: { + title: 'Module version', + type: 'string' + }, + name: { + title: 'Name', + type: 'string' + }, + version: { + title: 'Version', + type: 'string' + }, + url: { + title: 'URL', + type: ['string', 'null'] + } + }}} + }, + }, + { + label: 'Hardware', + type: 'object', + isEditable: true, + name: 'c8y_Hardware', + c8y_JsonSchema: { + properties: { c8y_Hardware: {key:'c8y_Hardware', type: 'object', label: 'Hardware',properties : { + model: { + title: 'Model', + type: 'string' + }, + serialNumber: { + title: 'Serial number', + type: 'string' + }, + revision: { + title: 'Revision', + type: 'string' + } + }}} + }, + }, + { + label: 'LPWAN device', + type: 'object', + isEditable: false, + name: 'c8y_LpwanDevice', + c8y_JsonSchema: { + properties: { c8y_LpwanDevice: {key:'c8y_LpwanDevice', type: 'object', label: 'LPWAN device',properties : { + provisioned: { + title: 'Provisioned', + type: 'boolean', + } + }}} + }, + }, + { + label: 'Mobile', + type: 'object', + isEditable: true, + name: 'c8y_Mobile', + c8y_JsonSchema: { + properties: { c8y_Mobile: {key:'c8y_Mobile', type: 'object', label: 'Mobile',properties : { + cellId: { + title: 'Cell ID', + type: ['string', 'null'], + readonly: true, + templateOptions: { + label: 'Test 2', + description: 'Field always read-only', + readonly: true + } + }, + connType: { + title: 'Connection type', + type: 'string', + isEditable: false, + }, + currentOperator: { + title: 'Current operator', + type: 'string', + }, + currentBand: { + title: 'Current band', + type: 'string', + }, + ecn0: { + title: 'ECN0', + type: 'string', + }, + iccid: { + title: 'ICCID', + type: ['string', 'null'] + }, + imei: { + title: 'IMEI', + type: ['string', 'null'] + }, + imsi: { + title: 'IMSI', + type: ['string', 'null'] + }, + lac: { + title: 'LAC', + type: ['string', 'null'] + }, + mcc: { + title: 'MCC', + type: ['string', 'null'] + }, + mnc: { + title: 'MNC', + type: ['string', 'null'] + }, + msisdn: { + title: 'MSISDN', + type: 'string' + }, + rcsp: { + title: 'RCSP', + type: 'string', + isEditable: false + }, + rscp: { + title: 'RSCP', + type: 'string', + isEditable: false + }, + rsrp: { + title: 'RSRP', + type: 'string', + isEditable: false + }, + rsrq: { + title: 'RSRQ', + type: 'string', + isEditable: false + }, + rssi: { + title: 'RSSI', + type: 'string', + isEditable: false + } + }}} + }, + }, + { + c8y_JsonSchema: { properties: { c8y_Notes: { type: 'string', label: 'Notes','x-schema-form': { + type: 'textarea' + } } } }, + name: 'c8y_Notes', + label: 'Notes', + type: 'string', + isEditable: true + }, + { + label: 'Position', + type: 'object', + isEditable: true, + name: 'c8y_Position', + c8y_JsonSchema: { + properties: { c8y_Position: {key:'c8y_Position', type: 'object', label: 'Position',properties : { + lat: { + title: 'Latitude', + type: 'number' + }, + lng: { + title: 'Longitude', + type: 'number' + }, + alt: { + title: 'Altitude', + type: 'number' + } + }}} + } + }, + { + label: 'Required availability', + type: 'object', + isEditable: true, + name: 'c8y_RequiredAvailability', + c8y_JsonSchema: { + properties: { c8y_RequiredAvailability: {key:'c8y_RequiredAvailability', type: 'object', label: 'Required availability',properties : { + responseInterval: { + title: 'Response interval', + description: 'Takes a value between -32768 and 32767 minutes (a negative value indicates that the device is under maintenance).', + type: 'integer', + minimum: -32768, + maximum: 32767 + } + }}} + }, + }, + { + label: 'Software', + type: 'object', + isEditable: false, + name: 'c8y_Software', + c8y_JsonSchema: { + properties: { c8y_Software: {key:'c8y_Software', type: 'object', label: 'Software',properties : { + name: { + title: 'Name', + type: 'string' + }, + version: { + title: 'Version', + type: 'string' + }, + url: { + title: 'URL', + type: ['string', 'null'] + } + }}} + } + } ]; export const RESULT_TYPES = { diff --git a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts index dc4ff47..bc65fda 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts @@ -17,7 +17,7 @@ export class AssetPropertiesConfigComponent constructor(private inventoryService: InventoryService) {} async ngOnChanges(){ - if (this.config.device) { + if (this.config.device && !this.config.device.hasOwnProperty('c8y_IsDevice')) { try { this.selectedAsset = ( await this.inventoryService.detail(this.config.device.id) @@ -25,6 +25,8 @@ export class AssetPropertiesConfigComponent } catch (er) { // intended empty } + }else if(this.config.device){ + this.selectedAsset = this.config.device; } } diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html index ad04f48..7bde7d1 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html @@ -106,13 +106,13 @@ data-cy="asset-property-item-property-name" class="col-xs-5 text-truncate" title="{{ - (property.name | translate) || - (property.keyPath.join('.') | translate) + (property.keyPath?.join('.') | translate) || + (property.name | translate) }}" > {{ - (property.name | translate) || - (property.keyPath.join(".") | translate) + (property.keyPath?.join(".") | translate) || + (property.name | translate) }} diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts index 0f25a89..2149d38 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts @@ -9,7 +9,8 @@ import { assetPropertyItemSelectorCtrlComponent } from '../asset-property-item-s import { AssetPropertiesService } from '../asset-properties.service'; import { defaultProperty, - property, + deviceProperty, + commonProperty, } from '../../../common/asset-property-constant'; import { some } from 'lodash-es'; import { ComputedPropertyConfigComponent } from '../computed-asset-property/computed-property-config.component'; @@ -32,9 +33,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { assetPropertySelectorModalRef: BsModalRef; computedPropertyConfigModalRef: BsModalRef; properties = cloneDeep(defaultProperty); - customProperties: IManagedObject[] = cloneDeep(defaultProperty).concat( - cloneDeep(property) - ); + customProperties: Array = [...cloneDeep(defaultProperty), ...cloneDeep(commonProperty)]; ExpandedComplexProperty: any; isAtleastOnePropertySelected: boolean = true; selectedComputedPropertyIndex: number; @@ -47,7 +46,15 @@ export class AssetPropertiesSelectorComponent implements OnChanges { ) {} async ngOnChanges(changes: IManagedObject): Promise { - if ((changes.asset.firstChange || !changes.asset.previousValue) && this.config?.properties) { + if(changes.asset.currentValue?.hasOwnProperty('c8y_IsDevice') && this.config?.properties){ + this.properties = this.config.properties; + if(changes.asset.previousValue?.hasOwnProperty('c8y_IsAsset')){ + this.properties = cloneDeep(defaultProperty); + this.config.properties = this.properties; + } + this.customProperties = [...cloneDeep(defaultProperty), ...cloneDeep(commonProperty), ...cloneDeep(deviceProperty)]; + } + else if (!changes.asset.previousValue && this.config?.properties) { this.properties = this.config.properties; this.customProperties = this.customProperties.concat( this.getConstructCustomProperties( @@ -60,20 +67,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { } this.isAtleastOnePropertySelected = true; } - addDefaultAndSelectedProperties() { - this.properties.forEach((property) => { - const existingPropertyIndex = this.customProperties - .map(function (item) { - return item.name; - }) - .indexOf(property.name); - if (existingPropertyIndex > 0) { - this.customProperties[existingPropertyIndex] = cloneDeep(property); - } else { - this.customProperties.push(cloneDeep(property)); - } - }); - } + getConstructCustomProperties(customProperties): IManagedObject[] { const simpleProperties: IManagedObject[] = []; const constructCustomProperties: IManagedObject[] = []; @@ -94,7 +88,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { this.assetType = this.assetTypes.getAssetTypeByName(this.asset.type); this.config.properties = this.properties; this.customProperties = cloneDeep(this.properties) - .concat(property) + .concat(commonProperty) .concat( this.getConstructCustomProperties( await this.assetPropertyService.getCustomProperties(this.asset) diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index 2bb6e03..404a099 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -8,6 +8,7 @@ import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { AssetPropertiesViewService } from './asset-properties-view.service'; import { DatePipe } from '@angular/common'; +import { deviceProperty } from '../../common/asset-property-constant'; interface MeasurementValue { unit?: string; @@ -25,7 +26,7 @@ export class AssetPropertiesViewComponent implements OnInit { selected = { id: 'asset-properties-widget' }; selectedAsset: IManagedObject; isEmptyWidget: boolean = false; - customProperties: IManagedObject[]; + customProperties: Array; properties: IManagedObject[]; @Input() config: any; computedPropertyObject:object; @@ -71,6 +72,7 @@ export class AssetPropertiesViewComponent implements OnInit { this.config.properties = cloneDeep(this.properties); }else{ this.properties = cloneDeep(this.config.properties); + this.customProperties = cloneDeep(deviceProperty); } this.constructComplexPropertyKeys(); this.config.properties.forEach(property =>{ @@ -108,7 +110,7 @@ export class AssetPropertiesViewComponent implements OnInit { async getAlarmCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ const filters = { dateFrom: dateFrom, - dateTo: this.datePipe.transform(new Date().setDate( new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + dateTo: this.datePipe.transform(new Date(), 'yyyy-MM-ddThh:mm:ssZZZZZ'), source: device.id, pageSize: 2000, type: property.config.type, @@ -126,7 +128,7 @@ export class AssetPropertiesViewComponent implements OnInit { async getEventCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ const filters = { dateFrom: dateFrom, - dateTo: this.datePipe.transform(new Date().setDate( new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + dateTo: this.datePipe.transform(new Date(), 'yyyy-MM-ddThh:mm:ssZZZZZ'), source: device.id, pageSize: 2000, type: property.config.type, @@ -165,7 +167,7 @@ export class AssetPropertiesViewComponent implements OnInit { } property.c8y_JsonSchema.properties[property.name].properties[element.keyPath?.[1]] = {...element}; } - if(!customizedProperty.find((prop) => prop.id === property.id)){ + if(!customizedProperty.find((prop) => prop.name === property.name)){ customizedProperty.push(property); } }else if (element.active && (!customizedProperty.find((prop) => prop.name === element.name) || element.computed)){ diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts index 263d8fa..eb9a63c 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts @@ -253,7 +253,7 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { takeUntil(this.destroy$) ) .subscribe(async () => { - this.clusterMap.mapView.map.invalidateSize(); + this.clusterMap?.mapView.map.invalidateSize(); }); } From 140dddac6d372f0f35852b0035e835de7992cbb6 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Thu, 22 Feb 2024 17:37:05 +0530 Subject: [PATCH 05/34] Device property implementation added. --- .../common/asset-property-constant.ts | 146 +++++++++++++++--- .../asset-properties-config.component.html | 1 - ...sset-property-item-selector.component.html | 62 ++++---- .../asset-property-item-selector.component.ts | 50 +++--- .../asset-property-selector.component.html | 48 +++--- .../asset-property-selector.component.ts | 10 +- .../asset-properties-view.component.html | 2 +- .../asset-properties-view.component.spec.ts | 1 + .../asset-properties-view.component.ts | 48 ++++-- .../asset-properties-item.component.html | 60 ++++--- .../asset-properties.component.ts | 4 +- 11 files changed, 292 insertions(+), 140 deletions(-) diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index 67072dc..a686523 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -56,7 +56,7 @@ export const commonProperty = [ { c8y_JsonSchema: { properties: { alarmCountToday: { - title: 'Alarm count today', + label: 'Alarm count today', type: 'number', },}, }, @@ -72,7 +72,7 @@ export const commonProperty = [ { c8y_JsonSchema: { properties: { alarmCount3Months: { - title: 'Alarm count 3 months', + label: 'Alarm count 3 months', type: 'number', },}, }, @@ -88,7 +88,7 @@ export const commonProperty = [ { c8y_JsonSchema: { properties: { eventCountToday: { - title: 'Event count today', + label: 'Event count today', type: 'number', },}, }, @@ -104,7 +104,7 @@ export const commonProperty = [ { c8y_JsonSchema: { properties: { eventCount3Months: { - title: 'Event count 3 months', + label: 'Event count 3 months', type: 'number', },}, }, @@ -119,7 +119,7 @@ export const commonProperty = [ }, { c8y_JsonSchema: {properties: { lastMeasurement: { - title: 'Last measurement', + label: 'Last measurement', type: 'string', },},}, name: 'lastMeasurement', @@ -133,7 +133,7 @@ export const commonProperty = [ { c8y_JsonSchema: { properties: { childDevicesCount: { - title: 'Number of child devices', + label: 'Number of child devices', type: 'number', },}, }, @@ -147,7 +147,7 @@ export const commonProperty = [ { c8y_JsonSchema: { properties: { childAssetsCount: { - title: 'Number of child assets', + label: 'Number of child assets', type: 'number', },}, }, @@ -161,7 +161,7 @@ export const commonProperty = [ { c8y_JsonSchema: { properties: { lastDeviceMessage: { - title: 'Last device message', + label: 'Last device message', type: 'string', },}, }, @@ -176,7 +176,7 @@ export const commonProperty = [ { c8y_JsonSchema: { properties: { configurationSnapshot: { - title: 'Configuration snapshot', + label: 'Configuration snapshot', type: 'number', },}, }, @@ -187,7 +187,6 @@ export const commonProperty = [ isEditable: false, isExistingProperty: true, } - ]; export const deviceProperty = [ { @@ -395,29 +394,26 @@ export const deviceProperty = [ cellId: { title: 'Cell ID', type: ['string', 'null'], - readonly: true, - templateOptions: { - label: 'Test 2', - description: 'Field always read-only', - readonly: true - } }, connType: { title: 'Connection type', type: 'string', - isEditable: false, + readOnly: true }, currentOperator: { title: 'Current operator', type: 'string', + readOnly: true }, currentBand: { title: 'Current band', type: 'string', + readOnly: true }, ecn0: { title: 'ECN0', type: 'string', + readOnly: true }, iccid: { title: 'ICCID', @@ -450,27 +446,27 @@ export const deviceProperty = [ rcsp: { title: 'RCSP', type: 'string', - isEditable: false + readOnly: true }, rscp: { title: 'RSCP', type: 'string', - isEditable: false + readOnly: true }, rsrp: { title: 'RSRP', type: 'string', - isEditable: false + readOnly: true }, rsrq: { title: 'RSRQ', type: 'string', - isEditable: false + readOnly: true }, rssi: { title: 'RSSI', type: 'string', - isEditable: false + readOnly: true } }}} }, @@ -544,6 +540,112 @@ export const deviceProperty = [ } }}} } + }, + { + label: 'Network', + type: 'object', + isEditable: true, + name: 'c8y_Network', + c8y_JsonSchema: { + properties: { c8y_Network: {key:'c8y_Network', type: 'object', label: 'Network',properties : { + c8y_DHCP: { + title: 'DHCP', + type: 'object', + printFormat: 'hidden', + name: 'c8y_DHCP', + properties: { + addressRange: { + title: 'Address range', + type: 'object', + name: 'addressRange', + printFormat: 'hidden', + properties: { + start: { + title: 'Start', + type: 'string' + }, + end: { + title: 'End', + type: 'string' + } + } + }, + dns1: { + title: 'DNS 1', + type: 'string' + }, + dns2: { + title: 'DNS 2', + type: 'string' + }, + enabled: { + title: 'Enabled', + type: 'integer' + } + } + }, + c8y_LAN: { + title: 'LAN', + type: 'object', + name: 'c8y_LAN', + printFormat: 'hidden', + properties: { + enabled: { + title: 'Enabled', + type: 'integer' + }, + ip: { + title: 'IP', + type: 'string' + }, + mac: { + title: 'MAC', + type: 'string' + }, + name: { + title: 'Name', + type: 'string' + }, + netmask: { + title: 'Netmask', + type: 'string' + } + } + }, + c8y_WAN: { + title: 'WAN', + type: 'object', + name: 'c8y_WAN', + printFormat: 'hidden', + properties: { + apn: { + title: 'APN', + type: 'string' + }, + authType: { + title: 'Auth type', + type: 'string' + }, + ip: { + title: 'IP', + type: 'string' + }, + password: { + title: 'Password', + type: 'string' + }, + simStatus: { + title: 'SIM status', + type: 'string' + }, + username: { + title: 'Username', + type: 'string' + } + } + } + }}} + }, } ]; diff --git a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.html b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.html index 47bf455..1538b5c 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.html @@ -1,5 +1,4 @@ {{ title | translate }} *ngFor="let property of customProperties | filter : search" >
- - - - +
{{ title | translate }} title="{{ property.label | translate }}" [ngClass]="{ strong: isComplexProperty(property) }" > - - - - +       + + {{ property.label ? property.label : (property.title | translate) }}
{ if (this.isComplexProperty(property)) { complexProperties.push(property); - Object.keys(property.c8y_JsonSchema.properties[property.name].properties).forEach((key)=>{ - const object = property.c8y_JsonSchema.properties[property.name].properties[key]; - object['keyPath'] = [property.name]; - object.keyPath.push(key); - complexProperties.push(object); - }); - + this.parseItem(property.c8y_JsonSchema.properties[property.name], complexProperties, property.name); } else { simpleProperties.push(property); } @@ -42,6 +36,18 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { return simpleProperties.concat(complexProperties); } + parseItem(property, complexProperties, parentName?){ + Object.keys(property.properties).forEach((key)=>{ + const object = property.properties[key]; + object['keyPath'] = property.keyPath? cloneDeep(property.keyPath) : [property.name || parentName]; + object.keyPath.push(key); + complexProperties.push(object); + if(Object.prototype.hasOwnProperty.call(object, 'properties')){ + this.parseItem(object,complexProperties); + } + }); + } + onSelectProperty(property) { if (property.active) { this.selectedProperty.push(cloneDeep(property)); @@ -53,19 +59,20 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { } selectOrUnselectChildren(selectedProperty, active){ - if(this.isComplexProperty(selectedProperty)){ - this.customProperties.forEach((property) => { - if(property.keyPath?.[0] === selectedProperty.name){ - property.active = active; - if(active){ + if (!this.isComplexProperty(selectedProperty)) return; + this.customProperties.forEach((property) => { + if(property.keyPath?.some(name => name === selectedProperty.name)){ + property.active = active; + if(active){ + if(!some(this.selectedProperty, obj => isEqual(obj, property))){ this.selectedProperty.push(cloneDeep(property)); - }else{ - property.active = active; - this.removeUnselectedProperties(property); } + }else{ + property.active = active; + this.removeUnselectedProperties(property); } - }); - } + } + }); } removeUnselectedProperties(property){ const removeIndex = this.selectedProperty @@ -89,11 +96,6 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { } isComplexProperty(prop) { - if (!prop.c8y_JsonSchema) { - return false; - } - return ( - prop.c8y_JsonSchema.properties[prop.name]?.type === 'object' - ); + return prop.c8y_JsonSchema?.properties[prop.name]?.type === 'object' || prop.properties !== undefined; } } diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html index 583a44b..9b9bfa9 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html @@ -1,19 +1,19 @@
-
-
- -
+
+
+
+
@@ -121,13 +121,21 @@
- - +
+ +
+
+ +
From 21653ecc808615bc343c27b79627dbf0fce29a82 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Thu, 29 Feb 2024 18:29:38 +0530 Subject: [PATCH 12/34] fix lint error. --- .../integration/asset_properties_widget.cy.ts | 42 +++++++++---------- .../cypress/support/asset_types.commands.ts | 4 +- .../cypress/support/assets.commands.ts | 8 ++-- .../cypress/support/cumulocity.commands.ts | 4 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cypress-E2E-tests/cypress/integration/asset_properties_widget.cy.ts b/cypress-E2E-tests/cypress/integration/asset_properties_widget.cy.ts index 7b0e972..fbf60c2 100644 --- a/cypress-E2E-tests/cypress/integration/asset_properties_widget.cy.ts +++ b/cypress-E2E-tests/cypress/integration/asset_properties_widget.cy.ts @@ -92,14 +92,14 @@ const assetObject3 = [ ]; const roomProperties = [{ label: 'Color', isRequired: 'false' }, { label: 'Location', isRequired: false }, { label: 'File', isRequired: 'false' }, { label: 'ComplexProperty', isRequired: 'false' }]; -const marker = "div[class*='dlt-c8y-icon-marker']"; +const marker = "div[class*='dlt-c8y-icon-marker']"; const mapZoomIn = "a[title='Zoom in']"; const mapZoomOut = "a[title='Zoom out']"; const mapFullScreen = "c8y-asset-location button[title='Full screen']"; const propertyDragHandle = 'c8y-asset-property-selector td > i'; -const map = "c8y-asset-location c8y-map"; -const propertyDragHandle1 = ":nth-child(1) > .cdk-drag-handle"; -const propertyDragHandle3 = ":nth-child(3) > .cdk-drag-handle"; +const map = 'c8y-asset-location c8y-map'; +const propertyDragHandle1 = ':nth-child(1) > .cdk-drag-handle'; +const propertyDragHandle3 = ':nth-child(3) > .cdk-drag-handle'; const labelElement = "td > input[class*='form-control']"; const lat="input[min='-90']"; const lng="input[min='-180']"; @@ -197,7 +197,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () // Verify the presence of Properties section row elements it('TC_Asset_Properties_Widget_config_004', () => { const labels = ['Name', 'ID', 'Asset model']; - const keys = ['name', 'id', 'type']; + const keys = ['name', 'id', 'type']; for (let i = 0; i < labels.length; i++) { cy.get(propertyDragHandle).eq(i).should('be.visible'); cy.get(checkboxElement).eq(i).should('be.visible'); @@ -256,7 +256,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () cy.selectAsset(assetName); // addeding wait so that drag will work as expected otherwise drag will not work cy.wait(1000); - cy.get(propertyDragHandle3).dragTo(propertyDragHandle1); + cy.get(propertyDragHandle3).dragTo(propertyDragHandle1); cy.get(labelElement).eq(0).should('have.value', 'Asset model'); cy.get(asset_properties_widget_elements.saveButton).click(); cy.get(cardTitleElement).should('contain.text', assetProperties); @@ -373,7 +373,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () const subassetName = 'check 2'; cy.get(asset_properties_widget_elements.loadMoreButton).click(); cy.get(`p[title='${assetName1}']`).click(); - cy.get(textElement).should('contains.text', ' Groups > ' + assetName1); + cy.get(textElement).should('contains.text', ` Groups > ${ assetName1}`); cy.get(`p[title='${subassetName}']`).should('be.visible'); }); @@ -383,7 +383,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () const subassetName = 'check 2'; cy.get(asset_properties_widget_elements.loadMoreButton).click(); cy.get(`p[title='${assetName1}']`).click(); - cy.get(textElement).should('contains.text', 'Groups > ' + assetName1); + cy.get(textElement).should('contains.text', `Groups > ${ assetName1}`); cy.get(`p[title='${subassetName}']`).should('be.visible'); cy.get(backArrowElement).click(); cy.get(assetsTextElement).should('contain.text', 'Groups'); @@ -465,7 +465,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () cy.get(assetsTextElement).should('contain.text', 'Groups'); cy.get(asset_properties_widget_elements.loadMoreButton).click(); cy.get(`p[title='${assetName}']`).click(); - cy.get(textElement).should('contains.text', 'Groups > ' + assetName); + cy.get(textElement).should('contains.text', `Groups > ${ assetName}`); cy.get(backArrowElement).should('be.visible'); cy.get('input[placeholder="Filter…"]').click(); cy.get(filterElement).should('be.visible'); @@ -611,7 +611,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () const invalidFileName = 'Image SAG LOGO.png'; const invalidFileSize = 'image1.jpg'; const errorMessage = 'The selected file is not supported.'; - const invalidFileSizeErrorMessage= 'The selected file is too large. The size limit is 102.4 kB.' + const invalidFileSizeErrorMessage= 'The selected file is too large. The size limit is 102.4 kB.'; const editPropertyCancelButton = "button[title='Cancel']"; const complexPropertyTitle = 'ComplexProperty'; cy.selectAssetPropertyAndSave('Test Asset3', propKey); @@ -666,7 +666,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () cy.get(marker).scrollIntoView().should('be.visible'); cy.get(map).should('not.be.enabled'); cy.get(marker).should('not.be.enabled'); - //cy.get(mapFullScreen).scrollIntoView().trigger("click"); // works intermittently + // cy.get(mapFullScreen).scrollIntoView().trigger("click"); // works intermittently cy.clickPropertyEditButton(location); cy.get(lng).clear(); cy.get(saveElement).click(); @@ -675,9 +675,9 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () }); // On click of Cancel the values should not get saved in location property. - it('TC_Asset_Properties_Widget_Location_Edit_002', () => { + it('TC_Asset_Properties_Widget_Location_Edit_002', () => { cy.selectAssetPropertyAndSave(assetName1, locationPropertyKey); - cy.clickPropertyEditButton(location); + cy.clickPropertyEditButton(location); cy.get(lng).should('contain.value', 77.6904); cy.get(lng).clear(); cy.get(alt).should('contain.value', ''); @@ -708,16 +708,16 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () // If the property 'Location' has values: // The values should be shown in respective fields. // Map should be visible with a marker pointing at the provided lat long location at the center. - // Full screen button should be visible on click of which map opens full screen. + // Full screen button should be visible on click of which map opens full screen. // If the values are changed manually in the fields the marker should automatically get updated. - // On click of save the values should get updated. - // On click of anywhere on the map the marker should get updated and the values in the form should get updated with the values in respective fields. + // On click of save the values should get updated. + // On click of anywhere on the map the marker should get updated and the values in the form should get updated with the values in respective fields. it('TC_Asset_Properties_Widget_Location_Edit_004', () => { const leafletMarker = "div[class*='leaflet-marker-icon']"; cy.selectAssetPropertyAndSave(assetName1, locationPropertyKey); cy.clickPropertyEditButton(location); - cy.get(leafletMarker).should('have.css', 'height', '12px') - cy.get(leafletMarker).should('have.css', 'width', '12px') + cy.get(leafletMarker).should('have.css', 'height', '12px'); + cy.get(leafletMarker).should('have.css', 'width', '12px'); cy.get(lng).should('contain.value', 77.6904); cy.get(lng).clear(); cy.get(alt).should('contain.value', ''); @@ -729,7 +729,7 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () cy.get(map).scrollIntoView().should('be.visible'); cy.get(mapFullScreen).scrollIntoView().should('be.visible'); cy.get(mapZoomIn).scrollIntoView().should('be.visible'); - cy.get(mapZoomOut).scrollIntoView().should('be.visible'); + cy.get(mapZoomOut).scrollIntoView().should('be.visible'); cy.get(lng).type('60'); cy.get(alt).type('10'); cy.get(lat).type('15'); @@ -744,9 +744,9 @@ describe('Asset Properties Widget: Configuration/View screen tests', function () .its('response.statusCode') .should('eq', 200); cy.clickPropertyEditButton(location); - cy.get(map).click(); + cy.get(map).click(); cy.get(lng).should('not.have.value', 60); - cy.get(lat).should('not.have.value', 15); + cy.get(lat).should('not.have.value', 15); cy.deleteCard(); }); diff --git a/cypress-E2E-tests/cypress/support/asset_types.commands.ts b/cypress-E2E-tests/cypress/support/asset_types.commands.ts index a9968b5..dc9a2c9 100644 --- a/cypress-E2E-tests/cypress/support/asset_types.commands.ts +++ b/cypress-E2E-tests/cypress/support/asset_types.commands.ts @@ -575,13 +575,13 @@ Cypress.Commands.add('updateAssetModel',(assetModel: any,references: object[],al cy.apiRequest({ method: 'PUT', - url: '/inventory/managedObjects/' + assetModel.body.managedObjects[0].id, + url: `/inventory/managedObjects/${ assetModel.body.managedObjects[0].id}`, body: assetModelMO }).then(() => { for(let i=0;i { c8y_IsAssetProperty: {}, c8y_Global: {}, c8y_JsonSchema: { - type: "object", - title: "file", + type: 'object', + title: 'file', properties: { file: { contentMediaType: 'jpeg,csv,jpg', maxSize: 0.1, - type: "file" + type: 'file' } }, required: [], - key: "file" + key: 'file' }, }, { diff --git a/cypress-E2E-tests/cypress/support/cumulocity.commands.ts b/cypress-E2E-tests/cypress/support/cumulocity.commands.ts index 3967981..b727aca 100644 --- a/cypress-E2E-tests/cypress/support/cumulocity.commands.ts +++ b/cypress-E2E-tests/cypress/support/cumulocity.commands.ts @@ -435,7 +435,7 @@ Cypress.Commands.add('login', username => { const userName = username ? username : Cypress.env('username'); cy.getTenantId(userName, Cypress.env('password')).then(tenantId => { cy.session( - 'dtmsession_' + userName, + `dtmsession_${ userName}`, () => { cy.request({ method: 'POST', @@ -510,7 +510,7 @@ Cypress.Commands.add('createUser', username => { body: { userName: username, password: Cypress.env('password'), - email: username + '@softwareag.com' + email: `${username }@softwareag.com` } }).then(() => { cy.getApplicationId().then((appId: string) => { From cf189e69522bb0dcc066dd7b42ffac6d7efcbfa5 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Fri, 1 Mar 2024 12:45:45 +0530 Subject: [PATCH 13/34] flag added for empty widget. --- .../asset-properties-view/asset-properties-view.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index e025206..44242b2 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -110,7 +110,7 @@ export class AssetPropertiesViewComponent implements OnInit { } catch (error) { this.isEmptyWidget = true; } - } + } else this.isEmptyWidget = true; } async getAlarmCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ From d55d609200ce9e8dda7b1d1c8e3869a5c374d6f2 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Fri, 8 Mar 2024 13:31:24 +0530 Subject: [PATCH 14/34] data-cy added to few buttons. --- .../asset-property-selector.component.html | 1 + .../computed-property-config-component.html | 2 ++ 2 files changed, 3 insertions(+) diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html index 9b9bfa9..ac855a6 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html @@ -147,6 +147,7 @@ tooltip-append-to-body="true" *ngIf="!!property.computed && property.config" (click)="configComputeProperty(i)" + data-cy="asset-property-selector-config-computed-property-button" > {{ diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config-component.html b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config-component.html index edf18f0..1b85db6 100644 --- a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config-component.html +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config-component.html @@ -35,6 +35,7 @@ type="button" title="{{ 'Cancel' | translate }}" (click)="onCancelButtonClicked()" + data-cy="computed-property-config-cancel-button" > {{ 'Cancel' | translate }} @@ -44,6 +45,7 @@ title="{{ 'Save' | translate }}" (click)="onSaveButtonClicked()" [disabled]="isSaveButtonDisabled()" + data-cy="computed-property-config-save-button" > {{ 'Save' | translate }} From 26d8d00082f0d3175816631896584b817b0a7442 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Fri, 8 Mar 2024 13:53:13 +0530 Subject: [PATCH 15/34] file name modified. --- ...t-properties.module.ts => asset-properties-widget.module.ts} | 0 asset-properties-widget/index.ts | 2 +- package.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename asset-properties-widget/{asset-properties.module.ts => asset-properties-widget.module.ts} (100%) diff --git a/asset-properties-widget/asset-properties.module.ts b/asset-properties-widget/asset-properties-widget.module.ts similarity index 100% rename from asset-properties-widget/asset-properties.module.ts rename to asset-properties-widget/asset-properties-widget.module.ts diff --git a/asset-properties-widget/index.ts b/asset-properties-widget/index.ts index b140d6a..a64f095 100644 --- a/asset-properties-widget/index.ts +++ b/asset-properties-widget/index.ts @@ -1,2 +1,2 @@ -export * from './asset-properties.module'; +export * from './asset-properties-widget.module'; import './locales/en.po'; diff --git a/package.json b/package.json index 39b3efa..176c3bd 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ { "name": "Cumulocity Asset properties widget plugin", "module": "AssetPropertiesWidgetModule", - "path": "./asset-properties-widget/asset-properties.module.ts", + "path": "./asset-properties-widget/asset-properties-widget.module.ts", "description": "Asset properties configuration widget" } ], From f05e4967e27f29ea67ad64d2b46b1bb426a1f91e Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Fri, 8 Mar 2024 13:56:22 +0530 Subject: [PATCH 16/34] The 'dateTo' filter added one more extra day to it. --- .../asset-properties-view.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index 44242b2..0afae12 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -116,7 +116,7 @@ export class AssetPropertiesViewComponent implements OnInit { async getAlarmCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ const filters = { dateFrom: dateFrom, - dateTo: this.datePipe.transform(new Date(), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + dateTo: this.datePipe.transform(new Date().setDate(new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), source: device.id, pageSize: 2000, type: property.config.type, @@ -134,7 +134,7 @@ export class AssetPropertiesViewComponent implements OnInit { async getEventCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ const filters = { dateFrom: dateFrom, - dateTo: this.datePipe.transform(new Date(), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + dateTo: this.datePipe.transform(new Date().setDate(new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), source: device.id, pageSize: 2000, type: property.config.type, @@ -163,7 +163,7 @@ export class AssetPropertiesViewComponent implements OnInit { async getLastDeviceMessage(device: IManagedObject) { const filters = { dateFrom: this.DEFAULT_FROM_DATE, - dateTo: this.datePipe.transform(new Date(), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + dateTo: this.datePipe.transform(new Date().setDate(new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), source: device.id, pageSize: 2000, }; From 4678c182463a2e6fad432763aebc147507690a9a Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Fri, 8 Mar 2024 17:03:16 +0530 Subject: [PATCH 17/34] incorporated PR comment. --- .../common/asset-property-constant.ts | 14 +++++----- .../asset-properties-config.component.ts | 18 ++++++------ .../asset-property-item-selector.component.ts | 28 +++++++++++-------- .../asset-property-selector.component.html | 2 +- .../asset-property-selector.component.ts | 28 +++++++++---------- .../asset-properties-view.component.ts | 15 ++++++---- 6 files changed, 57 insertions(+), 48 deletions(-) diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index bc42911..e00ad8a 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -30,9 +30,6 @@ export const defaultProperty = [ isEditable: false, isExistingProperty: true, }, -]; - -export const commonProperty = [ { c8y_JsonSchema: { properties: { owner: { type: 'string', label: 'Owner' } }, @@ -52,7 +49,10 @@ export const commonProperty = [ type: 'string', isEditable: false, isExistingProperty: true, - }, + } +]; + +export const computedPropertiesBaseObject = [ { c8y_JsonSchema: { properties: { alarmCountToday: { @@ -188,7 +188,8 @@ export const commonProperty = [ isExistingProperty: true, } ]; -export const deviceProperty = [ + +export const devicePropertiesBaseObject = [ { label: 'Active alarms status', type: 'object', @@ -652,6 +653,5 @@ export const deviceProperty = [ export const RESULT_TYPES = { VALUE: { name: 'VALUE', value: 1, label: gettext('Only value') }, VALUE_UNIT: { name: 'VALUE_UNIT', value: 2, label: gettext('Value and unit') }, - VALUE_UNIT_TIME: { name: 'VALUE_UNIT_TIME', value: 3, label: gettext('Value, unit and time') }, - // OBJECT: { name: 'OBJECT', value: 4, label: gettext('Complete object') } + VALUE_UNIT_TIME: { name: 'VALUE_UNIT_TIME', value: 3, label: gettext('Value, unit and time') } }; \ No newline at end of file diff --git a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts index bc65fda..8d077b6 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts @@ -17,16 +17,16 @@ export class AssetPropertiesConfigComponent constructor(private inventoryService: InventoryService) {} async ngOnChanges(){ - if (this.config.device && !this.config.device.hasOwnProperty('c8y_IsDevice')) { - try { - this.selectedAsset = ( - await this.inventoryService.detail(this.config.device.id) - ).data; - } catch (er) { - // intended empty - } - }else if(this.config.device){ + if(this.config.device.hasOwnProperty('c8y_IsDevice')){ this.selectedAsset = this.config.device; + return; + } + try { + this.selectedAsset = ( + await this.inventoryService.detail(this.config.device.id) + ).data; + } catch (er) { + // intended empty } } diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts index 905bf16..631ac15 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts @@ -25,30 +25,36 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { constructCustomProperties(): IManagedObject[] { const simpleProperties: IManagedObject[] = []; const complexProperties: IManagedObject[] = []; + const computedProperties: IManagedObject[] = []; this.customProperties.forEach((property) => { if (this.isComplexProperty(property)) { complexProperties.push(property); - this.parseItem(property.c8y_JsonSchema.properties[property.name], complexProperties, property.name); + this.flattenNestedComplexProperties(property.c8y_JsonSchema?.properties[property.name], complexProperties, property.name); + } else if (property.computed) { + computedProperties.push(property); } else { simpleProperties.push(property); } }); - return simpleProperties.concat(complexProperties); + return [...simpleProperties, ...complexProperties, ...computedProperties]; } - parseItem(property, complexProperties, parentName?){ + flattenNestedComplexProperties(property: IManagedObject, complexProperties: IManagedObject[], parentName?: string): void { + if (!property || !property.properties) return; + Object.keys(property.properties).forEach((key)=>{ const object = property.properties[key]; - object['keyPath'] = property.keyPath? cloneDeep(property.keyPath) : [property.name || parentName]; - object.keyPath.push(key); + const keyPath = property.keyPath ? [...property.keyPath] : [property.name || parentName]; + keyPath.push(key); + object['keyPath'] = keyPath; complexProperties.push(object); - if(Object.prototype.hasOwnProperty.call(object, 'properties')){ - this.parseItem(object,complexProperties); + if (object.properties) { + this.flattenNestedComplexProperties(object, complexProperties); } }); } - onSelectProperty(property) { + onSelectProperty(property: IManagedObject) { if (property.active) { this.selectedProperty.push(cloneDeep(property)); this.selectOrUnselectChildren(property, true); @@ -58,7 +64,7 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { } } - selectOrUnselectChildren(selectedProperty, active){ + selectOrUnselectChildren(selectedProperty: IManagedObject, active: boolean){ if (!this.isComplexProperty(selectedProperty)) return; this.customProperties.forEach((property) => { if(property.keyPath?.some(name => name === selectedProperty.name)){ @@ -74,7 +80,7 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { } }); } - removeUnselectedProperties(property){ + removeUnselectedProperties(property: IManagedObject){ const removeIndex = this.selectedProperty .map(function (item) { return item.keyValue?.[0] || item.name; @@ -95,7 +101,7 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { return this.customProperties.every(({ active }) => !active); } - isComplexProperty(prop) { + isComplexProperty(prop: IManagedObject) { return prop.c8y_JsonSchema?.properties[prop.name]?.type === 'object' || prop.properties !== undefined; } } diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html index ac855a6..df18684 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html @@ -146,7 +146,7 @@ tooltip-popup-delay="500" tooltip-append-to-body="true" *ngIf="!!property.computed && property.config" - (click)="configComputeProperty(i)" + (click)="configureComputedProperty(i)" data-cy="asset-property-selector-config-computed-property-button" > diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts index 057fb57..f60451c 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts @@ -2,14 +2,14 @@ import { Component, Input, OnChanges } from '@angular/core'; import { IManagedObject } from '@c8y/client'; import { AssetTypesService, gettext } from '@c8y/ngx-components'; import { BsModalRef, BsModalService, ModalOptions } from 'ngx-bootstrap/modal'; -import { isEmpty, cloneDeep } from 'lodash-es'; +import { isEmpty, cloneDeep, filter} from 'lodash-es'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { assetPropertyItemSelectorCtrlComponent } from '../asset-property-item-selector/asset-property-item-selector.component'; import { AssetPropertiesService } from '../asset-properties.service'; import { defaultProperty, - deviceProperty, - commonProperty, + devicePropertiesBaseObject, + computedPropertiesBaseObject, } from '../../../common/asset-property-constant'; import { some } from 'lodash-es'; import { ComputedPropertyConfigComponent } from '../computed-asset-property/computed-property-config.component'; @@ -31,8 +31,8 @@ export class AssetPropertiesSelectorComponent implements OnChanges { assetType: IManagedObject; assetPropertySelectorModalRef: BsModalRef; computedPropertyConfigModalRef: BsModalRef; - properties = cloneDeep(defaultProperty); - customProperties: Array = [...cloneDeep(defaultProperty), ...cloneDeep(commonProperty)]; + properties = cloneDeep(filter(defaultProperty, { active: true })); + customProperties: Array = [...cloneDeep(defaultProperty), ...cloneDeep(computedPropertiesBaseObject)]; ExpandedComplexProperty: any; isAtleastOnePropertySelected: boolean = true; selectedComputedPropertyIndex: number; @@ -45,12 +45,12 @@ export class AssetPropertiesSelectorComponent implements OnChanges { async ngOnChanges(changes: IManagedObject): Promise { if(changes.asset.currentValue?.hasOwnProperty('c8y_IsDevice')){ - this.properties = this.config.properties || cloneDeep(defaultProperty); + this.properties = this.config.properties || cloneDeep(filter(defaultProperty, { active: true })); if(changes.asset.previousValue?.hasOwnProperty('c8y_IsAsset')){ - this.properties = cloneDeep(defaultProperty); + this.properties = cloneDeep(filter(defaultProperty, { active: true })); } this.config.properties = this.properties; - this.customProperties = [...cloneDeep(defaultProperty), ...cloneDeep(deviceProperty), ...cloneDeep(commonProperty)]; + this.customProperties = [...cloneDeep(defaultProperty), ...cloneDeep(devicePropertiesBaseObject), ...cloneDeep(computedPropertiesBaseObject)]; } else if (!changes.asset.previousValue && this.config?.properties) { this.properties = this.config.properties; @@ -82,16 +82,16 @@ export class AssetPropertiesSelectorComponent implements OnChanges { } async loadAssetProperty() { this.isLoading = true; - this.properties = cloneDeep(defaultProperty); + this.properties = cloneDeep(filter(defaultProperty, { active: true })); this.assetType = this.assetTypes.getAssetTypeByName(this.asset.type); this.config.properties = this.properties; - this.customProperties = cloneDeep(this.properties) - .concat(commonProperty) + this.customProperties = cloneDeep(defaultProperty) .concat( this.getConstructCustomProperties( await this.assetPropertyService.getCustomProperties(this.asset) ) - ); + ) + .concat(computedPropertiesBaseObject); this.isLoading = false; } @@ -127,7 +127,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { this.properties.forEach((property, index) => { if(property.computed && property.config && !(property.config.dp?.length>0 || property.config.type)){ this.config.properties[index].config = {...this.config.properties[index].config, ...{id:String(Math.random()).substr(2)}}; - this.configComputeProperty(index); + this.configureComputedProperty(index); } }); this.assetPropertySelectorModalRef.hide(); @@ -210,7 +210,7 @@ export class AssetPropertiesSelectorComponent implements OnChanges { moveItemInArray(this.properties, event.previousIndex, event.currentIndex); } - configComputeProperty(index){ + configureComputedProperty(index){ this.selectedComputedPropertyIndex = index; this.computedPropertyConfigModalRef = this.modalService.show( ComputedPropertyConfigComponent, diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index 0afae12..dda1d29 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -8,7 +8,7 @@ import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { AssetPropertiesViewService } from './asset-properties-view.service'; import { DatePipe } from '@angular/common'; -import { deviceProperty } from '../../common/asset-property-constant'; +import { devicePropertiesBaseObject } from '../../common/asset-property-constant'; interface MeasurementValue { unit?: string; @@ -16,6 +16,9 @@ interface MeasurementValue { date: string; id: string; } +interface ComputedPropertyObject { + [key: string]: any; +} @Component({ selector: 'c8y-asset-properties-view', @@ -29,7 +32,7 @@ export class AssetPropertiesViewComponent implements OnInit { customProperties: Array; properties: IManagedObject[]; @Input() config: any; - computedPropertyObject:object; + computedPropertyObject: ComputedPropertyObject; isLoading = true; DEFAULT_FROM_DATE:string = '1970-01-01'; @@ -70,7 +73,7 @@ export class AssetPropertiesViewComponent implements OnInit { this.config.properties = cloneDeep(this.properties); }else{ this.properties = cloneDeep(this.config.properties); - this.customProperties = cloneDeep(deviceProperty); + this.customProperties = cloneDeep(devicePropertiesBaseObject); } this.constructComplexPropertyKeys(); this.config.properties.forEach(property =>{ @@ -269,15 +272,15 @@ export class AssetPropertiesViewComponent implements OnInit { constructNestedComplexProperty(customizedProperty){ customizedProperty.forEach(element => { if(element.active && element.isNestedComplexProperty){ - this.parseItem(element.c8y_JsonSchema.properties[element.name]); + this.refineNestedComplexProperty(element.c8y_JsonSchema.properties[element.name]); } }); } - parseItem(property, parentReferance?){ + refineNestedComplexProperty(property, parentReferance?){ Object.keys(property.properties).forEach((key)=>{ const object = property.properties[key]; if(!isEmpty(object.properties)&& (some(object.properties, 'active') || some(object.properties, 'properties')) && !object.active){ - this.parseItem(object,property); + this.refineNestedComplexProperty(object,property); }else if(!object.active){ delete property.properties[key]; if(isEmpty(property.properties)){ From b1853b944c1265d5860d5107c9d0bcac0348411f Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Tue, 12 Mar 2024 18:44:36 +0530 Subject: [PATCH 18/34] incorporate PR comment. --- .../asset-properties-widget.module.ts | 6 +- .../common/asset-property-constant.ts | 889 ++++++++++-------- ...computed-property-config.component.spec.ts | 72 ++ .../computed-property-config.component.ts | 13 +- .../asset-properties-view.component.spec.ts | 435 +++++---- .../asset-properties-view.component.ts | 406 ++++---- .../asset-properties-view.service.spec.ts | 101 +- .../asset-properties-view.service.ts | 152 ++- .../asset-properties.component.spec.ts | 120 ++- .../asset-properties.component.ts | 64 +- 10 files changed, 1362 insertions(+), 896 deletions(-) create mode 100644 asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.spec.ts diff --git a/asset-properties-widget/asset-properties-widget.module.ts b/asset-properties-widget/asset-properties-widget.module.ts index 9d4ca7d..3a901d3 100644 --- a/asset-properties-widget/asset-properties-widget.module.ts +++ b/asset-properties-widget/asset-properties-widget.module.ts @@ -4,6 +4,7 @@ import { CoreModule, EventRealtimeService, HOOK_COMPONENTS, + MeasurementRealtimeService, OperationRealtimeService, RealtimeModule, } from '@c8y/ngx-components'; @@ -21,7 +22,7 @@ import { SubAssetsModule } from '@c8y/ngx-components/sub-assets'; import { ComputedPropertyConfigComponent } from './component/asset-properties-config/computed-asset-property/computed-property-config.component'; import { DatapointSelectorModule } from '@c8y/ngx-components/datapoint-selector'; import { ComputedPropertyLastMeasurementConfigComponent } from './component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component'; -import { DatePipe } from '@angular/common'; +import { AssetPropertiesViewService } from './component/asset-properties-view/asset-properties-view.service'; @NgModule({ declarations: [ @@ -44,10 +45,11 @@ import { DatePipe } from '@angular/common'; DatapointSelectorModule, ], providers: [ + AssetPropertiesViewService, AlarmRealtimeService, - DatePipe, EventRealtimeService, OperationRealtimeService, + MeasurementRealtimeService, { provide: HOOK_COMPONENTS, multi: true, diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index e00ad8a..df522a9 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -8,7 +8,7 @@ export const defaultProperty = [ type: 'string', active: true, isEditable: true, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { properties: { id: { type: 'string', label: 'ID' } } }, @@ -17,153 +17,171 @@ export const defaultProperty = [ type: 'string', active: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { type: { type: 'string', label: 'Asset model' } }, + properties: { type: { type: 'string', label: 'Asset model' } } }, name: 'type', label: 'Asset model', type: 'string', active: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { owner: { type: 'string', label: 'Owner' } }, + properties: { owner: { type: 'string', label: 'Owner' } } }, name: 'owner', label: 'Owner', type: 'string', isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { lastUpdated: { type: 'string', label: 'Last updated' } }, + properties: { lastUpdated: { type: 'string', label: 'Last updated' } } }, name: 'lastUpdated', label: 'Last updated', type: 'string', isEditable: false, - isExistingProperty: true, + isExistingProperty: true } ]; export const computedPropertiesBaseObject = [ { c8y_JsonSchema: { - properties: { alarmCountToday: { - label: 'Alarm count today', - type: 'number', - },}, + properties: { + alarmCountToday: { + label: 'Alarm count today', + type: 'number' + } + } }, name: 'alarmCountToday', label: 'Alarm count today', title: 'Alarm type', type: 'string', - config:{ type:'' }, + config: { type: '' }, computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { alarmCount3Months: { - label: 'Alarm count 3 months', - type: 'number', - },}, + properties: { + alarmCount3Months: { + label: 'Alarm count 3 months', + type: 'number' + } + } }, name: 'alarmCount3Months', label: 'Alarm count 3 months', title: 'Alarm type', type: 'string', - config:{ type:'' }, + config: { type: '' }, computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { eventCountToday: { - label: 'Event count today', - type: 'number', - },}, + properties: { + eventCountToday: { + label: 'Event count today', + type: 'number' + } + } }, name: 'eventCountToday', label: 'Event count today', title: 'Event type', type: 'string', - config:{type:''}, + config: { type: '' }, computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { eventCount3Months: { - label: 'Event count 3 months', - type: 'number', - },}, + properties: { + eventCount3Months: { + label: 'Event count 3 months', + type: 'number' + } + } }, name: 'eventCount3Months', label: 'Event count 3 months', title: 'Event type', type: 'string', - config:{ type:'' }, + config: { type: '' }, computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { - c8y_JsonSchema: {properties: { lastMeasurement: { - label: 'Last measurement', - type: 'string', - },},}, + c8y_JsonSchema: { + properties: { + lastMeasurement: { + label: 'Last measurement', + type: 'string' + } + } + }, name: 'lastMeasurement', label: 'Last measurement', type: 'string', - config:{dp:[],isValid:null, resultTypes:1}, + config: { dp: [], isValid: null, resultTypes: 1 }, computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { childDevicesCount: { - label: 'Number of child devices', - type: 'number', - },}, + properties: { + childDevicesCount: { + label: 'Number of child devices', + type: 'number' + } + } }, name: 'childDevicesCount', label: 'Number of child devices', type: 'number', computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { childAssetsCount: { - label: 'Number of child assets', - type: 'number', - },}, + properties: { + childAssetsCount: { + label: 'Number of child assets', + type: 'number' + } + } }, name: 'childAssetsCount', label: 'Number of child assets', type: 'number', computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { lastDeviceMessage: { - label: 'Last device message', - type: 'string', - },}, + properties: { + lastDeviceMessage: { + label: 'Last device message', + type: 'string' + } + } }, name: 'lastDeviceMessage', label: 'Last device message', @@ -171,21 +189,23 @@ export const computedPropertiesBaseObject = [ type: 'string', computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { configurationSnapshot: { - label: 'Configuration snapshot', - type: 'string', - },}, + properties: { + configurationSnapshot: { + label: 'Configuration snapshot', + type: 'string' + } + } }, name: 'configurationSnapshot', label: 'Configuration snapshot', type: 'string', computed: true, isEditable: false, - isExistingProperty: true, + isExistingProperty: true } ]; @@ -196,25 +216,32 @@ export const devicePropertiesBaseObject = [ isEditable: false, name: 'c8y_ActiveAlarmsStatus', c8y_JsonSchema: { - properties: { c8y_ActiveAlarmsStatus: {key:'c8y_ActiveAlarmsStatus', type: 'object', label: 'Active alarms status',properties: { - critical: { - title: 'Critical', - type: 'number', - }, - major: { - title: 'Major', - type: 'number', - }, - minor: { - title: 'Minor', - type: 'number', - }, - warning: { - title: 'Warning', - type: 'number', + properties: { + c8y_ActiveAlarmsStatus: { + key: 'c8y_ActiveAlarmsStatus', + type: 'object', + label: 'Active alarms status', + properties: { + critical: { + title: 'Critical', + type: 'number' + }, + major: { + title: 'Major', + type: 'number' + }, + minor: { + title: 'Minor', + type: 'number' + }, + warning: { + title: 'Warning', + type: 'number' + } + } } - } } }, - }, + } + } }, { label: 'Address', @@ -222,33 +249,40 @@ export const devicePropertiesBaseObject = [ isEditable: true, name: 'c8y_Address', c8y_JsonSchema: { - properties: { c8y_Address: {key:'c8y_Address', type: 'object', label: 'Address',properties: { - street: { - title: 'Street', - type: 'string' - }, - city: { - title: 'City', - type: 'string' - }, - cityCode: { - title: 'City code', - type: 'string' - }, - territory: { - title: 'Territory', - type: 'string' - }, - region: { - title: 'Region', - type: 'string' - }, - country: { - title: 'Country', - type: 'string' + properties: { + c8y_Address: { + key: 'c8y_Address', + type: 'object', + label: 'Address', + properties: { + street: { + title: 'Street', + type: 'string' + }, + city: { + title: 'City', + type: 'string' + }, + cityCode: { + title: 'City code', + type: 'string' + }, + territory: { + title: 'Territory', + type: 'string' + }, + region: { + title: 'Region', + type: 'string' + }, + country: { + title: 'Country', + type: 'string' + } + } } - }}} - }, + } + } }, { label: 'Agent', @@ -256,24 +290,31 @@ export const devicePropertiesBaseObject = [ isEditable: true, name: 'c8y_Agent', c8y_JsonSchema: { - properties: { c8y_Agent: {key:'c8y_Agent', type: 'object', label: 'Agent',properties : { - name: { - title: 'Name', - type: 'string' - }, - version: { - title: 'Version', - type: 'string' - }, - url: { - title: 'URL', - type: 'string' - }, - maintainer: { - title: 'Maintainer', - type: 'string' + properties: { + c8y_Agent: { + key: 'c8y_Agent', + type: 'object', + label: 'Agent', + properties: { + name: { + title: 'Name', + type: 'string' + }, + version: { + title: 'Version', + type: 'string' + }, + url: { + title: 'URL', + type: 'string' + }, + maintainer: { + title: 'Maintainer', + type: 'string' + } + } } - }}} + } } }, { @@ -282,18 +323,25 @@ export const devicePropertiesBaseObject = [ isEditable: false, name: 'c8y_Availability', c8y_JsonSchema: { - properties: { c8y_Availability: {key:'c8y_Availability', type: 'object', label: 'Availability',properties : { - status: { - title: 'Status', - type: 'string', - }, - lastMessage: { - title: 'Last message', - type: 'string', - printFormat: 'datetime', + properties: { + c8y_Availability: { + key: 'c8y_Availability', + type: 'object', + label: 'Availability', + properties: { + status: { + title: 'Status', + type: 'string' + }, + lastMessage: { + title: 'Last message', + type: 'string', + printFormat: 'datetime' + } + } } - }}} - }, + } + } }, { label: 'Connection', @@ -301,13 +349,20 @@ export const devicePropertiesBaseObject = [ isEditable: false, name: 'c8y_Connection', c8y_JsonSchema: { - properties: { c8y_Connection: {key:'c8y_Connection', type: 'object', label: 'Connection',properties : { - status: { - title: 'Status', - type: 'string', + properties: { + c8y_Connection: { + key: 'c8y_Connection', + type: 'object', + label: 'Connection', + properties: { + status: { + title: 'Status', + type: 'string' + } + } } - }}} - }, + } + } }, { label: 'Communication mode', @@ -315,12 +370,19 @@ export const devicePropertiesBaseObject = [ isEditable: true, name: 'c8y_CommunicationMode', c8y_JsonSchema: { - properties: { c8y_CommunicationMode: {key:'c8y_CommunicationMode', type: 'object', label: 'Communication mode',properties : { - mode: { - title: 'Mode', - type: 'string' + properties: { + c8y_CommunicationMode: { + key: 'c8y_CommunicationMode', + type: 'object', + label: 'Communication mode', + properties: { + mode: { + title: 'Mode', + type: 'string' + } + } } - }}} + } } }, { @@ -329,25 +391,32 @@ export const devicePropertiesBaseObject = [ isEditable: false, name: 'c8y_Firmware', c8y_JsonSchema: { - properties: { c8y_Firmware: {key:'c8y_Firmware', type: 'object', label: 'Firmware',properties : { - moduleVersion: { - title: 'Module version', - type: 'string' - }, - name: { - title: 'Name', - type: 'string' - }, - version: { - title: 'Version', - type: 'string' - }, - url: { - title: 'URL', - type: ['string', 'null'] + properties: { + c8y_Firmware: { + key: 'c8y_Firmware', + type: 'object', + label: 'Firmware', + properties: { + moduleVersion: { + title: 'Module version', + type: 'string' + }, + name: { + title: 'Name', + type: 'string' + }, + version: { + title: 'Version', + type: 'string' + }, + url: { + title: 'URL', + type: ['string', 'null'] + } + } } - }}} - }, + } + } }, { label: 'Hardware', @@ -355,21 +424,28 @@ export const devicePropertiesBaseObject = [ isEditable: true, name: 'c8y_Hardware', c8y_JsonSchema: { - properties: { c8y_Hardware: {key:'c8y_Hardware', type: 'object', label: 'Hardware',properties : { - model: { - title: 'Model', - type: 'string' - }, - serialNumber: { - title: 'Serial number', - type: 'string' - }, - revision: { - title: 'Revision', - type: 'string' + properties: { + c8y_Hardware: { + key: 'c8y_Hardware', + type: 'object', + label: 'Hardware', + properties: { + model: { + title: 'Model', + type: 'string' + }, + serialNumber: { + title: 'Serial number', + type: 'string' + }, + revision: { + title: 'Revision', + type: 'string' + } + } } - }}} - }, + } + } }, { label: 'LPWAN device', @@ -377,13 +453,20 @@ export const devicePropertiesBaseObject = [ isEditable: false, name: 'c8y_LpwanDevice', c8y_JsonSchema: { - properties: { c8y_LpwanDevice: {key:'c8y_LpwanDevice', type: 'object', label: 'LPWAN device',properties : { - provisioned: { - title: 'Provisioned', - type: 'boolean', + properties: { + c8y_LpwanDevice: { + key: 'c8y_LpwanDevice', + type: 'object', + label: 'LPWAN device', + properties: { + provisioned: { + title: 'Provisioned', + type: 'boolean' + } + } } - }}} - }, + } + } }, { label: 'Mobile', @@ -391,91 +474,106 @@ export const devicePropertiesBaseObject = [ isEditable: true, name: 'c8y_Mobile', c8y_JsonSchema: { - properties: { c8y_Mobile: {key:'c8y_Mobile', type: 'object', label: 'Mobile',properties : { - cellId: { - title: 'Cell ID', - type: ['string', 'null'], - }, - connType: { - title: 'Connection type', - type: 'string', - readOnly: true - }, - currentOperator: { - title: 'Current operator', - type: 'string', - readOnly: true - }, - currentBand: { - title: 'Current band', - type: 'string', - readOnly: true - }, - ecn0: { - title: 'ECN0', - type: 'string', - readOnly: true - }, - iccid: { - title: 'ICCID', - type: ['string', 'null'] - }, - imei: { - title: 'IMEI', - type: ['string', 'null'] - }, - imsi: { - title: 'IMSI', - type: ['string', 'null'] - }, - lac: { - title: 'LAC', - type: ['string', 'null'] - }, - mcc: { - title: 'MCC', - type: ['string', 'null'] - }, - mnc: { - title: 'MNC', - type: ['string', 'null'] - }, - msisdn: { - title: 'MSISDN', - type: 'string' - }, - rcsp: { - title: 'RCSP', - type: 'string', - readOnly: true - }, - rscp: { - title: 'RSCP', - type: 'string', - readOnly: true - }, - rsrp: { - title: 'RSRP', - type: 'string', - readOnly: true - }, - rsrq: { - title: 'RSRQ', - type: 'string', - readOnly: true - }, - rssi: { - title: 'RSSI', - type: 'string', - readOnly: true + properties: { + c8y_Mobile: { + key: 'c8y_Mobile', + type: 'object', + label: 'Mobile', + properties: { + cellId: { + title: 'Cell ID', + type: ['string', 'null'] + }, + connType: { + title: 'Connection type', + type: 'string', + readOnly: true + }, + currentOperator: { + title: 'Current operator', + type: 'string', + readOnly: true + }, + currentBand: { + title: 'Current band', + type: 'string', + readOnly: true + }, + ecn0: { + title: 'ECN0', + type: 'string', + readOnly: true + }, + iccid: { + title: 'ICCID', + type: ['string', 'null'] + }, + imei: { + title: 'IMEI', + type: ['string', 'null'] + }, + imsi: { + title: 'IMSI', + type: ['string', 'null'] + }, + lac: { + title: 'LAC', + type: ['string', 'null'] + }, + mcc: { + title: 'MCC', + type: ['string', 'null'] + }, + mnc: { + title: 'MNC', + type: ['string', 'null'] + }, + msisdn: { + title: 'MSISDN', + type: 'string' + }, + rcsp: { + title: 'RCSP', + type: 'string', + readOnly: true + }, + rscp: { + title: 'RSCP', + type: 'string', + readOnly: true + }, + rsrp: { + title: 'RSRP', + type: 'string', + readOnly: true + }, + rsrq: { + title: 'RSRQ', + type: 'string', + readOnly: true + }, + rssi: { + title: 'RSSI', + type: 'string', + readOnly: true + } + } } - }}} - }, + } + } }, { - c8y_JsonSchema: { properties: { c8y_Notes: { type: 'string', label: 'Notes','x-schema-form': { - type: 'textarea' - } } } }, + c8y_JsonSchema: { + properties: { + c8y_Notes: { + type: 'string', + label: 'Notes', + 'x-schema-form': { + type: 'textarea' + } + } + } + }, name: 'c8y_Notes', label: 'Notes', type: 'string', @@ -487,20 +585,27 @@ export const devicePropertiesBaseObject = [ isEditable: true, name: 'c8y_Position', c8y_JsonSchema: { - properties: { c8y_Position: {key:'c8y_Position', type: 'object', label: 'Position',properties : { - lat: { - title: 'Latitude', - type: 'number' - }, - lng: { - title: 'Longitude', - type: 'number' - }, - alt: { - title: 'Altitude', - type: 'number' + properties: { + c8y_Position: { + key: 'c8y_Position', + type: 'object', + label: 'Position', + properties: { + lat: { + title: 'Latitude', + type: 'number' + }, + lng: { + title: 'Longitude', + type: 'number' + }, + alt: { + title: 'Altitude', + type: 'number' + } + } } - }}} + } } }, { @@ -509,16 +614,24 @@ export const devicePropertiesBaseObject = [ isEditable: true, name: 'c8y_RequiredAvailability', c8y_JsonSchema: { - properties: { c8y_RequiredAvailability: {key:'c8y_RequiredAvailability', type: 'object', label: 'Required availability',properties : { - responseInterval: { - title: 'Response interval', - description: 'Takes a value between -32768 and 32767 minutes (a negative value indicates that the device is under maintenance).', - type: 'integer', - minimum: -32768, - maximum: 32767 + properties: { + c8y_RequiredAvailability: { + key: 'c8y_RequiredAvailability', + type: 'object', + label: 'Required availability', + properties: { + responseInterval: { + title: 'Response interval', + description: + 'Takes a value between -32768 and 32767 minutes (a negative value indicates that the device is under maintenance).', + type: 'integer', + minimum: -32768, + maximum: 32767 + } + } } - }}} - }, + } + } }, { label: 'Software', @@ -526,20 +639,27 @@ export const devicePropertiesBaseObject = [ isEditable: false, name: 'c8y_Software', c8y_JsonSchema: { - properties: { c8y_Software: {key:'c8y_Software', type: 'object', label: 'Software',properties : { - name: { - title: 'Name', - type: 'string' - }, - version: { - title: 'Version', - type: 'string' - }, - url: { - title: 'URL', - type: ['string', 'null'] + properties: { + c8y_Software: { + key: 'c8y_Software', + type: 'object', + label: 'Software', + properties: { + name: { + title: 'Name', + type: 'string' + }, + version: { + title: 'Version', + type: 'string' + }, + url: { + title: 'URL', + type: ['string', 'null'] + } + } } - }}} + } } }, { @@ -548,105 +668,112 @@ export const devicePropertiesBaseObject = [ isEditable: true, name: 'c8y_Network', c8y_JsonSchema: { - properties: { c8y_Network: {key:'c8y_Network', type: 'object', label: 'Network',properties : { - c8y_DHCP: { - title: 'DHCP', + properties: { + c8y_Network: { + key: 'c8y_Network', type: 'object', - printFormat: 'hidden', - name: 'c8y_DHCP', + label: 'Network', properties: { - addressRange: { - title: 'Address range', + c8y_DHCP: { + title: 'DHCP', type: 'object', - name: 'addressRange', printFormat: 'hidden', + name: 'c8y_DHCP', properties: { - start: { - title: 'Start', + addressRange: { + title: 'Address range', + type: 'object', + name: 'addressRange', + printFormat: 'hidden', + properties: { + start: { + title: 'Start', + type: 'string' + }, + end: { + title: 'End', + type: 'string' + } + } + }, + dns1: { + title: 'DNS 1', type: 'string' }, - end: { - title: 'End', + dns2: { + title: 'DNS 2', type: 'string' + }, + enabled: { + title: 'Enabled', + type: 'integer' } } }, - dns1: { - title: 'DNS 1', - type: 'string' - }, - dns2: { - title: 'DNS 2', - type: 'string' - }, - enabled: { - title: 'Enabled', - type: 'integer' - } - } - }, - c8y_LAN: { - title: 'LAN', - type: 'object', - name: 'c8y_LAN', - printFormat: 'hidden', - properties: { - enabled: { - title: 'Enabled', - type: 'integer' - }, - ip: { - title: 'IP', - type: 'string' - }, - mac: { - title: 'MAC', - type: 'string' - }, - name: { - title: 'Name', - type: 'string' - }, - netmask: { - title: 'Netmask', - type: 'string' - } - } - }, - c8y_WAN: { - title: 'WAN', - type: 'object', - name: 'c8y_WAN', - printFormat: 'hidden', - properties: { - apn: { - title: 'APN', - type: 'string' - }, - authType: { - title: 'Auth type', - type: 'string' - }, - ip: { - title: 'IP', - type: 'string' - }, - password: { - title: 'Password', - type: 'string' - }, - simStatus: { - title: 'SIM status', - type: 'string' + c8y_LAN: { + title: 'LAN', + type: 'object', + name: 'c8y_LAN', + printFormat: 'hidden', + properties: { + enabled: { + title: 'Enabled', + type: 'integer' + }, + ip: { + title: 'IP', + type: 'string' + }, + mac: { + title: 'MAC', + type: 'string' + }, + name: { + title: 'Name', + type: 'string' + }, + netmask: { + title: 'Netmask', + type: 'string' + } + } }, - username: { - title: 'Username', - type: 'string' + c8y_WAN: { + title: 'WAN', + type: 'object', + name: 'c8y_WAN', + printFormat: 'hidden', + properties: { + apn: { + title: 'APN', + type: 'string' + }, + authType: { + title: 'Auth type', + type: 'string' + }, + ip: { + title: 'IP', + type: 'string' + }, + password: { + title: 'Password', + type: 'string' + }, + simStatus: { + title: 'SIM status', + type: 'string' + }, + username: { + title: 'Username', + type: 'string' + } + } } } } - }}} - }, + } + } } ]; @@ -654,4 +781,4 @@ export const RESULT_TYPES = { VALUE: { name: 'VALUE', value: 1, label: gettext('Only value') }, VALUE_UNIT: { name: 'VALUE_UNIT', value: 2, label: gettext('Value and unit') }, VALUE_UNIT_TIME: { name: 'VALUE_UNIT_TIME', value: 3, label: gettext('Value, unit and time') } -}; \ No newline at end of file +}; diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.spec.ts b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.spec.ts new file mode 100644 index 0000000..2be91a7 --- /dev/null +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.spec.ts @@ -0,0 +1,72 @@ +import { ComputedPropertyConfigComponent } from './computed-property-config.component'; + +describe('ComputedPropertyConfigComponent', () => { + let component: ComputedPropertyConfigComponent; + let bsModalRefMock: any; + const property = { + name: 'lastMeasurement', + config: { isValid: false, type: 'c8y_Bulding' } + } as any; + + beforeEach(async () => { + bsModalRefMock = { + hide: jest.fn() + }; + + component = new ComputedPropertyConfigComponent(bsModalRefMock); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should emit savePropertyConfiguration event and hide modal when onSaveButtonClicked is called', () => { + // given + component.savePropertyConfiguration.emit = jest.fn(); + const property = { name: 'lastMeasurement', config: { isValid: true } } as any; + component.tempProperty = property; + component.index = 1; + const expectedEmitValue = { property, index: 1 }; + + // when + component.onSaveButtonClicked(); + // expect + expect(bsModalRefMock.hide).toHaveBeenCalled(); + expect(component.savePropertyConfiguration.emit).toHaveBeenCalledWith(expectedEmitValue); + }); + + it('should emit cancelPropertyConfiguration event and hide modal when onCancelButtonClicked is called', () => { + // given + component.index = 1; + component.cancelPropertyConfiguration.emit = jest.fn(); + + // when + component.onCancelButtonClicked(); + + // expect + expect(bsModalRefMock.hide).toHaveBeenCalled(); + expect(component.cancelPropertyConfiguration.emit).toHaveBeenCalledWith(1); + }); + + it('should disable save button when tempProperty.name is lastMeasurement and config.isValid is false', () => { + // given + component.tempProperty = property; + + // when + const result = component.isSaveButtonDisabled(); + + // expect + expect(result).toBeTruthy(); + }); + + it('should disable save button when tempProperty.config.type is undefined', () => { + // given + component.tempProperty = property; + + // when + const result = component.isSaveButtonDisabled(); + + // expect + expect(result).toBeTruthy(); + }); +}); diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts index a3b40df..1577eb8 100644 --- a/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/computed-property-config.component.ts @@ -5,26 +5,26 @@ import { IManagedObject } from '@c8y/client'; @Component({ selector: 'c8y-computed-property-config-component', - templateUrl: './computed-property-config-component.html', + templateUrl: './computed-property-config-component.html' }) - export class ComputedPropertyConfigComponent implements OnInit { @Input() title?: string; @Input() property?: IManagedObject; - @Input() index?:number; + @Input() index?: number; @Output() savePropertyConfiguration = new EventEmitter(); @Output() cancelPropertyConfiguration = new EventEmitter(); tempProperty: IManagedObject; constructor(private bsModal: BsModalRef) {} + ngOnInit(): void { this.tempProperty = cloneDeep(this.property); } onSaveButtonClicked(): void { this.property = this.tempProperty; - this.savePropertyConfiguration.emit({property:this.property,index:this.index}); + this.savePropertyConfiguration.emit({ property: this.property, index: this.index }); this.bsModal.hide(); } @@ -32,7 +32,10 @@ export class ComputedPropertyConfigComponent implements OnInit { this.cancelPropertyConfiguration.emit(this.index); this.bsModal.hide(); } + isSaveButtonDisabled(): boolean { - return this.tempProperty.name === 'lastMeasurement' ? !this.tempProperty.config?.isValid : !this.tempProperty.config?.type; + return this.tempProperty.name === 'lastMeasurement' + ? !this.tempProperty.config?.isValid + : !this.tempProperty.config?.type; } } diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts index 395644f..9075fe9 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts @@ -11,7 +11,6 @@ describe('AssetPropertiesViewComponent', () => { let asset: any; let customPropertyObjects: any; let configCustomPropertyObjects: any; - let measurementRealtimeMock:any; let assetPropertiesViewServiceMock: any; let datePipeMock: any; let alarmRealtimeServiceMock: any; @@ -20,53 +19,63 @@ describe('AssetPropertiesViewComponent', () => { let constructedComplexProperty: any; let nestedComplexProperty: any; let deviceMO: any; - let operationRealtimeServiceMock: any; beforeEach(() => { inventoryMock = { detail: jest.fn() }; moRealtimeServiceMock = { onUpdate$: jest.fn() }; - assetPropertiesServiceMock = { getCustomProperties:jest.fn() }; - datePipeMock = { transform:jest.fn() }; - assetPropertiesViewServiceMock = { getAlarms:jest.fn(), getEvents:jest.fn(), getMeasurements:jest.fn(), getOperation:jest.fn() }; - alarmRealtimeServiceMock = { onCreate$:jest.fn() }; - eventRealtimeServiceMock = { onCreate$:jest.fn() }; - operationRealtimeServiceMock = { onCreate$:jest.fn() }; - measurementRealtimeMock = { latestValueOfSpecificMeasurement$:jest.fn(),onCreate$:jest.fn() }; + assetPropertiesServiceMock = { getCustomProperties: jest.fn() }; + datePipeMock = { transform: jest.fn() }; + assetPropertiesViewServiceMock = { + getAlarms: jest.fn(), + getEvents: jest.fn(), + getMeasurements: jest.fn(), + getOperation: jest.fn(), + getLastDeviceMessage: jest.fn(), + getLatestMeasurement$: jest.fn(), + dateSet$: of( + new Set([ + '2024-02-06T07:51:27.691Z', + '2024-02-19T06:36:47.043Z', + '2024-02-19T06:36:48.537Z', + '2024-02-12T09:20:01.807Z' + ]) + ) + }; + alarmRealtimeServiceMock = { onCreate$: jest.fn() }; + eventRealtimeServiceMock = { onCreate$: jest.fn() }; jest.useFakeTimers(); component = new AssetPropertiesViewComponent( inventoryMock, moRealtimeServiceMock, assetPropertiesServiceMock, - measurementRealtimeMock, assetPropertiesViewServiceMock, datePipeMock, alarmRealtimeServiceMock, - eventRealtimeServiceMock, - operationRealtimeServiceMock + eventRealtimeServiceMock ); asset = { id: 12, name: 'Test', - c8y_IsAsset:[], + c8y_IsAsset: [], address: { country: 'Germany', city: 'Düsseldorf', street: 'Toulouser Allee', postalCode: 40211, - apartmentNumber: '25', + apartmentNumber: '25' }, fileTest: [ { file: new File([new Blob(['some content'])], 'values.json', { - type: 'application/JSON', - }), - }, + type: 'application/JSON' + }) + } ], nameTest: 'test123', dateTest1: date.toISOString(), - dateTest2: '', + dateTest2: '' } as any as IManagedObject; deviceMO = { id: '674366', @@ -85,7 +94,7 @@ describe('AssetPropertiesViewComponent', () => { c8y_IsDevice: {}, c8y_SupportedOperations: [], c8y_Position: { lng: 5, alt: 5, lat: null }, - c8y_ConfigurationDump:{id:9123856} + c8y_ConfigurationDump: { id: 9123856 } }; configCustomPropertyObjects = [ { @@ -163,7 +172,7 @@ describe('AssetPropertiesViewComponent', () => { } } ]; - complexProperty =[ + complexProperty = [ { active: true, label: 'Active alarms status', @@ -171,25 +180,32 @@ describe('AssetPropertiesViewComponent', () => { isEditable: false, name: 'c8y_ActiveAlarmsStatus', c8y_JsonSchema: { - properties: { c8y_ActiveAlarmsStatus: {key:'c8y_ActiveAlarmsStatus', type: 'object', label: 'Active alarms status',properties: { - critical: { - title: 'Critical', - type: 'number', - }, - major: { - title: 'Major', - type: 'number', - }, - minor: { - title: 'Minor', - type: 'number', - }, - warning: { - title: 'Warning', - type: 'number', + properties: { + c8y_ActiveAlarmsStatus: { + key: 'c8y_ActiveAlarmsStatus', + type: 'object', + label: 'Active alarms status', + properties: { + critical: { + title: 'Critical', + type: 'number' + }, + major: { + title: 'Major', + type: 'number' + }, + minor: { + title: 'Minor', + type: 'number' + }, + warning: { + title: 'Warning', + type: 'number' + } + } } - } } }, - }, + } + } }, { active: true, @@ -201,13 +217,13 @@ describe('AssetPropertiesViewComponent', () => { active: true, keyPath: ['c8y_ActiveAlarmsStatus', 'major'], title: 'Major', - type: 'number', + type: 'number' }, { ctive: false, keyPath: ['c8y_ActiveAlarmsStatus', 'minor'], title: 'Minor', - type: 'number', + type: 'number' } ]; nestedComplexProperty = [ @@ -217,52 +233,59 @@ describe('AssetPropertiesViewComponent', () => { isEditable: true, name: 'c8y_Network', c8y_JsonSchema: { - properties: { c8y_Network: {key:'c8y_Network', type: 'object', label: 'Network',properties : { - c8y_DHCP: { - title: 'DHCP', + properties: { + c8y_Network: { + key: 'c8y_Network', type: 'object', - printFormat: 'hidden', - name: 'c8y_DHCP', + label: 'Network', properties: { - addressRange: { - title: 'Address range', + c8y_DHCP: { + title: 'DHCP', type: 'object', - name: 'addressRange', printFormat: 'hidden', + name: 'c8y_DHCP', properties: { - start: { - title: 'Start', + addressRange: { + title: 'Address range', + type: 'object', + name: 'addressRange', + printFormat: 'hidden', + properties: { + start: { + title: 'Start', + type: 'string' + }, + end: { + title: 'End', + type: 'string' + } + } + }, + dns1: { + title: 'DNS 1', type: 'string' }, - end: { - title: 'End', + dns2: { + title: 'DNS 2', type: 'string' + }, + enabled: { + title: 'Enabled', + type: 'integer' } } }, - dns1: { - title: 'DNS 1', - type: 'string' - }, - dns2: { - title: 'DNS 2', - type: 'string' - }, - enabled: { - title: 'Enabled', - type: 'integer' + c8y_LAN: { + title: 'LAN', + type: 'object', + name: 'c8y_LAN', + printFormat: 'hidden', + properties: {} } } - }, - c8y_LAN: { - title: 'LAN', - type: 'object', - name: 'c8y_LAN', - printFormat: 'hidden', - properties: {} } - }}} - }, + } + } }, { keyPath: ['c8y_Network', 'c8y_DHCP', 'addressRange'], @@ -322,24 +345,29 @@ describe('AssetPropertiesViewComponent', () => { type: 'object', isEditable: false, name: 'c8y_ActiveAlarmsStatus', - c8y_JsonSchema: { properties: { - c8y_ActiveAlarmsStatus: { - key: 'c8y_ActiveAlarmsStatus', - type: 'object', - label: 'Active alarms status', - properties: { critical: { - active: true, - keyPath: [ 'c8y_ActiveAlarmsStatus', 'critical' ], - title: 'Critical', - type: 'number' - }, major: { - active: true, - keyPath: [ 'c8y_ActiveAlarmsStatus', 'major' ], - title: 'Major', - type: 'number' - } } + c8y_JsonSchema: { + properties: { + c8y_ActiveAlarmsStatus: { + key: 'c8y_ActiveAlarmsStatus', + type: 'object', + label: 'Active alarms status', + properties: { + critical: { + active: true, + keyPath: ['c8y_ActiveAlarmsStatus', 'critical'], + title: 'Critical', + type: 'number' + }, + major: { + active: true, + keyPath: ['c8y_ActiveAlarmsStatus', 'major'], + title: 'Major', + type: 'number' + } + } + } } - } }, + }, isParentKeySelected: true } ]; @@ -357,7 +385,9 @@ describe('AssetPropertiesViewComponent', () => { it('should get selected asset details and validate selected asset properties', async () => { // given component.config.properties = configCustomPropertyObjects; - jest.spyOn(assetPropertiesServiceMock, 'getCustomProperties').mockReturnValue(customPropertyObjects); + jest + .spyOn(assetPropertiesServiceMock, 'getCustomProperties') + .mockReturnValue(customPropertyObjects); // when await component.ngOnInit(); @@ -373,7 +403,9 @@ describe('AssetPropertiesViewComponent', () => { it('should get selected asset details and construct selected complex properties', async () => { // given component.config.properties = complexProperty; - jest.spyOn(assetPropertiesServiceMock, 'getCustomProperties').mockReturnValue([...customPropertyObjects, complexProperty[0]]); + jest + .spyOn(assetPropertiesServiceMock, 'getCustomProperties') + .mockReturnValue([...customPropertyObjects, complexProperty[0]]); // when await component.ngOnInit(); @@ -398,41 +430,42 @@ describe('AssetPropertiesViewComponent', () => { expect(component.isEmptyWidget).toBe(true); }); }), + it('should get selected device details and construct selected nestedcomplex properties', async () => { + // given + component.config = { device: deviceMO, properties: nestedComplexProperty }; + jest.spyOn(inventoryMock, 'detail').mockReturnValue(Promise.resolve({ data: deviceMO })); + jest.spyOn(moRealtimeServiceMock, 'onUpdate$').mockReturnValue(of(deviceMO)); + jest + .spyOn(assetPropertiesServiceMock, 'getCustomProperties') + .mockReturnValue(nestedComplexProperty); - it('should get selected device details and construct selected nestedcomplex properties', async () => { - // given - component.config = { device: deviceMO,properties: nestedComplexProperty}; - jest - .spyOn(inventoryMock, 'detail') - .mockReturnValue(Promise.resolve({ data: deviceMO })); - jest.spyOn(moRealtimeServiceMock, 'onUpdate$').mockReturnValue(of(deviceMO)); - jest.spyOn(assetPropertiesServiceMock, 'getCustomProperties').mockReturnValue(nestedComplexProperty); - - // when - await component.ngOnInit(); - - // then - jest.runAllTimers(); - await Promise.resolve(); - expect(component.selectedAsset).toEqual(deviceMO); - expect(component.properties[0].isNestedComplexProperty).toBe(true); - expect(component.isEmptyWidget).toBe(false); - }); + // when + await component.ngOnInit(); + + // then + jest.runAllTimers(); + await Promise.resolve(); + expect(component.selectedAsset).toEqual(deviceMO); + expect(component.properties[0].isNestedComplexProperty).toBe(true); + expect(component.isEmptyWidget).toBe(false); + }); describe('Computed Properties test', () => { const computedProperties = [ { c8y_JsonSchema: { - properties: { alarmCountToday: { - label: 'Alarm count today', - type: 'number', - },}, + properties: { + alarmCountToday: { + label: 'Alarm count today', + type: 'number' + } + } }, name: 'alarmCountToday', label: 'Alarm count today', title: 'Alarm type', type: 'string', - config:{id: '8005633676046595', type: 'test' }, + config: { id: '8005633676046595', type: 'test' }, computed: true, isEditable: false, isExistingProperty: true, @@ -440,16 +473,18 @@ describe('AssetPropertiesViewComponent', () => { }, { c8y_JsonSchema: { - properties: { alarmCount3Months: { - label: 'Alarm count 3 months', - type: 'number', - },}, + properties: { + alarmCount3Months: { + label: 'Alarm count 3 months', + type: 'number' + } + } }, name: 'alarmCount3Months', label: 'Alarm count 3 months', title: 'Alarm type', type: 'string', - config:{id: '8005633676046596', type: 'test'}, + config: { id: '8005633676046596', type: 'test' }, computed: true, isEditable: false, isExistingProperty: true, @@ -457,16 +492,18 @@ describe('AssetPropertiesViewComponent', () => { }, { c8y_JsonSchema: { - properties: { eventCountToday: { - label: 'Event count today', - type: 'number', - },}, + properties: { + eventCountToday: { + label: 'Event count today', + type: 'number' + } + } }, name: 'eventCountToday', label: 'Event count today', title: 'Event type', type: 'string', - config:{id: '8005633676046597', type: 'test'}, + config: { id: '8005633676046597', type: 'test' }, computed: true, isEditable: false, isExistingProperty: true, @@ -474,44 +511,54 @@ describe('AssetPropertiesViewComponent', () => { }, { c8y_JsonSchema: { - properties: { eventCount3Months: { - label: 'Event count 3 months', - type: 'number', - },}, + properties: { + eventCount3Months: { + label: 'Event count 3 months', + type: 'number' + } + } }, name: 'eventCount3Months', label: 'Event count 3 months', title: 'Event type', type: 'string', - config:{id: '8005633676046598', type: 'test'}, + config: { id: '8005633676046598', type: 'test' }, computed: true, isEditable: false, isExistingProperty: true, active: true }, { - c8y_JsonSchema: {properties: { lastMeasurement: { - label: 'Last measurement', - type: 'string', - },},}, + c8y_JsonSchema: { + properties: { + lastMeasurement: { + label: 'Last measurement', + type: 'string' + } + } + }, name: 'lastMeasurement', label: 'Last measurement', type: 'string', - config:{dp:[{ - color: '#b3460c', - fragment: 'c8y_Demo1', - label: 'c8y_Demo1 → ZZZZ1', - series: 'ZZZZ1', - unit: 'mole', - __active: true, - __target: { - id: 674366, - name: 'Ar-alarm-test #1' - } - }], - id: '16137034983190457', - isValid: true, - resultTypes: 1}, + config: { + dp: [ + { + color: '#b3460c', + fragment: 'c8y_Demo1', + label: 'c8y_Demo1 → ZZZZ1', + series: 'ZZZZ1', + unit: 'mole', + __active: true, + __target: { + id: 674366, + name: 'Ar-alarm-test #1' + } + } + ], + id: '16137034983190457', + isValid: true, + resultTypes: 1 + }, computed: true, isEditable: false, isExistingProperty: true, @@ -519,10 +566,12 @@ describe('AssetPropertiesViewComponent', () => { }, { c8y_JsonSchema: { - properties: { lastDeviceMessage: { - label: 'Last device message', - type: 'string', - },}, + properties: { + lastDeviceMessage: { + label: 'Last device message', + type: 'string' + } + } }, name: 'lastDeviceMessage', label: 'Last device message', @@ -535,10 +584,12 @@ describe('AssetPropertiesViewComponent', () => { }, { c8y_JsonSchema: { - properties: { configurationSnapshot: { - label: 'Configuration snapshot', - type: 'string', - },}, + properties: { + configurationSnapshot: { + label: 'Configuration snapshot', + type: 'string' + } + } }, name: 'configurationSnapshot', label: 'Configuration snapshot', @@ -549,7 +600,7 @@ describe('AssetPropertiesViewComponent', () => { active: true } ]; - const alarmObject =[ + const alarmObject = [ { count: '2349', creationTime: '2024-02-01T05:39:26.300Z', @@ -581,10 +632,10 @@ describe('AssetPropertiesViewComponent', () => { jest.spyOn(datePipeMock, 'transform').mockReturnValue(date); }); - it('should retrieve the values for the computed properties alarmCountToday and alarmCount3Months, then update them in the computedPropertyObject.',async ()=>{ + it('should retrieve the values for the computed properties alarmCountToday and alarmCount3Months, then update them in the computedPropertyObject.', async () => { // given const alarmComputedProperties = [...computedProperties.slice(0, 2)]; - component.config = { device: asset, properties: alarmComputedProperties}; + component.config = { device: asset, properties: alarmComputedProperties }; jest.spyOn(assetPropertiesViewServiceMock, 'getAlarms').mockReturnValue(alarmObject); jest.spyOn(alarmRealtimeServiceMock, 'onCreate$').mockReturnValue(of(alarmObject[0])); @@ -596,14 +647,17 @@ describe('AssetPropertiesViewComponent', () => { await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); await Promise.resolve(); - expect(component.computedPropertyObject).toEqual({ alarmCountToday_8005633676046595: 1 ,alarmCount3Months_8005633676046596: 1}); + expect(component.computedPropertyObject).toEqual({ + alarmCountToday_8005633676046595: 1, + alarmCount3Months_8005633676046596: 1 + }); expect(component.isEmptyWidget).toBe(false); }); - it('should retrieve the values for the computed properties eventCountToday and eventCount3Months, then update them in the computedPropertyObject.',async ()=>{ + it('should retrieve the values for the computed properties eventCountToday and eventCount3Months, then update them in the computedPropertyObject.', async () => { // given const eventComputedProperties = [...computedProperties.slice(2, 4)]; - component.config = { device: asset, properties: eventComputedProperties}; + component.config = { device: asset, properties: eventComputedProperties }; jest.spyOn(assetPropertiesViewServiceMock, 'getEvents').mockReturnValue(alarmObject); jest.spyOn(eventRealtimeServiceMock, 'onCreate$').mockReturnValue(of(alarmObject[0])); @@ -615,11 +669,14 @@ describe('AssetPropertiesViewComponent', () => { await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); await Promise.resolve(); - expect(component.computedPropertyObject).toEqual({ eventCount3Months_8005633676046598: 1 ,eventCountToday_8005633676046597: 1}); + expect(component.computedPropertyObject).toEqual({ + eventCount3Months_8005633676046598: 2, + eventCountToday_8005633676046597: 2 + }); expect(component.isEmptyWidget).toBe(false); }); - it('should retrieve the values for the computed properties lastMeasurement and update it to the computedPropertyObject.',async ()=>{ + it('should retrieve the values for the computed properties lastMeasurement and update it to the computedPropertyObject.', async () => { // given const measurementValue = { date: '2024-02-17T17:03:14.000+02:00', @@ -628,8 +685,10 @@ describe('AssetPropertiesViewComponent', () => { value: 30 }; const eventComputedProperties = [...computedProperties.slice(4, 5)]; - component.config = { device: asset, properties: eventComputedProperties}; - jest.spyOn(component, 'getLatestMeasurement$').mockReturnValue(of(measurementValue)); + component.config = { device: asset, properties: eventComputedProperties }; + jest + .spyOn(assetPropertiesViewServiceMock, 'getLatestMeasurement$') + .mockReturnValue(of(measurementValue)); // when await component.ngOnInit(); @@ -639,23 +698,20 @@ describe('AssetPropertiesViewComponent', () => { await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); await Promise.resolve(); - expect(component.computedPropertyObject).toEqual({lastMeasurement_16137034983190457:measurementValue}); + expect(component.computedPropertyObject).toEqual({ + lastMeasurement_16137034983190457: measurementValue + }); expect(component.isEmptyWidget).toBe(false); }); - it('should retrieve the values for the computed properties Last device message and update it to the computedPropertyObject.',async ()=>{ + it('should retrieve the values for the computed properties Last device message and update it to the computedPropertyObject.', async () => { // given const eventComputedProperties = [...computedProperties.slice(5, 6)]; - component.config = { device: asset, properties: eventComputedProperties}; - const spyOnAlarms = jest.spyOn(assetPropertiesViewServiceMock, 'getAlarms').mockReturnValue(alarmObject); - jest.spyOn(alarmRealtimeServiceMock, 'onCreate$').mockReturnValue(of(alarmObject[0])); - const spyOnEvents = jest.spyOn(assetPropertiesViewServiceMock, 'getEvents').mockReturnValue(alarmObject); - jest.spyOn(eventRealtimeServiceMock, 'onCreate$').mockReturnValue(of(alarmObject[0])); - const spyOnMeasurements = jest.spyOn(assetPropertiesViewServiceMock, 'getMeasurements').mockReturnValue(alarmObject); - jest.spyOn(measurementRealtimeMock, 'onCreate$').mockReturnValue(of(alarmObject[0])); - const spyOnOperation = jest.spyOn(assetPropertiesViewServiceMock, 'getOperation').mockReturnValue(alarmObject); - jest.spyOn(operationRealtimeServiceMock, 'onCreate$').mockReturnValue(of(alarmObject[0])); - + component.config = { device: asset, properties: eventComputedProperties }; + const spyOnGetLastDeviceMessage = jest + .spyOn(assetPropertiesViewServiceMock, 'getLastDeviceMessage') + .mockReturnValue(alarmObject); + jest.spyOn(datePipeMock, 'transform').mockReturnValue('2024-02-19T06:36:48.537Z'); // when await component.ngOnInit(); @@ -664,15 +720,14 @@ describe('AssetPropertiesViewComponent', () => { jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); - await Promise.all([spyOnAlarms, spyOnEvents, spyOnMeasurements, spyOnOperation]); - expect(spyOnAlarms).toBeCalledTimes(1); - expect(spyOnEvents).toBeCalledTimes(1); - expect(spyOnMeasurements).toBeCalledTimes(1); - expect(spyOnOperation).toBeCalledTimes(1); + expect(spyOnGetLastDeviceMessage).toBeCalledTimes(1); + expect(component.computedPropertyObject).toEqual({ + lastDeviceMessage: '2024-02-19T06:36:48.537Z' + }); expect(component.isEmptyWidget).toBe(false); }); - it('should retrieve the values for the computed properties Configuration snapshot and update it to the computedPropertyObject.',async ()=>{ + it('should retrieve the values for the computed properties Configuration snapshot and update it to the computedPropertyObject.', async () => { // given const measurementValue = { date: '2024-02-17T17:03:14.000+02:00', @@ -681,10 +736,12 @@ describe('AssetPropertiesViewComponent', () => { value: 30 }; const eventComputedProperties = [...computedProperties.slice(6, 7)]; - component.config = { device: deviceMO, properties: eventComputedProperties}; + component.config = { device: deviceMO, properties: eventComputedProperties }; jest.spyOn(inventoryMock, 'detail').mockReturnValue(Promise.resolve({ data: deviceMO })); jest.spyOn(moRealtimeServiceMock, 'onUpdate$').mockReturnValue(of(deviceMO)); - jest.spyOn(component, 'getLatestMeasurement$').mockReturnValue(of(measurementValue)); + jest + .spyOn(assetPropertiesViewServiceMock, 'getLatestMeasurement$') + .mockReturnValue(of(measurementValue)); // when await component.ngOnInit(); @@ -694,7 +751,9 @@ describe('AssetPropertiesViewComponent', () => { await Promise.resolve(); expect(component.selectedAsset).toEqual(deviceMO); await Promise.resolve(); - expect(component.computedPropertyObject).toEqual({configurationSnapshot: 'Ar-alarm-test #1'}); + expect(component.computedPropertyObject).toEqual({ + configurationSnapshot: 'Ar-alarm-test #1' + }); expect(component.isEmptyWidget).toBe(false); }); }); diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index dda1d29..4e4e54e 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -1,21 +1,17 @@ import { Component, OnInit, Input } from '@angular/core'; -import { IAlarm, IEvent, IManagedObject, IMeasurement, IOperation, InventoryService } from '@c8y/client'; -import { AlarmRealtimeService, EventRealtimeService, ManagedObjectRealtimeService, MeasurementRealtimeService, OperationRealtimeService } from '@c8y/ngx-components'; +import { IAlarm, IEvent, IManagedObject, InventoryService } from '@c8y/client'; +import { + AlarmRealtimeService, + DatePipe, + EventRealtimeService, + ManagedObjectRealtimeService, + MeasurementRealtimeService +} from '@c8y/ngx-components'; import { AssetPropertiesService } from '../asset-properties-config/asset-properties.service'; import { some, cloneDeep, isEmpty } from 'lodash-es'; -import { KPIDetails } from '@c8y/ngx-components/datapoint-selector'; -import { Observable } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; import { AssetPropertiesViewService } from './asset-properties-view.service'; -import { DatePipe } from '@angular/common'; import { devicePropertiesBaseObject } from '../../common/asset-property-constant'; -interface MeasurementValue { - unit?: string; - value: number; - date: string; - id: string; -} interface ComputedPropertyObject { [key: string]: any; } @@ -23,7 +19,7 @@ interface ComputedPropertyObject { @Component({ selector: 'c8y-asset-properties-view', templateUrl: './asset-properties-view.component.html', - providers: [ManagedObjectRealtimeService, MeasurementRealtimeService], + providers: [ManagedObjectRealtimeService, MeasurementRealtimeService] }) export class AssetPropertiesViewComponent implements OnInit { selected = { id: 'asset-properties-widget' }; @@ -34,74 +30,106 @@ export class AssetPropertiesViewComponent implements OnInit { @Input() config: any; computedPropertyObject: ComputedPropertyObject; isLoading = true; - DEFAULT_FROM_DATE:string = '1970-01-01'; constructor( protected inventoryService: InventoryService, protected moRealtimeService: ManagedObjectRealtimeService, private assetPropertiesService: AssetPropertiesService, - private measurementRealtime: MeasurementRealtimeService, private assetPropertiesViewService: AssetPropertiesViewService, private datePipe: DatePipe, private alarmRealtimeService: AlarmRealtimeService, - private eventRealtimeService: EventRealtimeService, - private operationRealtimeService: OperationRealtimeService + private eventRealtimeService: EventRealtimeService ) {} async ngOnInit(): Promise { if (this.config.device) { try { - this.selectedAsset = ( - await this.inventoryService.detail(this.config.device.id) - ).data; + this.selectedAsset = (await this.inventoryService.detail(this.config.device.id)).data; setTimeout(async () => { // eslint-disable-next-line no-prototype-builtins - if(this.selectedAsset.hasOwnProperty('c8y_IsAsset')){ - this.customProperties = - await this.assetPropertiesService.getCustomProperties( + if (this.selectedAsset.hasOwnProperty('c8y_IsAsset')) { + this.customProperties = await this.assetPropertiesService.getCustomProperties( this.selectedAsset ); - this.properties = this.config.properties.filter((property) => { + this.properties = this.config.properties.filter(property => { if ( property.isExistingProperty || - ((this.customProperties.length != 0 && - this.customProperties.find((prop) => prop.id === property.id)) || this.validateComplexProperty(property)) + (this.customProperties.length != 0 && + this.customProperties.find(prop => prop.id === property.id)) || + this.validateComplexProperty(property) ) { return property; } }); - this.config.properties = cloneDeep(this.properties); - }else{ + this.config.properties = cloneDeep(this.properties); + } else { this.properties = cloneDeep(this.config.properties); this.customProperties = cloneDeep(devicePropertiesBaseObject); } this.constructComplexPropertyKeys(); - this.config.properties.forEach(property =>{ - if(property.computed && property.active){ - switch (property.name) { - case 'alarmCountToday': - this.getAlarmCount(this.config.device, property,this.datePipe.transform(new Date(), 'yyyy-MM-dd')); - break; - case 'alarmCount3Months': - this.getAlarmCount(this.config.device, property, this.datePipe.transform(new Date().setMonth(new Date().getMonth() - 3), 'yyyy-MM-dd')); - break; - case 'eventCountToday': - this.getEventCount(this.config.device, property,this.datePipe.transform(new Date(), 'yyyy-MM-dd')); - break; - case 'eventCount3Months': - this.getEventCount(this.config.device, property, this.datePipe.transform(new Date().setMonth(new Date().getMonth() - 3), 'yyyy-MM-dd')); - break; - case 'lastMeasurement': - this.getLastMeasurement(property); - break; - case 'lastDeviceMessage': - if(!this.selectedAsset.c8y_Availability || !this.selectedAsset.c8y_Availability.lastMessage){ - this.getLastDeviceMessage(this.config.device); - } - break; - case 'configurationSnapshot': - this.getConfigurationSnapshot(this.selectedAsset); - break; + this.config.properties.forEach(property => { + if (property.computed && property.active) { + switch (property.name) { + case 'alarmCountToday': + this.getAlarmCount( + this.config.device, + property, + this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ); + break; + case 'alarmCount3Months': + this.getAlarmCount( + this.config.device, + property, + this.datePipe.transform( + new Date().setMonth(new Date().getMonth() - 3), + 'yyyy-MM-dd' + ) + ); + break; + case 'eventCountToday': + this.getEventCount( + this.config.device, + property, + this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ); + break; + case 'eventCount3Months': + this.getEventCount( + this.config.device, + property, + this.datePipe.transform( + new Date().setMonth(new Date().getMonth() - 3), + 'yyyy-MM-dd' + ) + ); + break; + case 'lastMeasurement': + this.getLastMeasurement(property); + break; + case 'lastDeviceMessage': + if ( + !this.selectedAsset.c8y_Availability || + !this.selectedAsset.c8y_Availability.lastMessage + ) { + this.assetPropertiesViewService.getLastDeviceMessage(this.config.device); + this.assetPropertiesViewService.dateSet$.subscribe((dateSet: Set) => { + const maxDate = this.datePipe.transform( + Math.max( + ...Array.from(dateSet).map(dateString => new Date(dateString).getTime()) + ), + 'yyyy-MM-ddThh:mm:ssZZZZZ' + ); + this.computedPropertyObject = { + ...this.computedPropertyObject, + ...{ ['lastDeviceMessage']: maxDate } + }; + }); + } + break; + case 'configurationSnapshot': + this.getConfigurationSnapshot(this.selectedAsset); + break; default: break; } @@ -116,152 +144,146 @@ export class AssetPropertiesViewComponent implements OnInit { } else this.isEmptyWidget = true; } - async getAlarmCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ - const filters = { - dateFrom: dateFrom, - dateTo: this.datePipe.transform(new Date().setDate(new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), - source: device.id, - pageSize: 2000, - type: property.config.type, - }; - const alarms = (await this.assetPropertiesViewService.getAlarms(filters)); - this.alarmRealtimeService.onCreate$(this.selectedAsset.id) - .subscribe((alarm: IAlarm) => { - if(alarm.type === property.config.type){ - this.computedPropertyObject = {...this.computedPropertyObject, ...{[`${property.name}_${property.config.id}`]: ++ this.computedPropertyObject[`${property.name}_${property.config.id}`]}}; - } - }); - this.computedPropertyObject = {...this.computedPropertyObject, ...{[`${property.name}_${property.config.id}`]: alarms.length}}; - } - - async getEventCount(device:IManagedObject, property:IManagedObject, dateFrom:string){ + async getAlarmCount(device: IManagedObject, property: IManagedObject, dateFrom: string) { const filters = { dateFrom: dateFrom, - dateTo: this.datePipe.transform(new Date().setDate(new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + dateTo: this.datePipe.transform( + new Date().setDate(new Date().getDate() + 1), + 'yyyy-MM-ddThh:mm:ssZZZZZ' + ), source: device.id, pageSize: 2000, - type: property.config.type, + type: property.config.type }; - const events = (await this.assetPropertiesViewService.getEvents(filters)); - this.eventRealtimeService.onCreate$(this.selectedAsset.id) - .subscribe((event: IEvent ) => { - if(event.type === property.config.type){ - this.computedPropertyObject = {...this.computedPropertyObject, ...{[`${property.name}_${property.config.id}`]: ++ this.computedPropertyObject[`${property.name}_${property.config.id}`]}}; - } - }); - this.computedPropertyObject = {...this.computedPropertyObject, ...{[`${property.name}_${property.config.id}`]: events.length}}; - } - - getLastMeasurement(property){ - // eslint-disable-next-line no-underscore-dangle - let datapoint = property.config.dp.find((dp) =>dp.__active); - datapoint = {...datapoint, ...{uniqId:property.config.id}}; - this.getLatestMeasurement$(datapoint).subscribe( - (lastMeasurement) => { - this.computedPropertyObject = {...this.computedPropertyObject, ...{[`lastMeasurement_${lastMeasurement.id}`]: lastMeasurement}}; + const alarms = await this.assetPropertiesViewService.getAlarms(filters); + this.alarmRealtimeService.onCreate$(this.selectedAsset.id).subscribe((alarm: IAlarm) => { + if (alarm.type === property.config.type) { + this.computedPropertyObject = { + ...this.computedPropertyObject, + ...{ + [`${property.name}_${property.config.id}`]: ++this.computedPropertyObject[ + `${property.name}_${property.config.id}` + ] + } + }; } - ); + }); + this.computedPropertyObject = { + ...this.computedPropertyObject, + ...{ [`${property.name}_${property.config.id}`]: alarms.length } + }; } - async getLastDeviceMessage(device: IManagedObject) { + async getEventCount(device: IManagedObject, property: IManagedObject, dateFrom: string) { const filters = { - dateFrom: this.DEFAULT_FROM_DATE, - dateTo: this.datePipe.transform(new Date().setDate(new Date().getDate() + 1), 'yyyy-MM-ddThh:mm:ssZZZZZ'), + dateFrom: dateFrom, + dateTo: this.datePipe.transform( + new Date().setDate(new Date().getDate() + 1), + 'yyyy-MM-ddThh:mm:ssZZZZZ' + ), source: device.id, pageSize: 2000, + type: property.config.type }; - const [alarms, events, measurements, operations] = await Promise.all([ - this.assetPropertiesViewService.getAlarms(filters), - this.assetPropertiesViewService.getEvents(filters), - this.assetPropertiesViewService.getMeasurements(filters), - this.assetPropertiesViewService.getOperation(filters) - ]); - - const dateSet = new Set(); - - const updateDateSet = (items: any[], timestampProp: string) => { - items.forEach(item => { - dateSet.add(item[timestampProp]); - }); - }; - - updateDateSet(alarms, 'creationTime'); - updateDateSet(events, 'creationTime'); - updateDateSet(measurements, 'time'); - updateDateSet(operations, 'creationTime'); - - this.updateTimeStamp(dateSet); - - const handleRealtimeUpdate = (item: any, timestampProp: string) => { - dateSet.add(item[timestampProp]); - this.updateTimeStamp(dateSet); + const events = await this.assetPropertiesViewService.getEvents(filters); + this.computedPropertyObject = { + ...this.computedPropertyObject, + ...{ [`${property.name}_${property.config.id}`]: events.length } }; - - this.alarmRealtimeService.onCreate$(device.id).subscribe((alarm: IAlarm) => { - handleRealtimeUpdate(alarm, 'creationTime'); - }); - - this.eventRealtimeService.onCreate$(device.id).subscribe((event: IEvent) => { - handleRealtimeUpdate(event, 'creationTime'); - }); - - this.measurementRealtime.onCreate$(device.id).subscribe((measurement: IMeasurement) => { - handleRealtimeUpdate(measurement, 'time'); - }); - - this.operationRealtimeService.onCreate$(device.id).subscribe((operation: IOperation) => { - handleRealtimeUpdate(operation, 'creationTime'); + this.eventRealtimeService.onCreate$(this.selectedAsset.id).subscribe((event: IEvent) => { + if (event.type === property.config.type) { + this.computedPropertyObject = { + ...this.computedPropertyObject, + ...{ + [`${property.name}_${property.config.id}`]: ++this.computedPropertyObject[ + `${property.name}_${property.config.id}` + ] + } + }; + } }); } - updateTimeStamp(dateSet: Set) { - // Get the maximum date - const maxDate = this.datePipe.transform(new Date(Math.max(...Array.from(dateSet).map(dateString => new Date(dateString).getTime()))), 'yyyy-MM-ddThh:mm:ssZZZZZ'); - this.computedPropertyObject = { ...this.computedPropertyObject, ...{ ['lastDeviceMessage']: maxDate } }; + getLastMeasurement(property) { + // eslint-disable-next-line no-underscore-dangle + let datapoint = property.config.dp.find(dp => dp.__active); + datapoint = { ...datapoint, ...{ uniqId: property.config.id } }; + this.assetPropertiesViewService.getLatestMeasurement$(datapoint).subscribe(lastMeasurement => { + this.computedPropertyObject = { + ...this.computedPropertyObject, + ...{ [`lastMeasurement_${lastMeasurement.id}`]: lastMeasurement } + }; + }); } - async getConfigurationSnapshot(device){ + async getConfigurationSnapshot(device) { const configId = (device.c8y_ConfigurationDump || {}).id; if (!configId) return; try { const { data: configuration } = await this.inventoryService.detail(configId); - this.computedPropertyObject = { ...this.computedPropertyObject, ...{ ['configurationSnapshot']: configuration?.name } }; + this.computedPropertyObject = { + ...this.computedPropertyObject, + ...{ ['configurationSnapshot']: configuration?.name } + }; } catch (ex) { // do nothing } } - parseNestedComplexPropertyItem(property, item){ - Object.keys(property.properties).forEach((key)=>{ + parseNestedComplexPropertyItem(property, item) { + Object.keys(property.properties).forEach(key => { const object = property.properties[key]; - if(!isEmpty(object.properties) && Object.prototype.hasOwnProperty.call(object, 'properties')){ + if ( + !isEmpty(object.properties) && + Object.prototype.hasOwnProperty.call(object, 'properties') + ) { this.parseNestedComplexPropertyItem(object, item); - }else if(property.properties[key].title === item.title && (property.name === item.keyPath?.[item.keyPath.length-2] || property.properties[key].name === item.keyPath?.[item.keyPath.length-2])){ - property.properties[key] = item; + } else if ( + property.properties[key].title === item.title && + (property.name === item.keyPath?.[item.keyPath.length - 2] || + property.properties[key].name === item.keyPath?.[item.keyPath.length - 2]) + ) { + property.properties[key] = item; } }); } - constructComplexPropertyKeys(){ - const customizedProperty =[]; + + constructComplexPropertyKeys() { + const customizedProperty = []; this.properties.forEach(element => { - if(element.keyPath && element.active){ - const property = this.properties.find((prop) => prop.name === element.keyPath?.[0]) || this.customProperties.find((prop) => prop.name === element.keyPath?.[0]); - if(property && !property.c8y_JsonSchema.properties[property.name].properties[element.keyPath?.[1]]?.hasOwnProperty('properties')){ - if(!property.isParentKeySelected){ + if (element.keyPath && element.active) { + const property = + this.properties.find(prop => prop.name === element.keyPath?.[0]) || + this.customProperties.find(prop => prop.name === element.keyPath?.[0]); + if ( + property && + !property.c8y_JsonSchema.properties[property.name].properties[ + element.keyPath?.[1] + ]?.hasOwnProperty('properties') + ) { + if (!property.isParentKeySelected) { property.isParentKeySelected = true; property.active = true; property.c8y_JsonSchema.properties[property.name].properties = {}; } - property.c8y_JsonSchema.properties[property.name].properties[element.keyPath?.[1]] = {...element}; - }else{ + property.c8y_JsonSchema.properties[property.name].properties[element.keyPath?.[1]] = { + ...element + }; + } else { property.active = true; property.isNestedComplexProperty = true; - this.parseNestedComplexPropertyItem(property.c8y_JsonSchema.properties[property.name], element); + this.parseNestedComplexPropertyItem( + property.c8y_JsonSchema.properties[property.name], + element + ); } - if(!customizedProperty.find((prop) => prop.name === property.name)){ + if (!customizedProperty.find(prop => prop.name === property.name)) { customizedProperty.push(property); } - }else if (element.active && (!customizedProperty.find((prop) => prop.name === element.name) || element.computed)){ + } else if ( + element.active && + (!customizedProperty.find(prop => prop.name === element.name) || element.computed) + ) { customizedProperty.push(element); } }); @@ -269,64 +291,48 @@ export class AssetPropertiesViewComponent implements OnInit { this.properties = customizedProperty; } - constructNestedComplexProperty(customizedProperty){ + constructNestedComplexProperty(customizedProperty) { customizedProperty.forEach(element => { - if(element.active && element.isNestedComplexProperty){ + if (element.active && element.isNestedComplexProperty) { this.refineNestedComplexProperty(element.c8y_JsonSchema.properties[element.name]); } }); } - refineNestedComplexProperty(property, parentReferance?){ - Object.keys(property.properties).forEach((key)=>{ + + refineNestedComplexProperty(property, parentReferance?) { + Object.keys(property.properties).forEach(key => { const object = property.properties[key]; - if(!isEmpty(object.properties)&& (some(object.properties, 'active') || some(object.properties, 'properties')) && !object.active){ - this.refineNestedComplexProperty(object,property); - }else if(!object.active){ + if ( + !isEmpty(object.properties) && + (some(object.properties, 'active') || some(object.properties, 'properties')) && + !object.active + ) { + this.refineNestedComplexProperty(object, property); + } else if (!object.active) { delete property.properties[key]; - if(isEmpty(property.properties)){ + if (isEmpty(property.properties)) { delete parentReferance.properties[property.name]; } } }); } - validateComplexProperty(item): boolean{ - if(item.keyPath){ - const property = this.customProperties.find((prop) => prop.name === item.keyPath?.[0]); - return some(Object.keys(property.c8y_JsonSchema.properties[property.name].properties), function(key) { - return (key === item.keyPath?.[1]); - }); + validateComplexProperty(item): boolean { + if (item.keyPath) { + const property = this.customProperties.find(prop => prop.name === item.keyPath?.[0]); + return some( + Object.keys(property.c8y_JsonSchema.properties[property.name].properties), + function (key) { + return key === item.keyPath?.[1]; + } + ); } return false; } private handleRealtime() { - this.moRealtimeService - .onUpdate$(this.selectedAsset.id) - .subscribe((asset: IManagedObject) => { - this.selectedAsset = asset; - }); - } - - getLatestMeasurement$(datapoint: KPIDetails): Observable { - return this.measurementRealtime - .latestValueOfSpecificMeasurement$( - datapoint.fragment, - datapoint.series, - datapoint.__target.id, - // we only need the last two values in case we want to show a trend - 1 - ) - .pipe( - filter(measurement => !!measurement), - map(measurement => { - return { - unit: measurement[datapoint.fragment][datapoint.series].unit, - value: measurement[datapoint.fragment][datapoint.series].value, - date: measurement.time as string, - id: datapoint.uniqId - }; - }) - ); + this.moRealtimeService.onUpdate$(this.selectedAsset.id).subscribe((asset: IManagedObject) => { + this.selectedAsset = asset; + }); } -} \ No newline at end of file +} diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.spec.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.spec.ts index fa4362d..046ce12 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.spec.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.spec.ts @@ -1,4 +1,5 @@ import { AssetPropertiesViewService } from './asset-properties-view.service'; +import { of } from 'rxjs'; describe('AssetPropertiesViewService', () => { let service: AssetPropertiesViewService; @@ -6,6 +7,11 @@ describe('AssetPropertiesViewService', () => { let c8yEventsMock: any; let c8yMeasurementsMock: any; let c8yOperationMock: any; + let datePipeMock: any; + let alarmRealtimeServiceMock: any; + let eventRealtimeServiceMock: any; + let operationRealtimeServiceMock: any; + let measurementRealtimeMock: any; const filters = { dateFrom: '2023-11-25', dateTo: '2024-02-25T03:02:06+05:30', @@ -34,7 +40,26 @@ describe('AssetPropertiesViewService', () => { c8yEventsMock = { list: jest.fn() }; c8yMeasurementsMock = { list: jest.fn() }; c8yOperationMock = { list: jest.fn() }; - service = new AssetPropertiesViewService(c8yAlarmsMock, c8yEventsMock, c8yMeasurementsMock, c8yOperationMock); + + datePipeMock = { transform: jest.fn() }; + alarmRealtimeServiceMock = { onCreate$: jest.fn() }; + eventRealtimeServiceMock = { onCreate$: jest.fn() }; + operationRealtimeServiceMock = { onCreate$: jest.fn() }; + measurementRealtimeMock = { + latestValueOfSpecificMeasurement$: jest.fn(), + onCreate$: jest.fn() + }; + service = new AssetPropertiesViewService( + c8yAlarmsMock, + c8yEventsMock, + c8yMeasurementsMock, + c8yOperationMock, + measurementRealtimeMock, + alarmRealtimeServiceMock, + eventRealtimeServiceMock, + operationRealtimeServiceMock, + datePipeMock + ); }); it('should exist', () => { @@ -69,7 +94,9 @@ describe('AssetPropertiesViewService', () => { it('should retrieve the Measurements with status 200', async () => { // given - const spyOnList = jest.spyOn(c8yMeasurementsMock, 'list').mockReturnValue(Promise.resolve(response)); + const spyOnList = jest + .spyOn(c8yMeasurementsMock, 'list') + .mockReturnValue(Promise.resolve(response)); // when const obj = await service.getMeasurements(filters); @@ -82,7 +109,9 @@ describe('AssetPropertiesViewService', () => { it('should retrieve the Operations with status 200', async () => { // given - const spyOnList = jest.spyOn(c8yOperationMock, 'list').mockReturnValue(Promise.resolve(response)); + const spyOnList = jest + .spyOn(c8yOperationMock, 'list') + .mockReturnValue(Promise.resolve(response)); // when const obj = await service.getOperation(filters); @@ -92,4 +121,70 @@ describe('AssetPropertiesViewService', () => { expect(obj.length).toBe(1); expect(spyOnList).toHaveBeenCalledWith(filters); }); + + it('should retrieve the values for the computed properties Last device message and update the time stamp it to the dateSet variable.', async () => { + // given + jest.spyOn(datePipeMock, 'transform').mockReturnValue(new Date()); + const spyOnC8yAlarmsMock = jest + .spyOn(c8yAlarmsMock, 'list') + .mockReturnValue(Promise.resolve(response)); + jest.spyOn(alarmRealtimeServiceMock, 'onCreate$').mockReturnValue(of(response)); + const spyOnC8yEventsMock = jest + .spyOn(c8yEventsMock, 'list') + .mockReturnValue(Promise.resolve(response)); + jest.spyOn(eventRealtimeServiceMock, 'onCreate$').mockReturnValue(of(response)); + const spyOnC8yMeasurementsMock = jest + .spyOn(c8yMeasurementsMock, 'list') + .mockReturnValue(Promise.resolve(response)); + jest.spyOn(measurementRealtimeMock, 'onCreate$').mockReturnValue(of(response)); + const spyOnC8yOperationMock = jest + .spyOn(c8yOperationMock, 'list') + .mockReturnValue(Promise.resolve(response)); + jest.spyOn(operationRealtimeServiceMock, 'onCreate$').mockReturnValue(of(response)); + const spyOnNext = jest.spyOn((service as any).variableSubject, 'next'); + + // when + await service.getLastDeviceMessage({ + device: { id: 1254 }, + creationTime: '', + id: '' + } as any); + + // then + expect(spyOnC8yAlarmsMock).toBeCalledTimes(1); + expect(spyOnC8yEventsMock).toBeCalledTimes(1); + expect(spyOnC8yMeasurementsMock).toBeCalledTimes(1); + expect(spyOnC8yOperationMock).toBeCalledTimes(1); + expect(spyOnNext).toHaveBeenCalledTimes(5); + }); + + it('should return latest measurement value', () => { + // given + const datapoint = { + fragment: 'fragment', + series: 'series', + __target: { id: '789546' }, + uniqId: 'uniqId' + }; + const mockedMeasurement = { + fragment: { + series: { unit: 'unit', value: 10 } + }, + time: '2024-03-12T12:00:00Z' + }; + measurementRealtimeMock.latestValueOfSpecificMeasurement$.mockReturnValueOnce( + of(mockedMeasurement) + ); + + // when + service.getLatestMeasurement$(datapoint).subscribe({ + next: measurement => { + // Assert the returned measurement + expect(measurement.unit).toBe('unit'); + expect(measurement.value).toBe(10); + expect(measurement.date).toBe('2024-03-12T12:00:00Z'); + expect(measurement.id).toBe('uniqId'); + } + }); + }); }); diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts index 164066d..f3f022b 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts @@ -1,51 +1,159 @@ import { Injectable } from '@angular/core'; -import { AlarmService, EventService, IManagedObject, MeasurementService, OperationService } from '@c8y/client'; +import { + AlarmService, + EventService, + IAlarm, + IEvent, + IManagedObject, + IMeasurement, + IOperation, + MeasurementService, + OperationService +} from '@c8y/client'; +import { + AlarmRealtimeService, + DatePipe, + EventRealtimeService, + MeasurementRealtimeService, + OperationRealtimeService +} from '@c8y/ngx-components'; +import { KPIDetails } from '@c8y/ngx-components/datapoint-selector'; +import { Observable, Subject } from 'rxjs'; +import { filter, map } from 'rxjs/operators'; -@Injectable({ - providedIn: 'root', -}) +interface MeasurementValue { + unit?: string; + value: number; + date: string; + id: string; +} +@Injectable() export class AssetPropertiesViewService { + DEFAULT_FROM_DATE: string = '1970-01-01'; + private variableSubject = new Subject(); + dateSet$ = this.variableSubject.asObservable(); + constructor( private c8yAlarms: AlarmService, private c8yEvents: EventService, private c8yMeasurements: MeasurementService, - private c8yOperation: OperationService - + private c8yOperation: OperationService, + private measurementRealtime: MeasurementRealtimeService, + private alarmRealtimeService: AlarmRealtimeService, + private eventRealtimeService: EventRealtimeService, + private operationRealtimeService: OperationRealtimeService, + private datePipe: DatePipe ) {} async getAlarms(filters): Promise { let data = []; - await this.c8yAlarms.list(filters) - .then(function (alarms) { - data = alarms.data; - }); + await this.c8yAlarms.list(filters).then(function (alarms) { + data = alarms.data; + }); return data; } async getEvents(filters) { let data = []; - await this.c8yEvents.list(filters) - .then(events => { - data = events.data; - }); + await this.c8yEvents.list(filters).then(events => { + data = events.data; + }); return data; } async getMeasurements(filters) { let data = []; - await this.c8yMeasurements.list(filters) - .then(measurements => { - data = measurements.data; - }); + await this.c8yMeasurements.list(filters).then(measurements => { + data = measurements.data; + }); return data; } async getOperation(filters) { let data = []; - await this.c8yOperation.list(filters) - .then(measurements => { - data = measurements.data; - }); + await this.c8yOperation.list(filters).then(measurements => { + data = measurements.data; + }); return data; } + + async getLastDeviceMessage(device: IManagedObject) { + const filters = { + dateFrom: this.DEFAULT_FROM_DATE, + dateTo: this.datePipe.transform( + new Date().setDate(new Date().getDate() + 1), + 'yyyy-MM-ddThh:mm:ssZZZZZ' + ), + source: device.id, + pageSize: 2000 + }; + const [alarms, events, measurements, operations] = await Promise.all([ + this.getAlarms(filters), + this.getEvents(filters), + this.getMeasurements(filters), + this.getOperation(filters) + ]); + + const dateSet = new Set(); + + const updateDateSet = (items: any[], timestampProp: string) => { + items.forEach(item => { + dateSet.add(item[timestampProp]); + }); + }; + + updateDateSet(alarms, 'creationTime'); + updateDateSet(events, 'creationTime'); + updateDateSet(measurements, 'time'); + updateDateSet(operations, 'creationTime'); + + this.updateTimeStamp(dateSet); + + const handleRealtimeUpdate = (item: any, timestampProp: string) => { + dateSet.add(item[timestampProp]); + this.updateTimeStamp(dateSet); + }; + + this.alarmRealtimeService.onCreate$(device.id).subscribe((alarm: IAlarm) => { + handleRealtimeUpdate(alarm, 'creationTime'); + }); + + this.eventRealtimeService.onCreate$(device.id).subscribe((event: IEvent) => { + handleRealtimeUpdate(event, 'creationTime'); + }); + + this.measurementRealtime.onCreate$(device.id).subscribe((measurement: IMeasurement) => { + handleRealtimeUpdate(measurement, 'time'); + }); + + this.operationRealtimeService.onCreate$(device.id).subscribe((operation: IOperation) => { + handleRealtimeUpdate(operation, 'creationTime'); + }); + } + + updateTimeStamp(dateSet: Set) { + this.variableSubject.next(dateSet); + } + + getLatestMeasurement$(datapoint: KPIDetails): Observable { + return this.measurementRealtime + .latestValueOfSpecificMeasurement$( + datapoint.fragment, + datapoint.series, + datapoint.__target.id, + // we only need the last two values in case we want to show a trend + 1 + ) + .pipe( + filter(measurement => !!measurement), + map(measurement => { + return { + unit: measurement[datapoint.fragment][datapoint.series].unit, + value: measurement[datapoint.fragment][datapoint.series].value, + date: measurement.time as string, + id: datapoint.uniqId + }; + }) + ); + } } diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.spec.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.spec.ts index 8b9e849..7ac9721 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.spec.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.spec.ts @@ -10,8 +10,8 @@ describe('AssetPropertiesComponent', () => { let inventoryMock: any; let assetTypesMock: any; let permissionsServiceMock: any; - let dashboardChildMock:any; - let datePipe:any; + let dashboardChildMock: any; + let datePipe: any; beforeEach(() => { permissionsServiceMock = { canEdit: jest.fn() }; @@ -20,11 +20,11 @@ describe('AssetPropertiesComponent', () => { update: jest.fn(), detail: jest.fn(), childAdditionsRemove: jest.fn(), - childAdditionsAdd: jest.fn(), + childAdditionsAdd: jest.fn() }; alertMock = { success: jest.fn(), addServerFailure: jest.fn() }; inventoryBinaryMock = { create: jest.fn() }; - dashboardChildMock = {changeEnd: jest.fn()}; + dashboardChildMock = { changeEnd: jest.fn() }; component = new AssetPropertiesComponent( assetTypesMock, @@ -63,40 +63,40 @@ describe('AssetPropertiesComponent', () => { minLength: 1, minLengthValidate: true, type: 'string', - title: 'Country', + title: 'Country' }, city: { minLengthValidate: true, type: 'string', - title: 'City', + title: 'City' }, street: { minLength: 1, minLengthValidate: true, type: 'string', - title: 'Street', + title: 'Street' }, postalCode: { requiredMinimum: true, type: 'number', - title: 'Postal Code', + title: 'Postal Code' }, apartmentNumber: { minLength: 1, minLengthValidate: true, type: 'string', - title: 'Apartment Number', - }, - }, - }, + title: 'Apartment Number' + } + } + } }, required: [], - key: 'address', + key: 'address' }, description: '', label: 'Address', c8y_IsAssetProperty: {}, - c8y_Global: {}, + c8y_Global: {} }, { id: 2, @@ -108,15 +108,15 @@ describe('AssetPropertiesComponent', () => { title: 'TestName', properties: { nameTest: { - type: 'string', - }, + type: 'string' + } }, required: [], - key: 'nameTest', + key: 'nameTest' }, description: '', label: 'TestName', - c8y_IsAssetProperty: {}, + c8y_IsAssetProperty: {} }, { id: 3, @@ -129,15 +129,15 @@ describe('AssetPropertiesComponent', () => { properties: { fileTest: { type: 'file', - allowedFileTypes: [''], - }, + allowedFileTypes: [''] + } }, required: [], - key: 'fileTest', + key: 'fileTest' }, description: '', label: 'FileTest', - c8y_IsAssetProperty: {}, + c8y_IsAssetProperty: {} }, { id: 4, @@ -149,15 +149,15 @@ describe('AssetPropertiesComponent', () => { title: 'TestDate1', properties: { dateTest1: { - type: 'date', - }, + type: 'date' + } }, required: [], - key: 'dateTest1', + key: 'dateTest1' }, description: '', label: 'TestDate1', - c8y_IsAssetProperty: {}, + c8y_IsAssetProperty: {} }, { id: 5, @@ -169,16 +169,16 @@ describe('AssetPropertiesComponent', () => { title: 'TestDate2', properties: { dateTest2: { - type: 'date', - }, + type: 'date' + } }, required: [], - key: 'dateTest2', + key: 'dateTest2' }, description: '', label: 'TestDate2', - c8y_IsAssetProperty: {}, - }, + c8y_IsAssetProperty: {} + } ] as any as IManagedObject[]; asset = { id: 12, @@ -188,18 +188,18 @@ describe('AssetPropertiesComponent', () => { city: 'Düsseldorf', street: 'Toulouser Allee', postalCode: 40211, - apartmentNumber: '25', + apartmentNumber: '25' }, fileTest: [ { file: new File([new Blob(['some content'])], 'values.json', { - type: 'application/JSON', - }), - }, + type: 'application/JSON' + }) + } ], nameTest: 'test123', dateTest1: date.toISOString(), - dateTest2: '', + dateTest2: '' } as any as IManagedObject; }); const control = { @@ -207,7 +207,7 @@ describe('AssetPropertiesComponent', () => { pipe: () => of(null) } } as any; - const clusterMap = {mapView:{map:{invalidateSize : jest.fn()}}} as any; + const clusterMap = { mapView: { map: { invalidateSize: jest.fn() } } } as any; it('should use correct labels on complex object', async () => { // given @@ -219,15 +219,9 @@ describe('AssetPropertiesComponent', () => { // then expect(result).toBeTruthy(); - const labels = result[0].complex.map((obj) => obj.label); + const labels = result[0].complex.map(obj => obj.label); expect(result[0].label).toEqual('address'); - expect(labels).toEqual([ - 'Country', - 'City', - 'Street', - 'Postal Code', - 'Apartment Number', - ]); + expect(labels).toEqual(['Country', 'City', 'Street', 'Postal Code', 'Apartment Number']); }); it('should use correct label on simple text', async () => { @@ -285,19 +279,17 @@ describe('AssetPropertiesComponent', () => { city: undefined, street: undefined, postalCode: undefined, - apartmentNumber: undefined, + apartmentNumber: undefined }); }); it('should try to upload files and attach it as childAddition', async () => { // given - const inventoryBinarySpy = jest - .spyOn(inventoryBinaryMock, 'create') - .mockReturnValue( - Promise.resolve({ - data: { id: 1 }, - }) - ); + const inventoryBinarySpy = jest.spyOn(inventoryBinaryMock, 'create').mockReturnValue( + Promise.resolve({ + data: { id: 1 } + }) + ); const inventorySpy = jest .spyOn(inventoryMock, 'childAdditionsAdd') .mockReturnValue(Promise.resolve()); @@ -362,8 +354,8 @@ describe('AssetPropertiesComponent', () => { // given jest.spyOn(assetTypesMock, 'getAssetTypeByName').mockReturnValue({ c8y_IsAssetType: { - properties: [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }, { id: 5 }], - }, + properties: [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }, { id: 5 }] + } }); component.properties = properties; component.asset = asset; @@ -379,8 +371,8 @@ describe('AssetPropertiesComponent', () => { // given jest.spyOn(assetTypesMock, 'getAssetTypeByName').mockReturnValue({ c8y_IsAssetType: { - properties: [{ id: 1, isRequired: true }], - }, + properties: [{ id: 1, isRequired: true }] + } }); component.properties = properties; component.asset = asset; @@ -391,11 +383,7 @@ describe('AssetPropertiesComponent', () => { // then expect(component.customProperties[0].jsonSchema.required).toEqual([]); expect( - ( - component.customProperties[0].jsonSchema.properties[ - 'address' - ] as JSONSchema7 - ).required + (component.customProperties[0].jsonSchema.properties['address'] as JSONSchema7).required ).toEqual(['country', 'city', 'street', 'postalCode', 'apartmentNumber']); }); @@ -408,14 +396,12 @@ describe('AssetPropertiesComponent', () => { ); // then - expect(result[0].jsonSchema.properties.address).not.toHaveProperty( - 'title' - ); + expect(result[0].jsonSchema.properties.address).not.toHaveProperty('title'); }); it('should disabled properties edit icon', async () => { // given - component.dashboardChild= control; + component.dashboardChild = control; component.clusterMap = clusterMap; jest.spyOn(permissionsServiceMock, 'canEdit').mockReturnValue(true); @@ -428,7 +414,7 @@ describe('AssetPropertiesComponent', () => { it('should enable properties edit icon', async () => { // given - component.dashboardChild= control; + component.dashboardChild = control; component.clusterMap = clusterMap; jest.spyOn(permissionsServiceMock, 'canEdit').mockReturnValue(false); diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts index 9bc5a97..3cabe35 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts @@ -6,20 +6,20 @@ import { OnInit, Output, SimpleChanges, - ViewChild, + ViewChild } from '@angular/core'; import { IManagedObject, IManagedObjectBinary, InventoryBinaryService, - InventoryService, + InventoryService } from '@c8y/client'; import { AlertService, AssetTypesService, DashboardChildComponent, DatePipe, - gettext, + gettext } from '@c8y/ngx-components'; import { AssetPropertiesItem } from './asset-properties.model'; import { JSONSchema7 } from 'json-schema'; @@ -31,7 +31,7 @@ import { RESULT_TYPES } from '../../../common/asset-property-constant'; @Component({ selector: 'c8y-asset-properties', - templateUrl: './asset-properties.component.html', + templateUrl: './asset-properties.component.html' }) export class AssetPropertiesComponent implements OnChanges, OnInit { @Input() computedPropertyObject: IManagedObject; @@ -47,7 +47,7 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { private destroy$ = new Subject(); @ViewChild(AssetLocationComponent) clusterMap: AssetLocationComponent; - component: { changeEnd: any; }; + component: { changeEnd: any }; constructor( private assetTypes: AssetTypesService, @@ -67,8 +67,12 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { this.listenToWidgetResizeEvent(this.dashboardChild); } - async ngOnChanges(changes: SimpleChanges): Promise { - if (changes.asset?.currentValue || changes.properties?.currentValue || changes.computedPropertyObject?.currentValue) { + async ngOnChanges(changes: SimpleChanges): Promise { + if ( + changes.asset?.currentValue || + changes.properties?.currentValue || + changes.computedPropertyObject?.currentValue + ) { this.assetType = undefined; this.customProperties = []; this.loadAsset(); @@ -100,11 +104,7 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { delete (mo?.c8y_JsonSchema?.properties[property] || {}).title; } - async parseItem( - mo: IManagedObject, - properties, - asset - ): Promise { + async parseItem(mo: IManagedObject, properties, asset): Promise { if (!asset) { return []; } @@ -113,11 +113,11 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { for (const key of keys) { if (properties[key]) { let value = asset[key]; - if(mo.computed){ - value = this.getComputedPropertyValue(mo,asset); + if (mo.computed) { + value = this.getComputedPropertyValue(mo, asset); } - const {type} = properties[key]; - const {title} = properties[key]; + const { type } = properties[key]; + const { title } = properties[key]; let file; if (type === 'file' && value) { const fileId = typeof value === 'object' ? value[0]?.file?.id : value; @@ -152,9 +152,9 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { : undefined, isEdit: false, jsonSchema: mo.c8y_JsonSchema, - lastUpdated: mo.lastUpdated, - isEditable: mo.isEditable, - active: properties[key].active as boolean, + lastUpdated: mo.lastUpdated, + isEditable: mo.isEditable, + active: properties[key].active as boolean }); } } @@ -257,7 +257,7 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { }); } - getComputedPropertyValue(mo,asset){ + getComputedPropertyValue(mo, asset) { let value = ''; switch (mo.name) { @@ -268,10 +268,18 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { value = this.computedPropertyObject?.[`${mo.name}_${mo.config.id}`] ?? 0; break; case 'lastDeviceMessage': - value = asset.c8y_Availability?.lastMessage ?? this.computedPropertyObject?.[mo.name] ?? 'Undefined'; + value = + asset.c8y_Availability?.lastMessage ?? + this.computedPropertyObject?.[mo.name] ?? + 'Undefined'; break; case 'lastMeasurement': - value = this.computedPropertyObject ? this.getLastMeasurementWithFormat(this.computedPropertyObject[`${mo.name}_${mo.config.id}`],mo.config.resultTypes) : 'Undefined'; + value = this.computedPropertyObject + ? this.getLastMeasurementWithFormat( + this.computedPropertyObject[`${mo.name}_${mo.config.id}`], + mo.config.resultTypes + ) + : 'Undefined'; break; case 'childDevicesCount': value = asset.childDevices.references.length; @@ -289,23 +297,23 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { return value; } - getLastMeasurementWithFormat ( measurementObj ,resultType) { + getLastMeasurementWithFormat(measurementObj, resultType) { let out = ''; - if(measurementObj){ - const { date,value, unit } = measurementObj; + if (measurementObj) { + const { date, value, unit } = measurementObj; const type = resultType || RESULT_TYPES.VALUE.value; switch (type) { case RESULT_TYPES.VALUE.value: out = value; break; case RESULT_TYPES.VALUE_UNIT.value: - out = `${value } ${ unit || ''}`; + out = `${value} ${unit || ''}`; break; case RESULT_TYPES.VALUE_UNIT_TIME.value: - out = ` ${this.datePipe.transform(date, 'short')} | ${`${value } ${ unit || ''}`}`; + out = ` ${this.datePipe.transform(date, 'short')} | ${`${value} ${unit || ''}`}`; break; default: - out = ''; + out = ''; break; } } From b2e575f6a2f010f2f0c85d9dd0d34f08a9f5ba83 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Tue, 12 Mar 2024 18:46:04 +0530 Subject: [PATCH 19/34] added .prettier file --- .prettierignore | 2 ++ .prettierrc.yaml | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 .prettierignore create mode 100644 .prettierrc.yaml diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..68993a0 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +**/.tmp +**/.cache \ No newline at end of file diff --git a/.prettierrc.yaml b/.prettierrc.yaml new file mode 100644 index 0000000..10f9fd7 --- /dev/null +++ b/.prettierrc.yaml @@ -0,0 +1,8 @@ +singleQuote: true +printWidth: 100 +trailingComma: none +arrowParens: avoid +overrides: + - files: '{modules,packages}/**/*.html' + options: + parser: angular From 039ced3032687c0deb1ec2b83bc3b900bfc93d3a Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Wed, 13 Mar 2024 19:01:25 +0530 Subject: [PATCH 20/34] fix lint issue. --- .../device_properties_widget.cy.ts | 294 +++++++++--------- .../asset_properties_widget.commands.ts | 76 ++--- .../cypress/support/device.commands.ts | 70 ++--- .../cypress/support/dtm_generic.commands.ts | 182 +++++------ .../asset_properties_widget_elements.ts | 2 +- 5 files changed, 312 insertions(+), 312 deletions(-) diff --git a/cypress-E2E-tests/cypress/integration/device_properties_widget.cy.ts b/cypress-E2E-tests/cypress/integration/device_properties_widget.cy.ts index 7bae828..07703c9 100644 --- a/cypress-E2E-tests/cypress/integration/device_properties_widget.cy.ts +++ b/cypress-E2E-tests/cypress/integration/device_properties_widget.cy.ts @@ -1,30 +1,30 @@ // eslint-disable-next-line spaced-comment /// -import asset_properties_widget_elements from "../support/page_objects/asset_properties_widget_elements"; +import asset_properties_widget_elements from '../support/page_objects/asset_properties_widget_elements'; -describe("Device properties widget", function () { - const url = "apps/sag-pkg-asset-properties-widget/index.html#/"; - const asset = "Amazon"; - const device = "Device1"; +describe('Device properties widget', function () { + const url = 'apps/sag-pkg-asset-properties-widget/index.html#/'; + const asset = 'Amazon'; + const device = 'Device1'; const groupObject = { - label: "Group", - name: "group", - description: "", + label: 'Group', + name: 'group', + description: '', c8y_IsAssetType: { icon: { - category: "", - name: "", + category: '', + name: '', }, properties: [], allowedAssetTypes: [], - isNoneChildAssetsAllowed: "false", + isNoneChildAssetsAllowed: 'false', }, }; const assetObject = { - type: "group", + type: 'group', icon: { - name: "", - category: "", + name: '', + category: '', }, name: asset, c8y_IsAsset: {}, @@ -42,16 +42,16 @@ describe("Device properties widget", function () { cy.chooseAssetOrDevice(label); } cy.get(asset_properties_widget_elements.addPropertyButton) - .should("be.enabled") + .should('be.enabled') .click(); } - context("Generic", function () { + context('Generic', function () { before(function () { cy.login(); cy.createAssetTypesAndPropertyForBuildingHierarchy(); cy.apiCreateAssetModel(groupObject, [ - { label: "Color", isRequired: "false" }, + { label: 'Color', isRequired: 'false' }, ]); cy.createDevice(device); cy.apiCreateSimpleAsset([assetObject]); @@ -70,145 +70,145 @@ describe("Device properties widget", function () { for (let i = 0; i < properties.length; i++) { const label = `#modal-body div[title='${properties[i]}']`; cy.get(label).scrollIntoView(); - cy.get(label).should("be.visible"); + cy.get(label).should('be.visible'); } } // User should be able to see devices assigned to a asset selected under groups tab. // User should be able see all the default properties configured for the device on click of add property - it("TC_Device_Properties_Widget_001", () => { + it('TC_Device_Properties_Widget_001', () => { const properties = [ - "Name", - "ID", - "Asset model", - "Notes", - "Owner", - "Last updated", - "Alarm count today", - "Alarm count 3 months", - "Event count today", - "Event count 3 months", - "Last measurement", - "Number of child devices", - "Number of child assets", - "Last device message", - "Configuration snapshot", - "Active alarms status", - "Address", - "Agent", - "Availability", - "Connection", - "Communication mode", - "Firmware", - "Hardware", - "LPWAN device", - "Mobile", - "Position", - "Required availability", - "Software", - "Network", + 'Name', + 'ID', + 'Asset model', + 'Notes', + 'Owner', + 'Last updated', + 'Alarm count today', + 'Alarm count 3 months', + 'Event count today', + 'Event count 3 months', + 'Last measurement', + 'Number of child devices', + 'Number of child assets', + 'Last device message', + 'Configuration snapshot', + 'Active alarms status', + 'Address', + 'Agent', + 'Availability', + 'Connection', + 'Communication mode', + 'Firmware', + 'Hardware', + 'LPWAN device', + 'Mobile', + 'Position', + 'Required availability', + 'Software', + 'Network', ]; - cy.get(`button p[title='${device}']`).should("be.visible"); + cy.get(`button p[title='${device}']`).should('be.visible'); navigateToSelectPropertiesWindow(device); verifyThePropertyList(properties); }); // Verify that the select button is disabled when the property is not selected in select property window. // User should be able to click on multiple checkboxes(properties) and verify that the select button gets enabled. - it("TC_Device_Properties_Widget_002", () => { - const properties = ["Alarm count today", "Last measurement"]; + it('TC_Device_Properties_Widget_002', () => { + const properties = ['Alarm count today', 'Last measurement']; navigateToSelectPropertiesWindow(device); cy.get(asset_properties_widget_elements.selectButton).should( - "be.disabled" + 'be.disabled' ); for (let i = 0; i < properties.length; i++) { cy.selectProperty(properties[i]); } cy.get(asset_properties_widget_elements.selectButton).should( - "be.enabled" + 'be.enabled' ); }); // Verify that the user can see both asset properties and some device-related properties for assets. - it("TC_Device_Properties_Widget_003", () => { + it('TC_Device_Properties_Widget_003', () => { const properties = [ - "Alarm count today", - "Alarm count 3 months", - "Event count today", - "Event count 3 months", - "Last measurement", - "Number of child devices", - "Number of child assets", - "Last device message", - "Configuration snapshot", - "Color", + 'Alarm count today', + 'Alarm count 3 months', + 'Event count today', + 'Event count 3 months', + 'Last measurement', + 'Number of child devices', + 'Number of child assets', + 'Last device message', + 'Configuration snapshot', + 'Color', ]; cy.get(asset_properties_widget_elements.backButton) - .should("be.visible") + .should('be.visible') .click(); cy.intercept( - "inventory/managedObjects/**/childAdditions?pageSize=2000&query=%24filter%3D(has(%27c8y_IsAssetProperty%27))" - ).as("childAdditionCall"); + 'inventory/managedObjects/**/childAdditions?pageSize=2000&query=%24filter%3D(has(%27c8y_IsAssetProperty%27))' + ).as('childAdditionCall'); cy.chooseAssetOrDevice(asset); - cy.wait("@childAdditionCall") - .its("response.statusCode") - .should("eq", 200); + cy.wait('@childAdditionCall') + .its('response.statusCode') + .should('eq', 200); cy.get(asset_properties_widget_elements.addPropertyButton) - .should("be.enabled") + .should('be.enabled') .click(); verifyThePropertyList(properties); }); // Verify if the user selects a device which is assigned to an asset,for that device if the user clicks on add property,only device related properties should be displayed. // Custom properties for that asset should not be shown. - it("TC_Device_Properties_Widget_004", () => { - const assetProperty = "Color"; + it('TC_Device_Properties_Widget_004', () => { + const assetProperty = 'Color'; navigateToSelectPropertiesWindow(device); - cy.get(`#modal-body div[title='${assetProperty}`).should("not.exist"); + cy.get(`#modal-body div[title='${assetProperty}`).should('not.exist'); }); after(function () { cy.visitAndWaitUntilPageLoad( - "apps/digital-twin-manager/index.html#/home" + 'apps/digital-twin-manager/index.html#/home' ); cy.cleanup(); cy.deleteAllDevices(); }); }); - context("Alarms and Events", { testIsolation: false }, function () { + context('Alarms and Events', { testIsolation: false }, function () { const properties = [ - "Alarm count today", - "Alarm count 3 months", - "Event count today", - "Event count 3 months", - "Active alarms status" + 'Alarm count today', + 'Alarm count 3 months', + 'Event count today', + 'Event count 3 months', + 'Active alarms status' ]; const alarmRequest1 = [ { - deviceName: "Device1", - text: "Device is out for maintanance", - severity: "CRITICAL", - status: "ACTIVE", - type: "DeviceAlarm", + deviceName: 'Device1', + text: 'Device is out for maintanance', + severity: 'CRITICAL', + status: 'ACTIVE', + type: 'DeviceAlarm', pastDate: { month: 2, day: 15, }, }, { - deviceName: "Device1", - text: "Device Running for more than standard time", - severity: "MINOR", - status: "ACTIVE", - type: "DeviceAlarm" + deviceName: 'Device1', + text: 'Device Running for more than standard time', + severity: 'MINOR', + status: 'ACTIVE', + type: 'DeviceAlarm' }, { - deviceName: "Device1", - text: "Device Running for more than standard time", - severity: "MAJOR", - status: "ACTIVE", - type: "DeviceAlarm", + deviceName: 'Device1', + text: 'Device Running for more than standard time', + severity: 'MAJOR', + status: 'ACTIVE', + type: 'DeviceAlarm', pastDate: { month: 3, day: 15, @@ -217,50 +217,50 @@ describe("Device properties widget", function () { ]; const alarmRequest2 = [ { - deviceName: "Device1", - text: "Device Running for more than standard time", - severity: "MINOR", - status: "ACTIVE", - type: "type1" + deviceName: 'Device1', + text: 'Device Running for more than standard time', + severity: 'MINOR', + status: 'ACTIVE', + type: 'type1' }, { - deviceName: "Device1", - text: "Device Running for more than standard time", - severity: "MAJOR", - status: "ACTIVE", - type: "type2", + deviceName: 'Device1', + text: 'Device Running for more than standard time', + severity: 'MAJOR', + status: 'ACTIVE', + type: 'type2', pastDate: { month: 3, day: 15, }, }, { - deviceName: "Device1", - text: "Device Running for more than standard time", - severity: "WARNING", - status: "ACKNOWLEDGE", - type: "type3" - }] + deviceName: 'Device1', + text: 'Device Running for more than standard time', + severity: 'WARNING', + status: 'ACKNOWLEDGE', + type: 'type3' + }]; const events = [ { - deviceName: "Device1", - type: "DeviceAlarm", - text: "sensor was triggered", + deviceName: 'Device1', + type: 'DeviceAlarm', + text: 'sensor was triggered', }, { - deviceName: "Device1", - type: "DeviceAlarm", - text: "Alarm was triggered", + deviceName: 'Device1', + type: 'DeviceAlarm', + text: 'Alarm was triggered', pastDate: { month: 3, day: 15, }, }, { - deviceName: "Device1", - type: "DeviceAlarm", - text: "Critical Alarm was triggered", + deviceName: 'Device1', + type: 'DeviceAlarm', + text: 'Critical Alarm was triggered', pastDate: { month: 2, day: 15, @@ -286,81 +286,81 @@ describe("Device properties widget", function () { cy.chooseAssetOrDevice(device); for (let i = 0; i < properties.length - 1; i++) { cy.get(asset_properties_widget_elements.addPropertyButton) - .should("be.enabled") + .should('be.enabled') .click(); cy.selectProperty(properties[i]); cy.get(asset_properties_widget_elements.selectButton).click(); cy.get( asset_properties_widget_elements.assetPropertySlectorLabelTextBox ) - .should("be.visible") - .type("DeviceAlarm"); + .should('be.visible') + .type('DeviceAlarm'); cy.get(asset_properties_widget_elements.saveButton).eq(1).click(); } cy.get(asset_properties_widget_elements.addPropertyButton) - .should("be.enabled") + .should('be.enabled') .click(); cy.selectProperty(properties[4]); cy.get(asset_properties_widget_elements.selectButton).click(); cy.get(asset_properties_widget_elements.saveButton) .eq(0) - .should("be.visible") + .should('be.visible') .click(); - cy.validatePropertyValue("Name", device); + cy.validatePropertyValue('Name', device); }); // Ensure users can set the 'Alarm count today' and also validate the data. // Send two alarms,one for the previous day and other for current day,Verify that only the current day count is shown on view. - it("TC_Device_Properties_Widget_005", () => { - cy.validatePropertyValue("Alarm count today", "1"); + it('TC_Device_Properties_Widget_005', () => { + cy.validatePropertyValue('Alarm count today', '1'); }); // Verify that 'Alarm count today' field will be disabled on view. - it("TC_Device_Properties_Widget_006", () => { - cy.get("p[title='Alarm count today']~button").should("not.exist"); + it('TC_Device_Properties_Widget_006', () => { + cy.get("p[title='Alarm count today']~button").should('not.exist'); }); // Ensure users can set the 'AlarmCount3Months ' and also validate the data. // Attempt to configure 'alarmCount3Months' with months older than 4 months. Only 3 months data should be displayed on UI. - it("TC_Device_Properties_Widget_007", () => { - cy.validatePropertyValue("Alarm count 3 months", "1"); + it('TC_Device_Properties_Widget_007', () => { + cy.validatePropertyValue('Alarm count 3 months', '1'); }); // Verify that 'AlarmCount3Months' field will be disabled on view. - it("TC_Device_Properties_Widget_008", () => { - cy.get("p[title='Alarm count 3 months']~button").should("not.exist"); + it('TC_Device_Properties_Widget_008', () => { + cy.get("p[title='Alarm count 3 months']~button").should('not.exist'); }); // Ensure users can set the 'Event count today' and also validate the data. // Send two Events,one for the previous day and other for current day,Verify that only the current day count is shown on view. - it("TC_Device_Properties_Widget_009", () => { - cy.validatePropertyValue("Event count today", "1"); + it('TC_Device_Properties_Widget_009', () => { + cy.validatePropertyValue('Event count today', '1'); }); // Verify that 'Event count today' field will be disabled on view. - it("TC_Device_Properties_Widget_010", () => { - cy.get("p[title='Event count today']~button").should("not.exist"); + it('TC_Device_Properties_Widget_010', () => { + cy.get("p[title='Event count today']~button").should('not.exist'); }); // Ensure users can set the 'Event Count 3Months ' and also validate the data. // Attempt to configure 'Event Count 3Months' with months older than 4 months. Only 3 months data should be displayed on UI. - it("TC_Device_Properties_Widget_011", () => { - cy.validatePropertyValue("Event count 3 months", "2"); + it('TC_Device_Properties_Widget_011', () => { + cy.validatePropertyValue('Event count 3 months', '2'); }); // Verify that 'Event Count 3Months' field will be disabled on view. - it("TC_Device_Properties_Widget_012", () => { - cy.get("p[title='Event count 3 months']~button").should("not.exist"); + it('TC_Device_Properties_Widget_012', () => { + cy.get("p[title='Event count 3 months']~button").should('not.exist'); }); // Ensure users can set the 'Active alarms status' and also validate the data. - it("TC_Device_Properties_Widget_013", () => { - cy.validatePropertyValue("Active alarms status", 'Critical:1,Minor:1,Major:1,Warning:0', true); + it('TC_Device_Properties_Widget_013', () => { + cy.validatePropertyValue('Active alarms status', 'Critical:1,Minor:1,Major:1,Warning:0', true); }); // Verify that 'Active alarms status' field will be disabled on view. - it("TC_Device_Properties_Widget_014", () => { - cy.get("p[title='ctive alarms status']~button").should("not.exist"); + it('TC_Device_Properties_Widget_014', () => { + cy.get("p[title='ctive alarms status']~button").should('not.exist'); }); after(function () { diff --git a/cypress-E2E-tests/cypress/support/asset_properties_widget.commands.ts b/cypress-E2E-tests/cypress/support/asset_properties_widget.commands.ts index 539bfee..bb095c6 100644 --- a/cypress-E2E-tests/cypress/support/asset_properties_widget.commands.ts +++ b/cypress-E2E-tests/cypress/support/asset_properties_widget.commands.ts @@ -1,4 +1,4 @@ -import asset_properties_widget_elements from "./page_objects/asset_properties_widget_elements"; +import asset_properties_widget_elements from './page_objects/asset_properties_widget_elements'; declare global { // eslint-disable-next-line @typescript-eslint/no-namespace @@ -106,7 +106,7 @@ declare global { } } -Cypress.Commands.add("chooseAssetOrDevice", (label, targetIndex?: number) => { +Cypress.Commands.add('chooseAssetOrDevice', (label, targetIndex?: number) => { let index = 0; if (targetIndex) { index = targetIndex; @@ -114,38 +114,38 @@ Cypress.Commands.add("chooseAssetOrDevice", (label, targetIndex?: number) => { cy.get(`div[title*='${label}']`) .eq(index) .children('div[class*="checkbox"]') - .children("label") + .children('label') .children('input[type="radio"]') .check({ force: true }); }); -Cypress.Commands.add("selectProperty", (title) => { +Cypress.Commands.add('selectProperty', (title) => { cy.get(asset_properties_widget_elements.filterPropertiesTextBox) - .should("be.visible") + .should('be.visible') .clear(); cy.get(asset_properties_widget_elements.filterPropertiesTextBox).type(title); cy.get(`div[title='${title}']`) - .parent("div") - .children("div") - .children("label") + .parent('div') + .children('div') + .children('label') .children('input[type="checkbox"]') .check({ force: true }); }); -Cypress.Commands.add("unselectProperty", (title) => { +Cypress.Commands.add('unselectProperty', (title) => { cy.get(asset_properties_widget_elements.filterPropertiesTextBox) - .should("be.visible") + .should('be.visible') .clear(); cy.get(asset_properties_widget_elements.filterPropertiesTextBox).type(title); cy.get(`div[title='${title}']`) - .parent("div") - .children("div") - .children("label") + .parent('div') + .children('div') + .children('label') .children('input[type="checkbox"]') .uncheck({ force: true }); }); -Cypress.Commands.add("deleteCard", () => { +Cypress.Commands.add('deleteCard', () => { cy.intercept({ method: 'PUT', url: '**/inventory/managedObjects/**', @@ -202,9 +202,9 @@ Cypress.Commands.add('deleteWidgetInstances', (title) => { url: '**/inventory/managedObjects/**', }).as('removed'); for (let i = 0; i < title.length; i++) { - cy.get("c8y-dashboard-child-title span") + cy.get('c8y-dashboard-child-title span') .eq(0) - .parents("c8y-dashboard-child-title") + .parents('c8y-dashboard-child-title') .siblings("div[class*='header-actions']") .children("div[placement='bottom right']") .children("button[title='Settings']") @@ -229,56 +229,56 @@ Cypress.Commands.add('selectAssetAndSave', (assetName) => { Cypress.Commands.add('selectSubasset', (assetName) => { cy.get(`div[title='${assetName}']`) .children('div[class*="checkbox"]') - .children("label") + .children('label') .children('input[type="radio"]') .check({ force: true }); }); -Cypress.Commands.add("clickOnAsset", (assetName, targetIndex?: number) => { +Cypress.Commands.add('clickOnAsset', (assetName, targetIndex?: number) => { let index = 0; if (targetIndex) { index = targetIndex; } - cy.intercept("/inventory/managedObjects/**").as("manageObjectCall"); + cy.intercept('/inventory/managedObjects/**').as('manageObjectCall'); cy.get(`button p[title='${assetName}']`) .eq(index) - .should("be.visible") + .should('be.visible') .click({ force: true }); - cy.wait("@manageObjectCall").its("response.statusCode").should("eq", 200); + cy.wait('@manageObjectCall').its('response.statusCode').should('eq', 200); }); Cypress.Commands.add( - "validatePropertyValue", + 'validatePropertyValue', (propertyLabel, value, isComplex?) => { if (isComplex) { - const commaSeparatedValues = value.split(","); + const commaSeparatedValues = value.split(','); const complexPropertyKeysAndValues = commaSeparatedValues.map((pair) => { - const [key, value] = pair.split(":"); + const [key, value] = pair.split(':'); return { key, value }; }); for (let i = 0; i < complexPropertyKeysAndValues.length; i++) { cy.get(`p[title='${propertyLabel}']`) - .parent("div") - .siblings("c8y-asset-properties-item") - .children("ul") - .children("span") + .parent('div') + .siblings('c8y-asset-properties-item') + .children('ul') + .children('span') .children('li') .children(`label[title='${complexPropertyKeysAndValues[i].key}']`) - .siblings("span") - .children("c8y-asset-properties-item") + .siblings('span') + .children('c8y-asset-properties-item') .children(`p[title*='${complexPropertyKeysAndValues[i].value}']`) - .as("propertyValue"); - cy.get("@propertyValue").scrollIntoView(); - cy.get("@propertyValue").should("be.visible"); + .as('propertyValue'); + cy.get('@propertyValue').scrollIntoView(); + cy.get('@propertyValue').should('be.visible'); } } else { cy.get(`p[title='${propertyLabel}']`) - .parent("div") - .siblings("c8y-asset-properties-item") + .parent('div') + .siblings('c8y-asset-properties-item') .children(`p[title*='${value}']`) - .as("propertyValue"); - cy.get("@propertyValue").scrollIntoView(); - cy.get("@propertyValue").should("be.visible"); + .as('propertyValue'); + cy.get('@propertyValue').scrollIntoView(); + cy.get('@propertyValue').should('be.visible'); } } ); diff --git a/cypress-E2E-tests/cypress/support/device.commands.ts b/cypress-E2E-tests/cypress/support/device.commands.ts index de3d98a..d585a0d 100644 --- a/cypress-E2E-tests/cypress/support/device.commands.ts +++ b/cypress-E2E-tests/cypress/support/device.commands.ts @@ -1,4 +1,4 @@ -import cockpit_page_elements from "./page_objects/cockpit_page_elements"; +import cockpit_page_elements from './page_objects/cockpit_page_elements'; declare global { // eslint-disable-next-line @typescript-eslint/no-namespace @@ -80,7 +80,7 @@ declare global { function getDeviceId(deviceName: string) { return cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?pageSize=1&query=$filter=(has(c8y_IsDevice) and ('name' eq '${deviceName}'))`, failOnStatusCode: false, }); @@ -88,14 +88,14 @@ function getDeviceId(deviceName: string) { function setPastDate(requestBody) { const currentDate = new Date(); - if ("pastDate" in requestBody) { + if ('pastDate' in requestBody) { currentDate.setMonth(currentDate.getMonth() - requestBody.pastDate.month); currentDate.setDate(currentDate.getDate() - requestBody.pastDate.day); } return currentDate.toISOString(); } -Cypress.Commands.add("createMeasurement", (requestBody) => { +Cypress.Commands.add('createMeasurement', (requestBody) => { getDeviceId(requestBody.deviceName).then((response: any) => { const deviceId = response.body.managedObjects[0].id; const formattedTimestamp = setPastDate(requestBody); @@ -113,20 +113,20 @@ Cypress.Commands.add("createMeasurement", (requestBody) => { type: requestBody.fragment, }; cy.apiRequest({ - method: "POST", - url: "/measurement/measurements", + method: 'POST', + url: '/measurement/measurements', headers: { - Accept: "application/vnd.com.nsn.cumulocity.measurement+json", + Accept: 'application/vnd.com.nsn.cumulocity.measurement+json', }, body: body, failOnStatusCode: false, }) - .its("status") - .should("eq", 201); + .its('status') + .should('eq', 201); }); }); -Cypress.Commands.add("createNewAlarm", (alarmObject) => { +Cypress.Commands.add('createNewAlarm', (alarmObject) => { getDeviceId(alarmObject.deviceName).then((response: any) => { const deviceId = response.body.managedObjects[0].id; const formattedTimestamp = setPastDate(alarmObject); @@ -141,67 +141,67 @@ Cypress.Commands.add("createNewAlarm", (alarmObject) => { time: formattedTimestamp, }; cy.apiRequest({ - method: "POST", - url: "/alarm/alarms", + method: 'POST', + url: '/alarm/alarms', body: modifiedObj, failOnStatusCode: false, }) - .its("status") - .should("eq", 201); + .its('status') + .should('eq', 201); }); }); -Cypress.Commands.add("createDevice", (deviceName, pastDate) => { +Cypress.Commands.add('createDevice', (deviceName, pastDate) => { const request = { - url: "/inventory/managedObjects", - method: "Post", + url: '/inventory/managedObjects', + method: 'Post', body: { name: deviceName, c8y_IsDevice: {}, - c8y_DeviceTypes: ["deviceSubsetType"], - c8y_SupportedOperations: ["c8y_Restart"], + c8y_DeviceTypes: ['deviceSubsetType'], + c8y_SupportedOperations: ['c8y_Restart'], }, }; if (pastDate) { const currentDate = new Date(); currentDate.setMonth(currentDate.getMonth() - pastDate.month); currentDate.setDate(currentDate.getDate() - pastDate.day); - request.body["creationTime"] = currentDate.toISOString(); + request.body['creationTime'] = currentDate.toISOString(); } cy.apiRequest(request); }); -Cypress.Commands.add("deleteAllDevices", () => { +Cypress.Commands.add('deleteAllDevices', () => { cy.apiRequest({ - url: "inventory/managedObjects?fragmentType=c8y_IsDevice", - method: "GET", + url: 'inventory/managedObjects?fragmentType=c8y_IsDevice', + method: 'GET', failOnStatusCode: false, }).then((response: any) => { for (const mo of response.body.managedObjects) { - cy.log("Deleting ", mo.id); + cy.log('Deleting ', mo.id); cy.apiRequest({ - method: "DELETE", + method: 'DELETE', url: `/inventory/managedObjects/${mo.id}`, }); } }); }); -Cypress.Commands.add("addChildDevice", (parentDevice, childDevice) => { +Cypress.Commands.add('addChildDevice', (parentDevice, childDevice) => { cy.apiRequest({ url: `/inventory/managedObjects?q=$filter=(name eq '${parentDevice}' and has('c8y_IsDevice'))`, - method: "GET", + method: 'GET', }).then((response: any) => { const parentDeviceId = response.body.managedObjects[0].id; cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?q=$filter=(name eq '${childDevice}' and has('c8y_IsDevice'))`, }).then((response: any) => { const childDeviceId = response.body.managedObjects[0].id; cy.log(childDeviceId); cy.apiRequest({ url: `/inventory/managedObjects/${parentDeviceId}/childDevices`, - method: "POST", + method: 'POST', body: { managedObject: { id: `${childDeviceId}` }, }, @@ -210,7 +210,7 @@ Cypress.Commands.add("addChildDevice", (parentDevice, childDevice) => { }); }); -Cypress.Commands.add("createEvent", (request) => { +Cypress.Commands.add('createEvent', (request) => { getDeviceId(request.deviceName).then((response: any) => { const deviceId = response.body.managedObjects[0].id; const formattedTimestamp = setPastDate(request); @@ -223,15 +223,15 @@ Cypress.Commands.add("createEvent", (request) => { time: formattedTimestamp, }; cy.apiRequest({ - method: "POST", - url: "/event/events", + method: 'POST', + url: '/event/events', headers: { - Accept: "application/vnd.com.nsn.cumulocity.event+json", + Accept: 'application/vnd.com.nsn.cumulocity.event+json', }, body: body, failOnStatusCode: false, }) - .its("status") - .should("eq", 201); + .its('status') + .should('eq', 201); }); }); diff --git a/cypress-E2E-tests/cypress/support/dtm_generic.commands.ts b/cypress-E2E-tests/cypress/support/dtm_generic.commands.ts index f28bb14..8a3be03 100644 --- a/cypress-E2E-tests/cypress/support/dtm_generic.commands.ts +++ b/cypress-E2E-tests/cypress/support/dtm_generic.commands.ts @@ -1,6 +1,6 @@ -import { IManagedObject } from "@c8y/client"; -import { UrlParams } from "./models/data.model"; -import dtm_generic_page_elements from "./page_objects/dtm_generic_page_elements"; +import { IManagedObject } from '@c8y/client'; +import { UrlParams } from './models/data.model'; +import dtm_generic_page_elements from './page_objects/dtm_generic_page_elements'; declare global { // eslint-disable-next-line @typescript-eslint/no-namespace @@ -189,92 +189,92 @@ declare global { } } -Cypress.Commands.add("navigateToLocalizationPage", () => { +Cypress.Commands.add('navigateToLocalizationPage', () => { cy.get(dtm_generic_page_elements.configurationLink).click({ force: true }); cy.get(dtm_generic_page_elements.localizationLink).click({ force: true }); }); -Cypress.Commands.add("navigateToAssetsPage", () => { +Cypress.Commands.add('navigateToAssetsPage', () => { cy.get(dtm_generic_page_elements.assetsLink).click({ force: true }); }); -Cypress.Commands.add("navigateToPropertyLibraryPage", () => { +Cypress.Commands.add('navigateToPropertyLibraryPage', () => { cy.get(dtm_generic_page_elements.configurationLink).click({ force: true }); cy.get(dtm_generic_page_elements.propertyLibraryLink).click({ force: true }); }); -Cypress.Commands.add("navigateToAssetTypesPage", () => { +Cypress.Commands.add('navigateToAssetTypesPage', () => { cy.get(dtm_generic_page_elements.configurationLink).click({ force: true }); cy.get(dtm_generic_page_elements.assetTypesLink).click({ force: true }); }); -Cypress.Commands.add("navigateToHomePage", () => { +Cypress.Commands.add('navigateToHomePage', () => { cy.get(dtm_generic_page_elements.homePageLink).click({ force: true }); }); -Cypress.Commands.add("verifyTheAlertMsg", (alertMsg) => { - const alertPopup = "div.c8y-prompt.alert"; - cy.get(alertPopup).should("be.visible").contains(alertMsg); +Cypress.Commands.add('verifyTheAlertMsg', (alertMsg) => { + const alertPopup = 'div.c8y-prompt.alert'; + cy.get(alertPopup).should('be.visible').contains(alertMsg); }); -Cypress.Commands.add("configureColumns", (option, columnName) => { +Cypress.Commands.add('configureColumns', (option, columnName) => { const column = `label[title='${columnName}']>input`; cy.get(dtm_generic_page_elements.configureCloumnsButton).click(); - if (option === "Check") { + if (option === 'Check') { cy.get(column).check(); - } else if (option === "Uncheck") { + } else if (option === 'Uncheck') { cy.get(column).uncheck(); } else { - cy.log("Mentioned option is incorrect"); + cy.log('Mentioned option is incorrect'); } cy.get(dtm_generic_page_elements.configureCloumnsButton).click(); }); -Cypress.Commands.add("cleanup", () => { +Cypress.Commands.add('cleanup', () => { cy.getUniqueId().then((id) => { cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?pageSize=2000&nocache=${id}&query=$filter=(has(c8y_IsAssetProperty) and (owner eq ${Cypress.env( - "username" + 'username' )}) and (not(name eq 'c8y_Position')))`, failOnStatusCode: false, }).then((response: any) => { for (const mo of response.body.managedObjects) { - cy.log("Deleting ", mo.id); + cy.log('Deleting ', mo.id); cy.apiRequest({ - method: "DELETE", + method: 'DELETE', url: `/inventory/managedObjects/${mo.id}`, failOnStatusCode: false, }); } }); cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?pageSize=2000&nocache=${id}&query=$filter=(has(c8y_IsAssetType) and (owner eq ${Cypress.env( - "username" + 'username' )}) and (not(name eq 'c8y_DeviceGroup')))`, failOnStatusCode: false, }).then((response: any) => { for (const mo of response.body.managedObjects) { - cy.log("Deleting ", mo.id); + cy.log('Deleting ', mo.id); cy.apiRequest({ - method: "DELETE", + method: 'DELETE', url: `/inventory/managedObjects/${mo.id}`, failOnStatusCode: false, }); } }); cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?pageSize=2000&fragmentType=c8y_IsAsset&withChildren=false&onlyRoots=true&owner=${Cypress.env( - "username" + 'username' )}&nocache=${id}`, failOnStatusCode: false, }).then((response: any) => { for (const mo of response.body.managedObjects) { - cy.log("Deleting ", mo.id); + cy.log('Deleting ', mo.id); cy.apiRequest({ - method: "DELETE", + method: 'DELETE', url: `/inventory/managedObjects/${mo.id}`, failOnStatusCode: false, }); @@ -283,62 +283,62 @@ Cypress.Commands.add("cleanup", () => { }); }); -Cypress.Commands.add("cleanupByFragmentType", (fragmentType: string) => { +Cypress.Commands.add('cleanupByFragmentType', (fragmentType: string) => { cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?pageSize=100&fragmentType=${fragmentType}`, failOnStatusCode: false, }).then((response: any) => { if (!response.body.managedObjects) return; for (const mo of response.body.managedObjects) { - cy.log("Deleting ", mo.id); + cy.log('Deleting ', mo.id); cy.apiRequest({ - method: "DELETE", + method: 'DELETE', url: `/inventory/managedObjects/${mo.id}`, }); } }); }); -Cypress.Commands.add("cleanupByQuery", (query, urlParams) => { +Cypress.Commands.add('cleanupByQuery', (query, urlParams) => { cy.getManagedObjectsByQuery(query, urlParams).then((managedObjects) => { if (!managedObjects) return; for (const mo of managedObjects) { - cy.log("Deleting ", mo.id); + cy.log('Deleting ', mo.id); cy.apiRequest({ - method: "DELETE", + method: 'DELETE', url: `/inventory/managedObjects/${mo.id}`, }); } }); }); -Cypress.Commands.add("editConfirmationPopup", (option) => { - cy.get(".alert-warning") - .should("be.visible") +Cypress.Commands.add('editConfirmationPopup', (option) => { + cy.get('.alert-warning') + .should('be.visible') .then(() => { - if (option === "Cancel") { + if (option === 'Cancel') { // requiredCheckbox.check({force: true}) cy.get(dtm_generic_page_elements.cancelEditPopupButton).click(); } else { cy.get(dtm_generic_page_elements.confirmEditPopupButton).click(); - cy.get(".alert > div", { timeout: 3000 }).should("exist"); + cy.get('.alert > div', { timeout: 3000 }).should('exist'); cy.get(dtm_generic_page_elements.closeAlert).click(); } }); }); -Cypress.Commands.add("getJsonFile", (jsonName) => { +Cypress.Commands.add('getJsonFile', (jsonName) => { cy.fixture(jsonName).then(function (data) { return data; }); }); -Cypress.Commands.add("apiCreateSimpleAsset", (assetObject) => { +Cypress.Commands.add('apiCreateSimpleAsset', (assetObject) => { for (let i = 0; i < assetObject.length; i++) { cy.apiRequest({ - url: "/inventory/managedObjects", - method: "POST", + url: '/inventory/managedObjects', + method: 'POST', body: assetObject[i], }).then((response) => response.body.id); } @@ -350,20 +350,20 @@ function assignDeviceOrChildAsset( label ) { cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?query=$filter=((has(c8y_IsAsset)) and ('name' eq '${label}'))`, failOnStatusCode: false, }).then((response: any) => { const assetId = response.body.managedObjects[0].id; for (let i = 0; i < listOfAssetsOrDevices.length; i++) { cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?query=$filter=((has(${option})) and ('name' eq '${listOfAssetsOrDevices[i]}'))`, failOnStatusCode: false, }).then((response: any) => { const childAssetOrDeviceId = response.body.managedObjects[0].id; cy.apiRequest({ - method: "POST", + method: 'POST', url: `/inventory/managedObjects/${assetId}/childAssets`, body: { managedObject: { @@ -376,32 +376,32 @@ function assignDeviceOrChildAsset( }); } -Cypress.Commands.add("apiAssignChildAsset", (childAssets, asset) => { - assignDeviceOrChildAsset("c8y_IsAsset", childAssets, asset); +Cypress.Commands.add('apiAssignChildAsset', (childAssets, asset) => { + assignDeviceOrChildAsset('c8y_IsAsset', childAssets, asset); }); -Cypress.Commands.add("apiAssignDevice", (devices, asset) => { - assignDeviceOrChildAsset("c8y_IsDevice", devices, asset); +Cypress.Commands.add('apiAssignDevice', (devices, asset) => { + assignDeviceOrChildAsset('c8y_IsDevice', devices, asset); }); -Cypress.Commands.add("getUniqueId", () => { +Cypress.Commands.add('getUniqueId', () => { const uniqueSeed = Date.now().toString(); return Cypress._.uniqueId(uniqueSeed); }); -Cypress.Commands.add("getManagedObjectsByQuery", (query, urlParams) => { - const baseUrl = "/inventory/managedObjects"; +Cypress.Commands.add('getManagedObjectsByQuery', (query, urlParams) => { + const baseUrl = '/inventory/managedObjects'; let url; const params = Object.entries(urlParams) // eslint-disable-next-line @typescript-eslint/no-unused-vars .filter(([key, value]) => value !== undefined && value !== null) .map(([key, value]) => `${key}=${value}`) - .join("&"); + .join('&'); if (params) url = `${baseUrl}?${params}&${query}`; else url = `baseUrl?${query}`; cy.apiRequest({ - method: "GET", + method: 'GET', url: url, failOnStatusCode: false, }).then((response) => { @@ -409,39 +409,39 @@ Cypress.Commands.add("getManagedObjectsByQuery", (query, urlParams) => { }); }); -Cypress.Commands.add("verifyAlertNotificationMessage", (message) => { - cy.get("[data-cy=c8y-alert--message]").within(() => { - cy.get("div strong.message").should("have.text", message); +Cypress.Commands.add('verifyAlertNotificationMessage', (message) => { + cy.get('[data-cy=c8y-alert--message]').within(() => { + cy.get('div strong.message').should('have.text', message); }); }); -Cypress.Commands.add("verifyAlertNotificationDetails", (message) => { - cy.get("[data-cy=c8y-alert--message]").within(() => { - cy.get('button[title="Show details"]').should("be.visible").click(); - cy.get("div > div > pre > code").should("contain", message); +Cypress.Commands.add('verifyAlertNotificationDetails', (message) => { + cy.get('[data-cy=c8y-alert--message]').within(() => { + cy.get('button[title="Show details"]').should('be.visible').click(); + cy.get('div > div > pre > code').should('contain', message); }); }); Cypress.Commands.add( - "addNetworkIntercept", + 'addNetworkIntercept', ( method: string, endPoint: any, - networkStatus: string = "SUCCESS", + networkStatus: string = 'SUCCESS', nthCallToFail: number = 1 ) => { let apiCallCounter = 0; switch (networkStatus) { - case "SUCCESS": + case 'SUCCESS': return cy.intercept(method, endPoint); - case "FAILURE": + case 'FAILURE': return cy.intercept(method, endPoint, (req) => { apiCallCounter++; if (apiCallCounter === nthCallToFail) { req.reply({ statusCode: 500, - body: "Something went wrong in the inventory API", + body: 'Something went wrong in the inventory API', }); } }); @@ -449,15 +449,15 @@ Cypress.Commands.add( } ); -Cypress.Commands.add("convertToUTC", (inputDateString) => { +Cypress.Commands.add('convertToUTC', (inputDateString) => { const inputDate = new Date(inputDateString); const utcYear = inputDate.getUTCFullYear(); - const utcMonth = (inputDate.getUTCMonth() + 1).toString().padStart(2, "0"); - const utcDay = inputDate.getUTCDate().toString().padStart(2, "0"); - const utcHours = inputDate.getUTCHours().toString().padStart(2, "0"); - const utcMinutes = inputDate.getUTCMinutes().toString().padStart(2, "0"); - const utcSeconds = inputDate.getUTCSeconds().toString().padStart(2, "0"); + const utcMonth = (inputDate.getUTCMonth() + 1).toString().padStart(2, '0'); + const utcDay = inputDate.getUTCDate().toString().padStart(2, '0'); + const utcHours = inputDate.getUTCHours().toString().padStart(2, '0'); + const utcMinutes = inputDate.getUTCMinutes().toString().padStart(2, '0'); + const utcSeconds = inputDate.getUTCSeconds().toString().padStart(2, '0'); const utcTimeString = `${utcYear}-${utcMonth}-${utcDay}T${utcHours}:${utcMinutes}:${utcSeconds}`; cy.wrap(utcTimeString).then((value) => { @@ -466,29 +466,29 @@ Cypress.Commands.add("convertToUTC", (inputDateString) => { }); Cypress.Commands.add( - "getCreationOrLastUpdatedTime", + 'getCreationOrLastUpdatedTime', (option: string, selection: string, label: string) => { let url; switch (selection) { - case "asset": + case 'asset': url = `/inventory/managedObjects?query=$filter=((has(c8y_IsAsset)) and ('name' eq '${label}'))`; break; - case "assetmodel": + case 'assetmodel': url = `/inventory/managedObjects?query=$filter=((has(c8y_IsAssetType)) and ('label' eq '${label}'))`; break; - case "assetproperty": + case 'assetproperty': url = `/inventory/managedObjects?query=$filter=((has(c8y_JsonSchema)) and (has(c8y_IsAssetProperty)) and ('label' eq '${label}'))`; break; } return cy .apiRequest({ - method: "GET", + method: 'GET', url: url, failOnStatusCode: false, }) .then((response: any) => { let time; - if (option === "created") { + if (option === 'created') { time = response.body.managedObjects[0].creationTime; } else { time = response.body.managedObjects[0].lastUpdated; @@ -500,11 +500,11 @@ Cypress.Commands.add( } ); -Cypress.Commands.add("apiDeleteGridConfig", (fragmentName) => { +Cypress.Commands.add('apiDeleteGridConfig', (fragmentName) => { cy.apiRequest({ - method: "GET", + method: 'GET', url: `/inventory/managedObjects?fragmentType=${fragmentName}${Cypress.env( - "username" + 'username' )}`, failOnStatusCode: false, }).then((response) => { @@ -512,7 +512,7 @@ Cypress.Commands.add("apiDeleteGridConfig", (fragmentName) => { const [{ id }] = response.body.managedObjects; cy.log(`Deleting grid-config ${id}`); cy.apiRequest({ - method: "DELETE", + method: 'DELETE', url: `/inventory/managedObjects/${id}`, failOnStatusCode: false, }); @@ -520,7 +520,7 @@ Cypress.Commands.add("apiDeleteGridConfig", (fragmentName) => { }); }); -Cypress.Commands.add("dragTo", { prevSubject: "element" }, function ( +Cypress.Commands.add('dragTo', { prevSubject: 'element' }, function ( subject, targetEl ) { @@ -528,14 +528,14 @@ Cypress.Commands.add("dragTo", { prevSubject: "element" }, function ( cy.wrap(subject) .first() .realMouseDown({ - button: "left", - position: "center", - scrollBehavior: "nearest", + button: 'left', + position: 'center', + scrollBehavior: 'nearest', }) - .realMouseMove(10, 0, { position: "center", scrollBehavior: "nearest" }); + .realMouseMove(10, 0, { position: 'center', scrollBehavior: 'nearest' }); cy.get(targetEl) .first() - .realMouseMove(10, 0, { position: "center", scrollBehavior: "nearest" }) - .realMouseUp({ position: "center", scrollBehavior: "center" }); + .realMouseMove(10, 0, { position: 'center', scrollBehavior: 'nearest' }) + .realMouseUp({ position: 'center', scrollBehavior: 'center' }); cy.wait(1000); }); diff --git a/cypress-E2E-tests/cypress/support/page_objects/asset_properties_widget_elements.ts b/cypress-E2E-tests/cypress/support/page_objects/asset_properties_widget_elements.ts index 6f1c43e..c035072 100644 --- a/cypress-E2E-tests/cypress/support/page_objects/asset_properties_widget_elements.ts +++ b/cypress-E2E-tests/cypress/support/page_objects/asset_properties_widget_elements.ts @@ -24,7 +24,7 @@ export default { // ###############[Textbox]############## filterPropertiesTextBox: "input[data-cy='asset-property-item-input-search']", - assetPropertySlectorLabelTextBox: "#modal-body-property input", + assetPropertySlectorLabelTextBox: '#modal-body-property input', // ###############[Other]################ cardElement: "div[title='Editable form for asset properties widget']", From e8e375a350449c7c75bef6ef7e20a7bcd73b07cd Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Mon, 18 Mar 2024 17:16:19 +0530 Subject: [PATCH 21/34] Move a few lines of code to the propertyItemSelector component to create a generic property selector. --- .../asset-properties-config.component.ts | 19 +-- ...sset-property-item-selector.component.html | 45 ++--- .../asset-property-item-selector.component.ts | 96 ++++++++--- .../asset-property-selector.component.ts | 154 +++++------------- 4 files changed, 133 insertions(+), 181 deletions(-) diff --git a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts index 8d077b6..44a1c82 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.ts @@ -6,34 +6,27 @@ import { DynamicComponent, OnBeforeSave } from '@c8y/ngx-components'; @Component({ selector: 'c8y-asset-properties-config', templateUrl: './asset-properties-config.component.html', - viewProviders: [{ provide: ControlContainer, useExisting: NgForm }], + viewProviders: [{ provide: ControlContainer, useExisting: NgForm }] }) -export class AssetPropertiesConfigComponent - implements DynamicComponent, OnBeforeSave, OnChanges -{ +export class AssetPropertiesConfigComponent implements DynamicComponent, OnBeforeSave, OnChanges { @Input() config: any = {}; selectedAsset: IManagedObject; constructor(private inventoryService: InventoryService) {} - async ngOnChanges(){ - if(this.config.device.hasOwnProperty('c8y_IsDevice')){ + async ngOnChanges() { + if (this.config.device?.hasOwnProperty('c8y_IsDevice')) { this.selectedAsset = this.config.device; return; } try { - this.selectedAsset = ( - await this.inventoryService.detail(this.config.device.id) - ).data; + this.selectedAsset = (await this.inventoryService.detail(this.config.device.id)).data; } catch (er) { // intended empty } } onBeforeSave(config: any): boolean { - return !!( - config.properties && - config.properties.some((value) => value.active === true) - ); + return !!(config.properties && config.properties.some(value => value.active === true)); } } diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html index a8878c2..97a2d80 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html @@ -31,19 +31,13 @@
- +
- +
- +
@@ -55,10 +49,7 @@ style="max-height: calc(100vh - 340px)" >
-
+
-
- {{ "No property to display" | translate }} -
+
+ +
diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts index 631ac15..e201560 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.ts @@ -1,35 +1,63 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; import { IManagedObject } from '@c8y/client'; -import { some, cloneDeep, isEqual} from 'lodash-es'; +import { + computedPropertiesBaseObject, + defaultProperty, + devicePropertiesBaseObject +} from '../../../common/asset-property-constant'; +import { some, cloneDeep, isEqual } from 'lodash-es'; +import { AssetPropertiesService } from '../asset-properties.service'; @Component({ selector: 'c8y-asset-property-item-selector-component', - templateUrl: './asset-property-item-selector.component.html', + templateUrl: './asset-property-item-selector.component.html' }) export class assetPropertyItemSelectorCtrlComponent implements OnInit { @Input() title?: string; - @Input() customProperties?: any; - @Input() propertiesList?: any; + @Input() deviceMO: IManagedObject; @Output() savePropertySelection = new EventEmitter(); @Output() cancelPropertySelection = new EventEmitter(); selectedProperty: IManagedObject[] = []; search: string = ''; - properties: object = []; + properties: any; - ngOnInit(): void { - this.customProperties = cloneDeep(this.constructCustomProperties()); + constructor(private assetPropertyService: AssetPropertiesService) {} + + async ngOnInit(): Promise { + if (this.deviceMO?.hasOwnProperty('c8y_IsDevice')) { + this.properties = [ + ...cloneDeep(defaultProperty), + ...cloneDeep(devicePropertiesBaseObject), + ...cloneDeep(computedPropertiesBaseObject) + ]; + } else { + const customProperties = this.getConstructCustomProperties( + await this.assetPropertyService.getCustomProperties(this.deviceMO) + ); + this.properties = [ + ...cloneDeep(defaultProperty), + ...(customProperties ?? []), + ...cloneDeep(computedPropertiesBaseObject) + ]; + } + this.properties = cloneDeep(this.constructCustomProperties()); } constructCustomProperties(): IManagedObject[] { const simpleProperties: IManagedObject[] = []; const complexProperties: IManagedObject[] = []; const computedProperties: IManagedObject[] = []; - this.customProperties.forEach((property) => { + this.properties.forEach(property => { + property.active = false; if (this.isComplexProperty(property)) { complexProperties.push(property); - this.flattenNestedComplexProperties(property.c8y_JsonSchema?.properties[property.name], complexProperties, property.name); + this.flattenNestedComplexProperties( + property.c8y_JsonSchema?.properties[property.name], + complexProperties, + property.name + ); } else if (property.computed) { computedProperties.push(property); } else { @@ -39,10 +67,14 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { return [...simpleProperties, ...complexProperties, ...computedProperties]; } - flattenNestedComplexProperties(property: IManagedObject, complexProperties: IManagedObject[], parentName?: string): void { + flattenNestedComplexProperties( + property: IManagedObject, + complexProperties: IManagedObject[], + parentName?: string + ): void { if (!property || !property.properties) return; - Object.keys(property.properties).forEach((key)=>{ + Object.keys(property.properties).forEach(key => { const object = property.properties[key]; const keyPath = property.keyPath ? [...property.keyPath] : [property.name || parentName]; keyPath.push(key); @@ -64,28 +96,28 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { } } - selectOrUnselectChildren(selectedProperty: IManagedObject, active: boolean){ + selectOrUnselectChildren(selectedProperty: IManagedObject, active: boolean) { if (!this.isComplexProperty(selectedProperty)) return; - this.customProperties.forEach((property) => { - if(property.keyPath?.some(name => name === selectedProperty.name)){ + this.properties.forEach(property => { + if (property.keyPath?.some(name => name === selectedProperty.name)) { property.active = active; - if(active){ - if(!some(this.selectedProperty, obj => isEqual(obj, property))){ + if (active) { + if (!some(this.selectedProperty, obj => isEqual(obj, property))) { this.selectedProperty.push(cloneDeep(property)); } - }else{ + } else { property.active = active; this.removeUnselectedProperties(property); } } }); } - removeUnselectedProperties(property: IManagedObject){ + removeUnselectedProperties(property: IManagedObject) { const removeIndex = this.selectedProperty - .map(function (item) { - return item.keyValue?.[0] || item.name; - }) - .indexOf(property.name); + .map(function (item) { + return item.keyValue?.[0] || item.name; + }) + .indexOf(property.name); if (removeIndex > -1) this.selectedProperty.splice(removeIndex, 1); } @@ -98,10 +130,26 @@ export class assetPropertyItemSelectorCtrlComponent implements OnInit { } selectIsDisabled() { - return this.customProperties.every(({ active }) => !active); + return this.properties?.every(({ active }) => !active); } isComplexProperty(prop: IManagedObject) { - return prop.c8y_JsonSchema?.properties[prop.name]?.type === 'object' || prop.properties !== undefined; + return ( + prop.c8y_JsonSchema?.properties[prop.name]?.type === 'object' || prop.properties !== undefined + ); + } + + getConstructCustomProperties(customProperties): IManagedObject[] { + const simpleProperties: IManagedObject[] = []; + const constructCustomProperties: IManagedObject[] = []; + customProperties.forEach(property => { + const object = property.c8y_JsonSchema.properties[property.name]; + if (object.type === 'object') { + constructCustomProperties.push(property); + } else { + simpleProperties.push(property); + } + }); + return simpleProperties.concat(constructCustomProperties); } } diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts index f60451c..0ba6845 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.ts @@ -1,132 +1,88 @@ import { Component, Input, OnChanges } from '@angular/core'; import { IManagedObject } from '@c8y/client'; -import { AssetTypesService, gettext } from '@c8y/ngx-components'; import { BsModalRef, BsModalService, ModalOptions } from 'ngx-bootstrap/modal'; -import { isEmpty, cloneDeep, filter} from 'lodash-es'; +import { cloneDeep, filter } from 'lodash-es'; import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop'; import { assetPropertyItemSelectorCtrlComponent } from '../asset-property-item-selector/asset-property-item-selector.component'; -import { AssetPropertiesService } from '../asset-properties.service'; -import { - defaultProperty, - devicePropertiesBaseObject, - computedPropertiesBaseObject, -} from '../../../common/asset-property-constant'; +import { defaultProperty } from '../../../common/asset-property-constant'; import { some } from 'lodash-es'; import { ComputedPropertyConfigComponent } from '../computed-asset-property/computed-property-config.component'; +import { gettext } from '@c8y/ngx-components'; type ModalInitialState = { title: string; - customProperties: any; - propertiesList: any; + deviceMO: IManagedObject; }; @Component({ selector: 'c8y-asset-property-selector', - templateUrl: './asset-property-selector.component.html', + templateUrl: './asset-property-selector.component.html' }) export class AssetPropertiesSelectorComponent implements OnChanges { @Input() config: IManagedObject; @Input() asset: IManagedObject; - isLoading: boolean = false; - assetType: IManagedObject; assetPropertySelectorModalRef: BsModalRef; computedPropertyConfigModalRef: BsModalRef; properties = cloneDeep(filter(defaultProperty, { active: true })); - customProperties: Array = [...cloneDeep(defaultProperty), ...cloneDeep(computedPropertiesBaseObject)]; + customProperties: Array; ExpandedComplexProperty: any; isAtleastOnePropertySelected: boolean = true; selectedComputedPropertyIndex: number; - constructor( - private assetTypes: AssetTypesService, - private assetPropertyService: AssetPropertiesService, - private modalService: BsModalService - ) {} + constructor(private modalService: BsModalService) {} async ngOnChanges(changes: IManagedObject): Promise { - if(changes.asset.currentValue?.hasOwnProperty('c8y_IsDevice')){ - this.properties = this.config.properties || cloneDeep(filter(defaultProperty, { active: true })); - if(changes.asset.previousValue?.hasOwnProperty('c8y_IsAsset')){ + if (changes.asset.currentValue?.hasOwnProperty('c8y_IsDevice')) { + this.properties = + this.config.properties || cloneDeep(filter(defaultProperty, { active: true })); + if (changes.asset.previousValue?.hasOwnProperty('c8y_IsAsset')) { this.properties = cloneDeep(filter(defaultProperty, { active: true })); } this.config.properties = this.properties; - this.customProperties = [...cloneDeep(defaultProperty), ...cloneDeep(devicePropertiesBaseObject), ...cloneDeep(computedPropertiesBaseObject)]; - } - else if (!changes.asset.previousValue && this.config?.properties) { + } else if (!changes.asset.previousValue && this.config?.properties) { this.properties = this.config.properties; - this.customProperties = this.customProperties.concat( - this.getConstructCustomProperties( - await this.assetPropertyService.getCustomProperties(this.asset) - ) - ); } else if (changes.asset.currentValue) { - this.assetType = undefined; this.loadAssetProperty(); } this.isAtleastOnePropertySelected = true; } - getConstructCustomProperties(customProperties): IManagedObject[] { - const simpleProperties: IManagedObject[] = []; - const constructCustomProperties: IManagedObject[] = []; - customProperties.forEach((property) => { - const object = - property.c8y_JsonSchema.properties[property.name]; - if (object.type === 'object') { - constructCustomProperties.push(property); - } else { - simpleProperties.push(property); - } - }); - return simpleProperties.concat(constructCustomProperties); - } async loadAssetProperty() { - this.isLoading = true; this.properties = cloneDeep(filter(defaultProperty, { active: true })); - this.assetType = this.assetTypes.getAssetTypeByName(this.asset.type); this.config.properties = this.properties; - this.customProperties = cloneDeep(defaultProperty) - .concat( - this.getConstructCustomProperties( - await this.assetPropertyService.getCustomProperties(this.asset) - ) - ) - .concat(computedPropertiesBaseObject); - this.isLoading = false; } addProperty() { - this.customProperties.forEach((property) => { - property.active = false; - }); const assetPropertySelectorModalOptions: ModalOptions = { class: 'modal-lg', backdrop: 'static', initialState: { title: gettext('Select property'), - customProperties: this.customProperties, - propertiesList: this.properties, - }, + deviceMO: this.asset + } }; this.assetPropertySelectorModalRef = this.modalService.show( assetPropertyItemSelectorCtrlComponent, assetPropertySelectorModalOptions ); - this.assetPropertySelectorModalRef.content.cancelPropertySelection.subscribe( - (event: Event) => { - this.assetPropertySelectorModalRef.hide(); - } - ); + this.assetPropertySelectorModalRef.content.cancelPropertySelection.subscribe(() => { + this.assetPropertySelectorModalRef.hide(); + }); this.assetPropertySelectorModalRef.content.savePropertySelection.subscribe( (properties: IManagedObject[]) => { - this.properties = this.properties.concat( - this.removeSelectedProperties(properties) - ); + this.properties = this.properties.concat(this.removeSelectedProperties(properties)); this.isAtleastOnePropertySelected = true; this.config.properties = this.properties; this.properties.forEach((property, index) => { - if(property.computed && property.config && !(property.config.dp?.length>0 || property.config.type)){ - this.config.properties[index].config = {...this.config.properties[index].config, ...{id:String(Math.random()).substr(2)}}; + if ( + property.computed && + property.config && + !(property.config.dp?.length > 0 || property.config.type) + ) { + this.config.properties[index].config = { + ...this.config.properties[index].config, + ...{ id: String(Math.random()).substr(2) } + }; this.configureComputedProperty(index); } }); @@ -134,38 +90,12 @@ export class AssetPropertiesSelectorComponent implements OnChanges { } ); } - constructCustomProperties(properties: IManagedObject[]) { - this.properties.forEach((property) => { - if (this.isComplexProperty(property)) { - const customProperties = - property.c8y_JsonSchema.properties[property.name] - ?.properties; - const tempCustomProperties = {}; - for (const key in customProperties) { - if (customProperties[key].active === true) { - tempCustomProperties[key] = customProperties[key]; - } - const complexPropertyValue = properties.find( - (property) => property.name === customProperties[key].name - ); - tempCustomProperties[key] = complexPropertyValue; - } - if (!isEmpty(tempCustomProperties)) { - property.c8y_JsonSchema.properties[ - property.name - ].properties = tempCustomProperties; - } - } - }); - } isComplexProperty(prop) { if (!prop.c8y_JsonSchema) { return false; } - return ( - prop.c8y_JsonSchema.properties[prop.name]?.type === 'object' - ); + return prop.c8y_JsonSchema.properties[prop.name]?.type === 'object'; } removeSelectedProperties(properties) { @@ -210,19 +140,16 @@ export class AssetPropertiesSelectorComponent implements OnChanges { moveItemInArray(this.properties, event.previousIndex, event.currentIndex); } - configureComputedProperty(index){ + configureComputedProperty(index) { this.selectedComputedPropertyIndex = index; - this.computedPropertyConfigModalRef = this.modalService.show( - ComputedPropertyConfigComponent, - { - backdrop: 'static', - initialState: { - title: gettext('Computed property configuration'), - property: this.properties[index], - index: index - }, + this.computedPropertyConfigModalRef = this.modalService.show(ComputedPropertyConfigComponent, { + backdrop: 'static', + initialState: { + title: gettext('Computed property configuration'), + property: this.properties[index], + index: index } - ); + }); this.computedPropertyConfigModalRef.content.savePropertyConfiguration.subscribe( (object: any) => { this.config.properties[object.index] = object.property; @@ -230,8 +157,13 @@ export class AssetPropertiesSelectorComponent implements OnChanges { ); this.computedPropertyConfigModalRef.content.cancelPropertyConfiguration.subscribe( (index: number) => { - if(!(this.config.properties[index].config.dp?.length>0 || this.config.properties[index].config.type)){ - this.config.properties.splice(index, 1); + if ( + !( + this.config.properties[index].config.dp?.length > 0 || + this.config.properties[index].config.type + ) + ) { + this.config.properties.splice(index, 1); } } ); From 156db3cb76e6ee95d1e5a2bd8aafe9d4cba780af Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Mon, 18 Mar 2024 17:16:59 +0530 Subject: [PATCH 22/34] removed setTimeOut --- .../asset-properties-view.component.ts | 180 +++++++++--------- 1 file changed, 89 insertions(+), 91 deletions(-) diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index 4e4e54e..5102797 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -45,99 +45,97 @@ export class AssetPropertiesViewComponent implements OnInit { if (this.config.device) { try { this.selectedAsset = (await this.inventoryService.detail(this.config.device.id)).data; - setTimeout(async () => { - // eslint-disable-next-line no-prototype-builtins - if (this.selectedAsset.hasOwnProperty('c8y_IsAsset')) { - this.customProperties = await this.assetPropertiesService.getCustomProperties( - this.selectedAsset - ); - this.properties = this.config.properties.filter(property => { - if ( - property.isExistingProperty || - (this.customProperties.length != 0 && - this.customProperties.find(prop => prop.id === property.id)) || - this.validateComplexProperty(property) - ) { - return property; - } - }); - this.config.properties = cloneDeep(this.properties); - } else { - this.properties = cloneDeep(this.config.properties); - this.customProperties = cloneDeep(devicePropertiesBaseObject); - } - this.constructComplexPropertyKeys(); - this.config.properties.forEach(property => { - if (property.computed && property.active) { - switch (property.name) { - case 'alarmCountToday': - this.getAlarmCount( - this.config.device, - property, - this.datePipe.transform(new Date(), 'yyyy-MM-dd') - ); - break; - case 'alarmCount3Months': - this.getAlarmCount( - this.config.device, - property, - this.datePipe.transform( - new Date().setMonth(new Date().getMonth() - 3), - 'yyyy-MM-dd' - ) - ); - break; - case 'eventCountToday': - this.getEventCount( - this.config.device, - property, - this.datePipe.transform(new Date(), 'yyyy-MM-dd') - ); - break; - case 'eventCount3Months': - this.getEventCount( - this.config.device, - property, - this.datePipe.transform( - new Date().setMonth(new Date().getMonth() - 3), - 'yyyy-MM-dd' - ) - ); - break; - case 'lastMeasurement': - this.getLastMeasurement(property); - break; - case 'lastDeviceMessage': - if ( - !this.selectedAsset.c8y_Availability || - !this.selectedAsset.c8y_Availability.lastMessage - ) { - this.assetPropertiesViewService.getLastDeviceMessage(this.config.device); - this.assetPropertiesViewService.dateSet$.subscribe((dateSet: Set) => { - const maxDate = this.datePipe.transform( - Math.max( - ...Array.from(dateSet).map(dateString => new Date(dateString).getTime()) - ), - 'yyyy-MM-ddThh:mm:ssZZZZZ' - ); - this.computedPropertyObject = { - ...this.computedPropertyObject, - ...{ ['lastDeviceMessage']: maxDate } - }; - }); - } - break; - case 'configurationSnapshot': - this.getConfigurationSnapshot(this.selectedAsset); - break; - default: - break; - } + // eslint-disable-next-line no-prototype-builtins + if (this.selectedAsset.hasOwnProperty('c8y_IsAsset')) { + this.customProperties = await this.assetPropertiesService.getCustomProperties( + this.selectedAsset + ); + this.properties = this.config.properties.filter(property => { + if ( + property.isExistingProperty || + (this.customProperties.length != 0 && + this.customProperties.find(prop => prop.id === property.id)) || + this.validateComplexProperty(property) + ) { + return property; } }); - this.handleRealtime(); - this.isLoading = false; - }, 1000); + this.config.properties = cloneDeep(this.properties); + } else { + this.properties = cloneDeep(this.config.properties); + this.customProperties = cloneDeep(devicePropertiesBaseObject); + } + this.constructComplexPropertyKeys(); + this.config.properties.forEach(property => { + if (property.computed && property.active) { + switch (property.name) { + case 'alarmCountToday': + this.getAlarmCount( + this.config.device, + property, + this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ); + break; + case 'alarmCount3Months': + this.getAlarmCount( + this.config.device, + property, + this.datePipe.transform( + new Date().setMonth(new Date().getMonth() - 3), + 'yyyy-MM-dd' + ) + ); + break; + case 'eventCountToday': + this.getEventCount( + this.config.device, + property, + this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ); + break; + case 'eventCount3Months': + this.getEventCount( + this.config.device, + property, + this.datePipe.transform( + new Date().setMonth(new Date().getMonth() - 3), + 'yyyy-MM-dd' + ) + ); + break; + case 'lastMeasurement': + this.getLastMeasurement(property); + break; + case 'lastDeviceMessage': + if ( + !this.selectedAsset.c8y_Availability || + !this.selectedAsset.c8y_Availability.lastMessage + ) { + this.assetPropertiesViewService.getLastDeviceMessage(this.config.device); + this.assetPropertiesViewService.dateSet$.subscribe((dateSet: Set) => { + const maxDate = this.datePipe.transform( + Math.max( + ...Array.from(dateSet).map(dateString => new Date(dateString).getTime()) + ), + 'yyyy-MM-ddThh:mm:ssZZZZZ' + ); + this.computedPropertyObject = { + ...this.computedPropertyObject, + ...{ ['lastDeviceMessage']: maxDate } + }; + }); + } + break; + case 'configurationSnapshot': + this.getConfigurationSnapshot(this.selectedAsset); + break; + default: + break; + } + } + }); + this.handleRealtime(); + this.isLoading = false; } catch (error) { this.isEmptyWidget = true; } From 75802a0feeaedc07cdc49d9deac4f688fd02d020 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Mon, 18 Mar 2024 17:32:29 +0530 Subject: [PATCH 23/34] unit test fixes --- .../asset-properties-view.component.spec.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts index 9075fe9..3ab048c 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts @@ -393,7 +393,6 @@ describe('AssetPropertiesViewComponent', () => { await component.ngOnInit(); // then - jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); expect(component.config.properties).toEqual(customPropertyObjects); @@ -411,7 +410,6 @@ describe('AssetPropertiesViewComponent', () => { await component.ngOnInit(); // then - jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); expect(component.properties).toEqual(constructedComplexProperty); @@ -443,7 +441,6 @@ describe('AssetPropertiesViewComponent', () => { await component.ngOnInit(); // then - jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(deviceMO); expect(component.properties[0].isNestedComplexProperty).toBe(true); @@ -643,7 +640,6 @@ describe('AssetPropertiesViewComponent', () => { await component.ngOnInit(); // then - jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); await Promise.resolve(); @@ -665,7 +661,6 @@ describe('AssetPropertiesViewComponent', () => { await component.ngOnInit(); // then - jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); await Promise.resolve(); @@ -694,7 +689,6 @@ describe('AssetPropertiesViewComponent', () => { await component.ngOnInit(); // then - jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); await Promise.resolve(); @@ -717,7 +711,6 @@ describe('AssetPropertiesViewComponent', () => { await component.ngOnInit(); // then - jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(asset); expect(spyOnGetLastDeviceMessage).toBeCalledTimes(1); @@ -747,7 +740,6 @@ describe('AssetPropertiesViewComponent', () => { await component.ngOnInit(); // then - jest.runAllTimers(); await Promise.resolve(); expect(component.selectedAsset).toEqual(deviceMO); await Promise.resolve(); From 1632d822c780dede704c2972a00eb72ed1117614 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Fri, 22 Mar 2024 14:32:36 +0530 Subject: [PATCH 24/34] Handling Null/Undefined Values in Properties --- .../common/asset-property-constant.ts | 25 ++++++++--- .../asset-properties-view.component.html | 2 +- .../asset-properties-item.component.html | 42 ++++++------------- .../asset-properties-item.component.ts | 25 ++++++----- .../asset-properties.component.html | 5 ++- .../asset-properties.component.ts | 11 ++--- .../asset-properties.model.ts | 1 + 7 files changed, 56 insertions(+), 55 deletions(-) diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index df522a9..706f17e 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -214,6 +214,7 @@ export const devicePropertiesBaseObject = [ label: 'Active alarms status', type: 'object', isEditable: false, + isExistingProperty: true, name: 'c8y_ActiveAlarmsStatus', c8y_JsonSchema: { properties: { @@ -247,6 +248,7 @@ export const devicePropertiesBaseObject = [ label: 'Address', type: 'object', isEditable: true, + isExistingProperty: true, name: 'c8y_Address', c8y_JsonSchema: { properties: { @@ -288,6 +290,7 @@ export const devicePropertiesBaseObject = [ label: 'Agent', type: 'object', isEditable: true, + isExistingProperty: true, name: 'c8y_Agent', c8y_JsonSchema: { properties: { @@ -321,6 +324,7 @@ export const devicePropertiesBaseObject = [ label: 'Availability', type: 'object', isEditable: false, + isExistingProperty: true, name: 'c8y_Availability', c8y_JsonSchema: { properties: { @@ -347,6 +351,7 @@ export const devicePropertiesBaseObject = [ label: 'Connection', type: 'object', isEditable: false, + isExistingProperty: true, name: 'c8y_Connection', c8y_JsonSchema: { properties: { @@ -368,6 +373,7 @@ export const devicePropertiesBaseObject = [ label: 'Communication mode', type: 'object', isEditable: true, + isExistingProperty: true, name: 'c8y_CommunicationMode', c8y_JsonSchema: { properties: { @@ -389,6 +395,7 @@ export const devicePropertiesBaseObject = [ label: 'Firmware', type: 'object', isEditable: false, + isExistingProperty: true, name: 'c8y_Firmware', c8y_JsonSchema: { properties: { @@ -422,6 +429,7 @@ export const devicePropertiesBaseObject = [ label: 'Hardware', type: 'object', isEditable: true, + isExistingProperty: true, name: 'c8y_Hardware', c8y_JsonSchema: { properties: { @@ -451,6 +459,7 @@ export const devicePropertiesBaseObject = [ label: 'LPWAN device', type: 'object', isEditable: false, + isExistingProperty: true, name: 'c8y_LpwanDevice', c8y_JsonSchema: { properties: { @@ -472,6 +481,7 @@ export const devicePropertiesBaseObject = [ label: 'Mobile', type: 'object', isEditable: true, + isExistingProperty: true, name: 'c8y_Mobile', c8y_JsonSchema: { properties: { @@ -563,6 +573,11 @@ export const devicePropertiesBaseObject = [ } }, { + name: 'c8y_Notes', + label: 'Notes', + type: 'string', + isEditable: true, + isExistingProperty: true, c8y_JsonSchema: { properties: { c8y_Notes: { @@ -573,16 +588,13 @@ export const devicePropertiesBaseObject = [ } } } - }, - name: 'c8y_Notes', - label: 'Notes', - type: 'string', - isEditable: true + } }, { label: 'Position', type: 'object', isEditable: true, + isExistingProperty: true, name: 'c8y_Position', c8y_JsonSchema: { properties: { @@ -612,6 +624,7 @@ export const devicePropertiesBaseObject = [ label: 'Required availability', type: 'object', isEditable: true, + isExistingProperty: true, name: 'c8y_RequiredAvailability', c8y_JsonSchema: { properties: { @@ -637,6 +650,7 @@ export const devicePropertiesBaseObject = [ label: 'Software', type: 'object', isEditable: false, + isExistingProperty: true, name: 'c8y_Software', c8y_JsonSchema: { properties: { @@ -666,6 +680,7 @@ export const devicePropertiesBaseObject = [ label: 'Network', type: 'object', isEditable: true, + isExistingProperty: true, name: 'c8y_Network', c8y_JsonSchema: { properties: { diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html index 2e214d8..0655045 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html @@ -7,7 +7,7 @@ class="d-contents" >
- {{ "No Data" | translate }} + {{ 'No data' | translate }}
diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.html b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.html index 771f72d..eba208f 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.html +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.html @@ -1,6 +1,7 @@ + - {{ (value | c8yDate : "fullDate") || ("Undefined" | translate) }} + {{ (value | c8yDate : 'fullDate') || (defaultEmptyValue | translate) }} @@ -23,21 +24,19 @@ - {{ "No file attached." | translate }} + {{ 'No file attached.' | translate }}
    -
@@ -58,43 +57,28 @@ > {{ prop.label | translate }} - + - -

- {{ value !== null ? value : ("Undefined" | translate) }} + +

+ {{ value != null ? value : (defaultEmptyValue | translate) }}

-

- {{ (value | translate) || ("Undefined" | translate) }} +

+ {{ (value | translate) || (defaultEmptyValue | translate) }}

- + diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.ts index 6876239..face7bf 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.ts @@ -1,12 +1,7 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { FormControl, FormGroup, ValidationErrors } from '@angular/forms'; import { IManagedObjectBinary } from '@c8y/client'; -import { - AlertService, - C8yJSONSchema, - gettext, - FilesService, -} from '@c8y/ngx-components'; +import { AlertService, C8yJSONSchema, gettext, FilesService } from '@c8y/ngx-components'; import { FormlyFieldConfig } from '@ngx-formly/core'; import { AssetPropertiesItem } from './asset-properties.model'; import { JSONSchema7 } from 'json-schema'; @@ -19,7 +14,7 @@ export class MaxLengthValidator { return null; } if (control.value.length > maxLength) { - control.setValue(control.value.substring(0, maxLength)); + control.setValue(control.value.substring(0, maxLength)); } return null; }; @@ -28,11 +23,9 @@ export class MaxLengthValidator { @Component({ selector: 'c8y-asset-properties-item', - templateUrl: './asset-properties-item.component.html', + templateUrl: './asset-properties-item.component.html' }) -export class AssetPropertiesItemComponent - implements AssetPropertiesItem, OnChanges -{ +export class AssetPropertiesItemComponent implements AssetPropertiesItem, OnChanges { @Input() key: string; @Input() @@ -55,11 +48,14 @@ export class AssetPropertiesItemComponent isEditable: boolean; @Input() active: boolean; + @Input() + isExistingProperty: boolean; form: FormGroup; fields: FormlyFieldConfig[]; model: any; previewImage: string; + defaultEmptyValue: string; constructor( private alert: AlertService, @@ -72,6 +68,7 @@ export class AssetPropertiesItemComponent this.resolveJsonSchema(); await this.resolveFile(); } + this.defaultEmptyValue = this.isExistingProperty ? 'No data' : 'Undefined'; } private async resolveFile() { @@ -114,8 +111,10 @@ export class AssetPropertiesItemComponent const fieldConfig = this.c8yJsonSchemaService.toFieldConfig(this.jsonSchema as JSONSchema7, { map(mappedField: FormlyFieldConfig) { const result: FormlyFieldConfig = mappedField; - if(mappedField.key === 'name'){ - mappedField.validators = {...{validation: [MaxLengthValidator.maxLength(assetNameMaxLength)]}}; + if (mappedField.key === 'name') { + mappedField.validators = { + ...{ validation: [MaxLengthValidator.maxLength(assetNameMaxLength)] } + }; } return result; } diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.html b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.html index 29dcd5b..7069741 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.html +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.html @@ -43,6 +43,7 @@ [complex]="prop.complex" [isEdit]="prop.isEdit" [jsonSchema]="prop.jsonSchema" + [isExistingProperty]="prop.isExistingProperty" >
- {{ "Cancel" | translate }} + {{ 'Cancel' | translate }}
diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts index 3cabe35..f6a2754 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.ts @@ -154,7 +154,8 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { jsonSchema: mo.c8y_JsonSchema, lastUpdated: mo.lastUpdated, isEditable: mo.isEditable, - active: properties[key].active as boolean + active: properties[key].active as boolean, + isExistingProperty: mo.isExistingProperty }); } } @@ -271,7 +272,7 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { value = asset.c8y_Availability?.lastMessage ?? this.computedPropertyObject?.[mo.name] ?? - 'Undefined'; + 'No data'; break; case 'lastMeasurement': value = this.computedPropertyObject @@ -279,7 +280,7 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { this.computedPropertyObject[`${mo.name}_${mo.config.id}`], mo.config.resultTypes ) - : 'Undefined'; + : 'No data'; break; case 'childDevicesCount': value = asset.childDevices.references.length; @@ -288,10 +289,10 @@ export class AssetPropertiesComponent implements OnChanges, OnInit { value = asset.childAssets.references.length; break; case 'configurationSnapshot': - value = this.computedPropertyObject?.[mo.name] ?? 'Undefined'; + value = this.computedPropertyObject?.[mo.name] ?? 'No data'; break; default: - value = 'Undefined'; + value = 'No data'; break; } return value; diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.model.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.model.ts index e79a8e3..ab723b1 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.model.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.model.ts @@ -14,4 +14,5 @@ export interface AssetPropertiesItem { lastUpdated: string; isEditable: boolean; active: boolean; + isExistingProperty: boolean; } From 0d3c212fc5f7c045edc2a13702412606d5e69e6c Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Mon, 25 Mar 2024 10:08:31 +0530 Subject: [PATCH 25/34] Updated version from 1.0.2 to 1.1.0 to reflect the addition of features related to device properties. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 176c3bd..7e8e6b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cumulocity-asset-properties-widget-plugin", - "version": "1.0.2", + "version": "1.1.0", "description": "Asset properties", "author": "Amarjyoti Raj - Software AG, IOT-Apps R&D", "license": "Apache 2.0", From 312453ff654994b00905f1fc11285cb3787deb72 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Tue, 26 Mar 2024 14:39:24 +0530 Subject: [PATCH 26/34] The property label 'Asset model' has been renamed to 'Type'. --- asset-properties-widget/common/asset-property-constant.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index 706f17e..d298973 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -21,10 +21,10 @@ export const defaultProperty = [ }, { c8y_JsonSchema: { - properties: { type: { type: 'string', label: 'Asset model' } } + properties: { type: { type: 'string', label: 'Type' } } }, name: 'type', - label: 'Asset model', + label: 'Type', type: 'string', active: true, isEditable: false, From 489c50b8d680340b4517f9dd1d74f31a5b641c4c Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Tue, 26 Mar 2024 15:13:30 +0530 Subject: [PATCH 27/34] The property label 'Asset model' has been renamed to 'Type'. --- .../asset-properties-config.component.spec.ts | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts index 409d4af..1719704 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts @@ -15,26 +15,26 @@ describe('AssetPropertiesConfigComponent', () => { properties = [ { c8y_JsonSchema: { - properties: { name: { type: 'string', label: 'Name' } }, + properties: { name: { type: 'string', label: 'Name' } } }, name: 'name', label: 'Name', type: 'string', active: true, isEditable: true, - isExistingProperty: true, + isExistingProperty: true }, { c8y_JsonSchema: { - properties: { type: { type: 'string', label: 'Asset model' } }, + properties: { type: { type: 'string', label: 'Type' } } }, name: 'type', - label: 'Asset model', + label: 'Type', type: 'string', active: true, isEditable: false, - isExistingProperty: true, - }, + isExistingProperty: true + } ]; asset = { id: 12, @@ -44,18 +44,18 @@ describe('AssetPropertiesConfigComponent', () => { city: 'Düsseldorf', street: 'Toulouser Allee', postalCode: 40211, - apartmentNumber: '25', + apartmentNumber: '25' }, fileTest: [ { file: new File([new Blob(['some content'])], 'values.json', { - type: 'application/JSON', - }), - }, + type: 'application/JSON' + }) + } ], nameTest: 'test123', dateTest1: date.toISOString(), - dateTest2: '', + dateTest2: '' } as any as IManagedObject; deviceMO = { id: '674366', @@ -73,7 +73,7 @@ describe('AssetPropertiesConfigComponent', () => { c8y_ActiveAlarmsStatus: { critical: 3, major: 2, minor: 0, warning: 0 }, c8y_IsDevice: {}, c8y_SupportedOperations: [], - c8y_Position: { lng: 5, alt: 5, lat: null }, + c8y_Position: { lng: 5, alt: 5, lat: null } }; }); @@ -84,9 +84,7 @@ describe('AssetPropertiesConfigComponent', () => { it('should get selected asset MOs', async () => { // given component.config = { settings: true, device: asset }; - jest - .spyOn(inventoryServiceMock, 'detail') - .mockReturnValue(Promise.resolve({ data: asset })); + jest.spyOn(inventoryServiceMock, 'detail').mockReturnValue(Promise.resolve({ data: asset })); // when await component.ngOnChanges(); @@ -98,9 +96,7 @@ describe('AssetPropertiesConfigComponent', () => { it('should not retrieve device MOs if the device is selected', async () => { // given component.config = { settings: true, device: deviceMO }; - jest - .spyOn(inventoryServiceMock, 'detail') - .mockReturnValue(Promise.resolve({ data: deviceMO })); + jest.spyOn(inventoryServiceMock, 'detail').mockReturnValue(Promise.resolve({ data: deviceMO })); // when await component.ngOnChanges(); From f0627e2277908b2832525ca0d70825c10fac0dfa Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Wed, 27 Mar 2024 13:12:20 +0530 Subject: [PATCH 28/34] incorporate PR comment. --- .../common/asset-property-constant.ts | 58 +++++++++---------- .../asset-properties-config.component.spec.ts | 4 +- .../asset-properties-view.component.spec.ts | 14 ++--- .../asset-properties-view.component.ts | 11 ++-- .../asset-properties-view.service.ts | 4 +- .../asset-properties-item.component.html | 4 +- .../asset-properties-item.component.ts | 4 +- .../asset-properties.component.html | 2 +- .../asset-properties.component.ts | 2 +- .../asset-properties.model.ts | 2 +- 10 files changed, 55 insertions(+), 50 deletions(-) diff --git a/asset-properties-widget/common/asset-property-constant.ts b/asset-properties-widget/common/asset-property-constant.ts index d298973..5f5e3f9 100644 --- a/asset-properties-widget/common/asset-property-constant.ts +++ b/asset-properties-widget/common/asset-property-constant.ts @@ -8,7 +8,7 @@ export const defaultProperty = [ type: 'string', active: true, isEditable: true, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { properties: { id: { type: 'string', label: 'ID' } } }, @@ -17,7 +17,7 @@ export const defaultProperty = [ type: 'string', active: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -28,7 +28,7 @@ export const defaultProperty = [ type: 'string', active: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -38,7 +38,7 @@ export const defaultProperty = [ label: 'Owner', type: 'string', isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -48,7 +48,7 @@ export const defaultProperty = [ label: 'Last updated', type: 'string', isEditable: false, - isExistingProperty: true + isStandardProperty: true } ]; @@ -69,7 +69,7 @@ export const computedPropertiesBaseObject = [ config: { type: '' }, computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -87,7 +87,7 @@ export const computedPropertiesBaseObject = [ config: { type: '' }, computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -105,7 +105,7 @@ export const computedPropertiesBaseObject = [ config: { type: '' }, computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -123,7 +123,7 @@ export const computedPropertiesBaseObject = [ config: { type: '' }, computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -140,7 +140,7 @@ export const computedPropertiesBaseObject = [ config: { dp: [], isValid: null, resultTypes: 1 }, computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -156,7 +156,7 @@ export const computedPropertiesBaseObject = [ type: 'number', computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -172,7 +172,7 @@ export const computedPropertiesBaseObject = [ type: 'number', computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -189,7 +189,7 @@ export const computedPropertiesBaseObject = [ type: 'string', computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -205,7 +205,7 @@ export const computedPropertiesBaseObject = [ type: 'string', computed: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true } ]; @@ -214,7 +214,7 @@ export const devicePropertiesBaseObject = [ label: 'Active alarms status', type: 'object', isEditable: false, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_ActiveAlarmsStatus', c8y_JsonSchema: { properties: { @@ -248,7 +248,7 @@ export const devicePropertiesBaseObject = [ label: 'Address', type: 'object', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Address', c8y_JsonSchema: { properties: { @@ -290,7 +290,7 @@ export const devicePropertiesBaseObject = [ label: 'Agent', type: 'object', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Agent', c8y_JsonSchema: { properties: { @@ -324,7 +324,7 @@ export const devicePropertiesBaseObject = [ label: 'Availability', type: 'object', isEditable: false, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Availability', c8y_JsonSchema: { properties: { @@ -351,7 +351,7 @@ export const devicePropertiesBaseObject = [ label: 'Connection', type: 'object', isEditable: false, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Connection', c8y_JsonSchema: { properties: { @@ -373,7 +373,7 @@ export const devicePropertiesBaseObject = [ label: 'Communication mode', type: 'object', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_CommunicationMode', c8y_JsonSchema: { properties: { @@ -395,7 +395,7 @@ export const devicePropertiesBaseObject = [ label: 'Firmware', type: 'object', isEditable: false, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Firmware', c8y_JsonSchema: { properties: { @@ -429,7 +429,7 @@ export const devicePropertiesBaseObject = [ label: 'Hardware', type: 'object', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Hardware', c8y_JsonSchema: { properties: { @@ -459,7 +459,7 @@ export const devicePropertiesBaseObject = [ label: 'LPWAN device', type: 'object', isEditable: false, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_LpwanDevice', c8y_JsonSchema: { properties: { @@ -481,7 +481,7 @@ export const devicePropertiesBaseObject = [ label: 'Mobile', type: 'object', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Mobile', c8y_JsonSchema: { properties: { @@ -577,7 +577,7 @@ export const devicePropertiesBaseObject = [ label: 'Notes', type: 'string', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, c8y_JsonSchema: { properties: { c8y_Notes: { @@ -594,7 +594,7 @@ export const devicePropertiesBaseObject = [ label: 'Position', type: 'object', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Position', c8y_JsonSchema: { properties: { @@ -624,7 +624,7 @@ export const devicePropertiesBaseObject = [ label: 'Required availability', type: 'object', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_RequiredAvailability', c8y_JsonSchema: { properties: { @@ -650,7 +650,7 @@ export const devicePropertiesBaseObject = [ label: 'Software', type: 'object', isEditable: false, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Software', c8y_JsonSchema: { properties: { @@ -680,7 +680,7 @@ export const devicePropertiesBaseObject = [ label: 'Network', type: 'object', isEditable: true, - isExistingProperty: true, + isStandardProperty: true, name: 'c8y_Network', c8y_JsonSchema: { properties: { diff --git a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts index 1719704..28d07da 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts +++ b/asset-properties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts @@ -22,7 +22,7 @@ describe('AssetPropertiesConfigComponent', () => { type: 'string', active: true, isEditable: true, - isExistingProperty: true + isStandardProperty: true }, { c8y_JsonSchema: { @@ -33,7 +33,7 @@ describe('AssetPropertiesConfigComponent', () => { type: 'string', active: true, isEditable: false, - isExistingProperty: true + isStandardProperty: true } ]; asset = { diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts index 3ab048c..b431757 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts @@ -465,7 +465,7 @@ describe('AssetPropertiesViewComponent', () => { config: { id: '8005633676046595', type: 'test' }, computed: true, isEditable: false, - isExistingProperty: true, + isStandardProperty: true, active: true }, { @@ -484,7 +484,7 @@ describe('AssetPropertiesViewComponent', () => { config: { id: '8005633676046596', type: 'test' }, computed: true, isEditable: false, - isExistingProperty: true, + isStandardProperty: true, active: true }, { @@ -503,7 +503,7 @@ describe('AssetPropertiesViewComponent', () => { config: { id: '8005633676046597', type: 'test' }, computed: true, isEditable: false, - isExistingProperty: true, + isStandardProperty: true, active: true }, { @@ -522,7 +522,7 @@ describe('AssetPropertiesViewComponent', () => { config: { id: '8005633676046598', type: 'test' }, computed: true, isEditable: false, - isExistingProperty: true, + isStandardProperty: true, active: true }, { @@ -558,7 +558,7 @@ describe('AssetPropertiesViewComponent', () => { }, computed: true, isEditable: false, - isExistingProperty: true, + isStandardProperty: true, active: true }, { @@ -576,7 +576,7 @@ describe('AssetPropertiesViewComponent', () => { type: 'string', computed: true, isEditable: false, - isExistingProperty: true, + isStandardProperty: true, active: true }, { @@ -593,7 +593,7 @@ describe('AssetPropertiesViewComponent', () => { type: 'string', computed: true, isEditable: false, - isExistingProperty: true, + isStandardProperty: true, active: true } ]; diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index 5102797..b2a8b92 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -30,6 +30,7 @@ export class AssetPropertiesViewComponent implements OnInit { @Input() config: any; computedPropertyObject: ComputedPropertyObject; isLoading = true; + dateTimeWithTimeZone = 'yyyy-MM-ddThh:mm:ssZZZZZ'; constructor( protected inventoryService: InventoryService, @@ -52,7 +53,7 @@ export class AssetPropertiesViewComponent implements OnInit { ); this.properties = this.config.properties.filter(property => { if ( - property.isExistingProperty || + property.isStandardProperty || (this.customProperties.length != 0 && this.customProperties.find(prop => prop.id === property.id)) || this.validateComplexProperty(property) @@ -117,7 +118,7 @@ export class AssetPropertiesViewComponent implements OnInit { Math.max( ...Array.from(dateSet).map(dateString => new Date(dateString).getTime()) ), - 'yyyy-MM-ddThh:mm:ssZZZZZ' + this.dateTimeWithTimeZone ); this.computedPropertyObject = { ...this.computedPropertyObject, @@ -143,11 +144,12 @@ export class AssetPropertiesViewComponent implements OnInit { } async getAlarmCount(device: IManagedObject, property: IManagedObject, dateFrom: string) { + // By incrementing the dateTo parameter by 1 day, this code aims to mitigate timezone-related inconsistencies. const filters = { dateFrom: dateFrom, dateTo: this.datePipe.transform( new Date().setDate(new Date().getDate() + 1), - 'yyyy-MM-ddThh:mm:ssZZZZZ' + this.dateTimeWithTimeZone ), source: device.id, pageSize: 2000, @@ -173,11 +175,12 @@ export class AssetPropertiesViewComponent implements OnInit { } async getEventCount(device: IManagedObject, property: IManagedObject, dateFrom: string) { + // By incrementing the dateTo parameter by 1 day, this code aims to mitigate timezone-related inconsistencies. const filters = { dateFrom: dateFrom, dateTo: this.datePipe.transform( new Date().setDate(new Date().getDate() + 1), - 'yyyy-MM-ddThh:mm:ssZZZZZ' + this.dateTimeWithTimeZone ), source: device.id, pageSize: 2000, diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts index f3f022b..5015395 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts @@ -78,11 +78,13 @@ export class AssetPropertiesViewService { } async getLastDeviceMessage(device: IManagedObject) { + // By incrementing the dateTo parameter by 1 day, this code aims to mitigate timezone-related inconsistencies. + const dateTimeWithTimeZone = 'yyyy-MM-ddThh:mm:ssZZZZZ'; const filters = { dateFrom: this.DEFAULT_FROM_DATE, dateTo: this.datePipe.transform( new Date().setDate(new Date().getDate() + 1), - 'yyyy-MM-ddThh:mm:ssZZZZZ' + dateTimeWithTimeZone ), source: device.id, pageSize: 2000 diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.html b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.html index eba208f..399766b 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.html +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.html @@ -36,7 +36,7 @@ @@ -63,7 +63,7 @@ [key]="prop.key" [type]="prop.type" [value]="prop.value" - [isExistingProperty]="prop.isExistingProperty" + [isStandardProperty]="prop.isStandardProperty" > diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.ts index face7bf..5b9493b 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties-item.component.ts @@ -49,7 +49,7 @@ export class AssetPropertiesItemComponent implements AssetPropertiesItem, OnChan @Input() active: boolean; @Input() - isExistingProperty: boolean; + isStandardProperty: boolean; form: FormGroup; fields: FormlyFieldConfig[]; @@ -68,7 +68,7 @@ export class AssetPropertiesItemComponent implements AssetPropertiesItem, OnChan this.resolveJsonSchema(); await this.resolveFile(); } - this.defaultEmptyValue = this.isExistingProperty ? 'No data' : 'Undefined'; + this.defaultEmptyValue = this.isStandardProperty ? 'No data' : 'Undefined'; } private async resolveFile() { diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.html b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.html index 7069741..c9d5224 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.html +++ b/asset-properties-widget/component/asset-properties-view/asset-properties/asset-properties.component.html @@ -43,7 +43,7 @@ [complex]="prop.complex" [isEdit]="prop.isEdit" [jsonSchema]="prop.jsonSchema" - [isExistingProperty]="prop.isExistingProperty" + [isStandardProperty]="prop.isStandardProperty" >
Date: Wed, 27 Mar 2024 13:35:31 +0530 Subject: [PATCH 29/34] incorporate PR comment. --- .../asset-properties-view.component.ts | 8 ++++---- .../asset-properties-view.service.ts | 7 ++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts index b2a8b92..032e69a 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.ts @@ -30,7 +30,7 @@ export class AssetPropertiesViewComponent implements OnInit { @Input() config: any; computedPropertyObject: ComputedPropertyObject; isLoading = true; - dateTimeWithTimeZone = 'yyyy-MM-ddThh:mm:ssZZZZZ'; + dateTimeFormat = 'yyyy-MM-ddThh:mm:ssZZZZZ'; constructor( protected inventoryService: InventoryService, @@ -118,7 +118,7 @@ export class AssetPropertiesViewComponent implements OnInit { Math.max( ...Array.from(dateSet).map(dateString => new Date(dateString).getTime()) ), - this.dateTimeWithTimeZone + this.dateTimeFormat ); this.computedPropertyObject = { ...this.computedPropertyObject, @@ -149,7 +149,7 @@ export class AssetPropertiesViewComponent implements OnInit { dateFrom: dateFrom, dateTo: this.datePipe.transform( new Date().setDate(new Date().getDate() + 1), - this.dateTimeWithTimeZone + this.dateTimeFormat ), source: device.id, pageSize: 2000, @@ -180,7 +180,7 @@ export class AssetPropertiesViewComponent implements OnInit { dateFrom: dateFrom, dateTo: this.datePipe.transform( new Date().setDate(new Date().getDate() + 1), - this.dateTimeWithTimeZone + this.dateTimeFormat ), source: device.id, pageSize: 2000, diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts index 5015395..c6d6004 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.service.ts @@ -79,13 +79,10 @@ export class AssetPropertiesViewService { async getLastDeviceMessage(device: IManagedObject) { // By incrementing the dateTo parameter by 1 day, this code aims to mitigate timezone-related inconsistencies. - const dateTimeWithTimeZone = 'yyyy-MM-ddThh:mm:ssZZZZZ'; + const dateTimeFormat = 'yyyy-MM-ddThh:mm:ssZZZZZ'; const filters = { dateFrom: this.DEFAULT_FROM_DATE, - dateTo: this.datePipe.transform( - new Date().setDate(new Date().getDate() + 1), - dateTimeWithTimeZone - ), + dateTo: this.datePipe.transform(new Date().setDate(new Date().getDate() + 1), dateTimeFormat), source: device.id, pageSize: 2000 }; From 6957745cae845aa829a2acaac74c3b8fc3109e44 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Wed, 27 Mar 2024 14:04:36 +0530 Subject: [PATCH 30/34] Handled empty widget validation. --- .../asset-property-selector.component.html | 43 +++++++------------ .../asset-properties-view.component.html | 2 +- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html index df18684..f0845a5 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-selector/asset-property-selector.component.html @@ -1,5 +1,5 @@
- +
@@ -12,30 +12,24 @@ [disabled]="!asset" > - {{ "Add property" | translate }} + {{ 'Add property' | translate }}
-
- {{ "Add and select at least one property." | translate }} +
+ {{ 'Add and select at least one property.' | translate }}
@@ -69,13 +63,13 @@
- + - + - +
@@ -83,8 +77,8 @@
- + - + - +
@@ -96,10 +90,7 @@ /> - + {{ item.key | translate }} @@ -150,14 +141,10 @@ data-cy="asset-property-selector-config-computed-property-button" > - {{ - (property.name | translate) || - (property.keyPath?.join(".") | translate) - }} + {{ (property.name | translate) || (property.keyPath?.join('.') | translate) }} {{ - (property.name | translate) || - (property.keyPath?.join(".") | translate) + (property.name | translate) || (property.keyPath?.join('.') | translate) }} diff --git a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html index 0655045..04a9343 100644 --- a/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html +++ b/asset-properties-widget/component/asset-properties-view/asset-properties-view.component.html @@ -6,7 +6,7 @@ (assetChange)="assetChange($event)" class="d-contents" > -
+
{{ 'No data' | translate }}
From 6f1321bb944396ec810a8974aa3a70bf6631395b Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Wed, 27 Mar 2024 16:55:26 +0530 Subject: [PATCH 31/34] translate pipe added. --- .../asset-property-item-selector.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html index 97a2d80..3899b3c 100644 --- a/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html +++ b/asset-properties-widget/component/asset-properties-config/asset-property-item-selector/asset-property-item-selector.component.html @@ -85,7 +85,7 @@ > - {{ property.label ? property.label : (property.title | translate) }} + {{ property.label ? (property.label | translate) : (property.title | translate) }}
Date: Wed, 27 Mar 2024 17:05:40 +0530 Subject: [PATCH 32/34] translation key added for 'No data'. --- locales/de.po | 5 ++++- locales/en.po | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/locales/de.po b/locales/de.po index 9f0054d..7402b55 100644 --- a/locales/de.po +++ b/locales/de.po @@ -16,4 +16,7 @@ msgid "Select an asset from the list." msgstr "Ein Asset aus der Liste wählen." msgid "Add and select at least one property." -msgstr "Fügen Sie und hinzu Wählen Sie mindestens einen Attribut" \ No newline at end of file +msgstr "Fügen Sie und hinzu Wählen Sie mindestens einen Attribut" + +msgid "No data" +msgstr "Keine Daten" \ No newline at end of file diff --git a/locales/en.po b/locales/en.po index 34bcef7..d439380 100644 --- a/locales/en.po +++ b/locales/en.po @@ -14,3 +14,6 @@ msgstr "Select an asset from the list." msgid "Add and select at least one property." msgstr "Add and select at least one property." + +msgid "No data" +msgstr "No data" \ No newline at end of file From 1c992e9b62c2b90805ad39870c02242f3b20d94a Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Wed, 27 Mar 2024 18:40:19 +0530 Subject: [PATCH 33/34] added translation string. --- locales/de.po | 8 +++++++- locales/en.po | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/locales/de.po b/locales/de.po index 7402b55..d81995a 100644 --- a/locales/de.po +++ b/locales/de.po @@ -19,4 +19,10 @@ msgid "Add and select at least one property." msgstr "Fügen Sie und hinzu Wählen Sie mindestens einen Attribut" msgid "No data" -msgstr "Keine Daten" \ No newline at end of file +msgstr "Keine Daten" + +msgid "Asset Properties 2.0" +msgstr "Asset-Attribute 2.0" + +msgid "Editable form for asset properties widget" +msgstr "Editierbares Formular für Asset-Attribute Widget" \ No newline at end of file diff --git a/locales/en.po b/locales/en.po index d439380..85d4717 100644 --- a/locales/en.po +++ b/locales/en.po @@ -16,4 +16,10 @@ msgid "Add and select at least one property." msgstr "Add and select at least one property." msgid "No data" -msgstr "No data" \ No newline at end of file +msgstr "No data" + +msgid "Asset Properties 2.0" +msgstr "Asset Properties 2.0" + +msgid "Editable form for asset properties widget" +msgstr "Editable form for asset properties widget" \ No newline at end of file From 266e3cbad13d6dd0c0a7bd8d67ff479208bd2b60 Mon Sep 17 00:00:00 2001 From: "EUR\\y508925" Date: Wed, 27 Mar 2024 18:53:07 +0530 Subject: [PATCH 34/34] added translation pipe. --- .../last-measurement-config.component.html | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html index 550afc7..2944772 100644 --- a/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html +++ b/asset-properties-widget/component/asset-properties-config/computed-asset-property/properties/last-measurement-config.component.html @@ -12,16 +12,9 @@
- +