npm - @c8y/ngx-components - Versions diffs - 1024.20.1 → 1024.20.8 - Mend

@c8y/ngx-components 1024.20.1 → 1024.20.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

package/fesm2022/c8y-ngx-components-echart.mjs CHANGED Viewed

@@ -1746,83 +1746,46 @@ class EchartsOptionsService {
                 }
             ];
         }
-        return isCleared
-            ? [
-                {
-                    coord: coordCreationTime,
-                    name: item.type,
-                    itemType: item.type,
-                    itemStyle: {
-                        color: item['color']
-                    },
-                    symbol: 'circle',
-                    symbolSize: 24
-                },
-                {
-                    coord: coordCreationTime,
-                    name: item.type,
-                    itemType: item.type,
-                    itemStyle: { color: 'white' },
-                    symbol: ICONS_MAP[item.severity],
-                    symbolSize: 16
-                },
-                {
-                    coord: coordLastUpdatedTime,
-                    name: item.type,
-                    itemType: item.type,
-                    itemStyle: {
-                        color: item['color']
-                    },
-                    symbol: 'circle',
-                    symbolSize: 24
-                },
-                {
-                    coord: coordLastUpdatedTime,
-                    name: item.type,
-                    itemType: item.type,
-                    itemStyle: { color: 'white' },
-                    symbol: ICONS_MAP.CLEARED,
-                    symbolSize: 16
-                }
-            ]
-            : [
-                {
-                    coord: coordCreationTime,
-                    name: item.type,
-                    itemType: item.type,
-                    itemStyle: {
-                        color: item['color']
-                    },
-                    symbol: 'circle',
-                    symbolSize: 24
-                },
-                {
-                    coord: coordCreationTime,
-                    name: item.type,
-                    itemType: item.type,
-                    itemStyle: { color: 'white' },
-                    symbol: ICONS_MAP[item.severity],
-                    symbolSize: 16
-                },
-                {
-                    coord: coordLastUpdatedTime,
-                    name: item.type,
-                    itemType: item.type,
-                    itemStyle: {
-                        color: item['color']
-                    },
-                    symbol: 'circle',
-                    symbolSize: 24
-                },
-                {
-                    coord: coordLastUpdatedTime,
-                    name: item.type,
-                    itemType: item.type,
-                    itemStyle: { color: 'white' },
-                    symbol: ICONS_MAP[item.severity],
-                    symbolSize: 16
-                }
-            ];
+        const creationMarks = [
+            {
+                coord: coordCreationTime,
+                name: item.type,
+                itemType: item.type,
+                itemStyle: { color: item['color'] },
+                symbol: 'circle',
+                symbolSize: 24
+            },
+            {
+                coord: coordCreationTime,
+                name: item.type,
+                itemType: item.type,
+                itemStyle: { color: 'white' },
+                symbol: ICONS_MAP[item.severity],
+                symbolSize: 16
+            }
+        ];
+        if (!item['lastUpdated']) {
+            return creationMarks;
+        }
+        return [
+            ...creationMarks,
+            {
+                coord: coordLastUpdatedTime,
+                name: item.type,
+                itemType: item.type,
+                itemStyle: { color: item['color'] },
+                symbol: 'circle',
+                symbolSize: 24
+            },
+            {
+                coord: coordLastUpdatedTime,
+                name: item.type,
+                itemType: item.type,
+                itemStyle: { color: 'white' },
+                symbol: isCleared ? ICONS_MAP.CLEARED : ICONS_MAP[item.severity],
+                symbolSize: 16
+            }
+        ];
     }
     /**
      * This method creates a markLine on the chart which represents the line between every alarm or event on the chart.
@@ -1844,7 +1807,7 @@ class EchartsOptionsService {
                     }
                 ]);
             }
-            if (item.creationTime === item['lastUpdated']) {
+            if (!item['lastUpdated'] || item.creationTime === item['lastUpdated']) {
                 return acc.concat([
                     {
                         xAxis: item.creationTime,
@@ -2300,10 +2263,11 @@ class ChartRealtimeService {
                 if (!alarmOrEvent)
                     return;
                 const matchingConfig = activeAlarmsOrEvents.find(aOrE => aOrE.filters.type === alarmOrEvent.type && aOrE.__target?.id === alarmOrEvent.source?.id);
-                if (matchingConfig) {
-                    alarmOrEvent['color'] = matchingConfig.color;
-                    alarmOrEvent['selectedDatapoint'] = matchingConfig.selectedDatapoint;
+                if (!matchingConfig) {
+                    return;
                 }
+                alarmOrEvent['color'] = matchingConfig.color;
+                alarmOrEvent['selectedDatapoint'] = matchingConfig.selectedDatapoint;
                 if ('severity' in alarmOrEvent) {
                     // Alarm
                     const existingIdx = this.currentAlarms.findIndex(a => a.id === alarmOrEvent.id);