incorporate PR comment.

Cumulocity-IoT · Mar 27, 2024 · f0627e2 · f0627e2
1 parent 489c50b
commit f0627e2
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 50 deletions.
diff --git 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/...erties-widget/component/asset-properties-config/asset-properties-config.component.spec.ts b/...erties-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/...properties-widget/component/asset-properties-view/asset-properties-view.component.spec.ts b/...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
@@ -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,