@c8y/ngx-components 1023.43.3 → 1023.47.1

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

@@ -557,9 +557,9 @@ class EchartsOptionsService {
             },
             xAxis: {
                 min: Object.keys(aggregatedDatapoint.values || {}).length > 0
-                    ? Object.keys(aggregatedDatapoint.values || {})
+                    ? Math.min(Object.keys(aggregatedDatapoint.values)
                         .map(date => new Date(date).valueOf())
-                        .sort((a, b) => a - b)[0]
+                        .sort((a, b) => a - b)[0], new Date(timeRange.dateFrom).valueOf())
                     : new Date(timeRange.dateFrom).valueOf() - intervalInMs,
                 max: new Date(timeRange.dateTo).valueOf(),
                 type: 'time',
@@ -800,8 +800,9 @@ class EchartsOptionsService {
         const allDataPointSeries = allSeries.filter(series => series['typeOfSeries'] !== 'alarm' && series['typeOfSeries'] !== 'event');
         this.processSeries(allDataPointSeries, XAxisValue, YAxisReadings, displayOptions);
         // find event and alarm of the same type as the hovered markedLine or markedPoint
-        const event = allEvents.find(e => e.type === params.data.itemType);
-        const alarm = allAlarms.find(a => a.type === params.data.itemType);
+        const event = allEvents.find(e => e.type === params.data.itemType && params.data.value === e.time);
+        const alarm = allAlarms.find(a => a.type === params.data.itemType && params.data.value === a.lastUpdated) ??
+            allAlarms.find(a => a.type === params.data.itemType && params.data.value === a.creationTime); // fallback to creationTime for cleared alarms.
         let value = '';
         if (event) {
             value = this.processEvent(event, XAxisValue);