@c8y/ngx-components 1024.18.9 → 1024.18.13

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

@@ -9,6 +9,7 @@ import { CommonModule, FormsModule, IconDirective, C8yTranslatePipe, WidgetTimeC
 import chroma from 'chroma-js';
 import * as echarts from 'echarts';
 import * as i1 from '@ngx-translate/core';
+import { TranslateService } from '@ngx-translate/core';
 import * as i1$3 from '@c8y/client';
 import { AlarmStatus, aggregationType, MeasurementService } from '@c8y/client';
 import * as i6 from '@angular/router';
@@ -2747,7 +2748,10 @@ class ChartsComponent {
         this.mediator = inject(WidgetTimeContextMediatorService);
         this.widgetTimeContextDateRangeService = inject(WidgetTimeContextDateRangeService);
         this.themeSwitcherService = inject(ThemeSwitcherService);
+        this.translateService = inject(TranslateService);
         this.loadedTimeRange = null;
+        /** Range requested on the previous change, used to recognise a re-broadcast of it. */
+        this.lastRequestedTimeRange = null;
         /** Tracks if the last data fetch returned truncated data */
         this.dataWasTruncated = false;
         /** Tracks the aggregation interval used in the last fetch so we can detect
@@ -2841,10 +2845,15 @@ class ChartsComponent {
         }
         const wasFromZoom = this.isChangeFromZoom;
         this.isChangeFromZoom = false;
+        const requestedRange = this.getTimeRange();
+        const isSameRangeAsLastChange = !!this.lastRequestedTimeRange &&
+            this.lastRequestedTimeRange.dateFrom === requestedRange.dateFrom &&
+            this.lastRequestedTimeRange.dateTo === requestedRange.dateTo;
+        this.lastRequestedTimeRange = requestedRange;
         const configContentChanged = !isEqual(this.config, this.lastConfig);
         this.lastConfig = cloneDeep(this.config);
         if (wasFromZoom) {
-            const currentRange = this.getTimeRange();
+            const currentRange = requestedRange;
             const isWithinLoadedRange = this.loadedTimeRange &&
                 new Date(currentRange.dateFrom) >= new Date(this.loadedTimeRange.dateFrom) &&
                 new Date(currentRange.dateTo) <= new Date(this.loadedTimeRange.dateTo);
@@ -2873,6 +2882,7 @@ class ChartsComponent {
                 needsAutoAggregationRefetch = zoomedInterval !== this.lastAutoAggregationInterval;
             }
             if (!isWithinLoadedRange || this.dataWasTruncated || needsAutoAggregationRefetch) {
+                this.showLoadMore = false;
                 this.configChangedSubject.next();
             }
         }
@@ -2884,11 +2894,13 @@ class ChartsComponent {
                 return;
             }
             // Only reset initialTimeRange if the change is NOT from a slider zoom on another widget
-            if (!this.mediator.isSliderZoomUpdate()) {
+            if (this.mediator.isSliderZoomUpdate()) {
+                this.showLoadMore = false;
+            }
+            else if (!isSameRangeAsLastChange) {
                 this.widgetTimeContextDateRangeService.updateInitialTimeRange(null);
             }
-            // Clear the slider zoom flag after processing
-            this.mediator.isSliderZoomUpdate.set(false);
+            queueMicrotask(() => this.mediator.isSliderZoomUpdate.set(false));
             this.configChangedSubject.next();
         }
     }
@@ -3284,7 +3296,7 @@ class ChartsComponent {
     getDefaultChartOptions() {
         return {
             title: {
-                text: gettext('No data available.'),
+                text: this.translateService.instant(gettext('No data available.')),
                 left: 'center',
                 top: 'center',
                 textStyle: { fontSize: 30 }
@@ -3750,7 +3762,7 @@ class ChartsComponent {
         }
         const alert = new DynamicComponentAlert({
             type: 'warning',
-            text: gettext('Truncated data. Change aggregation or select shorter date range.')
+            text: this.translateService.instant(gettext('Truncated data. Change aggregation or select shorter date range.'))
         });
         this.alerts?.addAlerts(alert);
     }