@c8y/ngx-components 1024.15.13 → 1024.16.5

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

@@ -1,6 +1,7 @@
 import * as i0 from '@angular/core';
 import { Injectable, inject, SecurityContext, ViewChild, Input, Component, EventEmitter, Output, DestroyRef } from '@angular/core';
 import { gettext } from '@c8y/ngx-components/gettext';
+import { isEqual, cloneDeep } from 'lodash-es';
 import { from, merge, interval, BehaviorSubject, of, lastValueFrom, defer, forkJoin } from 'rxjs';
 import { mergeMap, map, tap, throttleTime, buffer, switchMap } from 'rxjs/operators';
 import * as i1$1 from '@c8y/ngx-components';
@@ -2402,13 +2403,16 @@ class ChartEventsService {
                 pageSize: 1000,
                 ...params
             };
-            return this.eventService.list(fetchOptions).then(result => {
+            return this.eventService
+                .list(fetchOptions)
+                .then(result => {
                 result.data.forEach(iEvent => {
                     iEvent['color'] = event.color;
                     iEvent['selectedDatapoint'] = event.selectedDatapoint;
                 });
                 return result.data;
-            });
+            })
+                .catch(() => []);
         });
         const result = await Promise.all(promises);
         return result.flat();
@@ -2456,13 +2460,16 @@ class ChartAlarmsService {
                 pageSize: 1000,
                 ...params
             };
-            return this.alarmService.list(fetchOptions).then(result => {
+            return this.alarmService
+                .list(fetchOptions)
+                .then(result => {
                 result.data.forEach(iAlarm => {
                     iAlarm['color'] = alarm.color;
                     iAlarm['selectedDatapoint'] = alarm.selectedDatapoint;
                 });
                 return result.data;
-            });
+            })
+                .catch(() => []);
         });
         const result = await Promise.all(promises);
         return result.flat();
@@ -2700,12 +2707,24 @@ class ChartsComponent {
          */
         this.duplicateAggregationsDetected = new EventEmitter();
         this.CHART_VIEW_CONTEXT = CHART_VIEW_CONTEXT;
+        /**
+         * Aggregation params are serialized verbatim into the query string, so a missing
+         * `aggregationFunction` would reach the platform as the literal string 'undefined' and get the
+         * whole request rejected. Every site that sends one falls back to 'avg', matching the default
+         * the chart renders with (see `EchartsOptionsService.getSingleSeries`).
+         */
         this.AGGREGATION_INTERVAL_MAP = {
             [aggregationType.MINUTELY]: '1m',
             [aggregationType.HOURLY]: '60m',
             [aggregationType.DAILY]: '1d'
         };
         this.configChangedSubject = new BehaviorSubject(null);
+        /**
+         * Deep copy of the config the last reload ran with; content-identical rebuilds are skipped.
+         * A copy, not a reference: the chart mutates datapoints in place (e.g. backfills `unit`), and a
+         * stored reference would mutate along with the config and always compare as unchanged.
+         */
+        this.lastConfig = null;
         /** Series names hidden by the user via per-function legend toggles; re-applied after each setOption. */
         this.userHiddenSeriesNames = new Set();
         /** DpIds whose per-fn series were stripped to a single series on the last render. */
@@ -2814,6 +2833,8 @@ class ChartsComponent {
         }
         const wasFromZoom = this.isChangeFromZoom;
         this.isChangeFromZoom = false;
+        const configContentChanged = !isEqual(this.config, this.lastConfig);
+        this.lastConfig = cloneDeep(this.config);
         if (wasFromZoom) {
             const currentRange = this.getTimeRange();
             const isWithinLoadedRange = this.loadedTimeRange &&
@@ -2848,6 +2869,12 @@ class ChartsComponent {
             }
         }
         else {
+            // Parent forms rebuild the config object on every valueChanges emission;
+            // a content-identical rebuild must not restart the fetch pipeline.
+            if (!configContentChanged) {
+                this.mediator.isSliderZoomUpdate.set(false);
+                return;
+            }
             // Only reset initialTimeRange if the change is NOT from a slider zoom on another widget
             if (!this.mediator.isSliderZoomUpdate()) {
                 this.widgetTimeContextDateRangeService.updateInitialTimeRange(null);
@@ -3499,7 +3526,7 @@ class ChartsComponent {
                         aggregationInterval: this.AGGREGATION_INTERVAL_MAP[this.config.aggregation]
                     })
                 })).pipe(map(res => {
-                    const values = res.data.values;
+                    const values = res.data.values || {};
                     if (res.data.truncated && this.config.dateFrom) {
                         values[new Date(this.config.dateFrom).toISOString()] = [{ min: null, max: null }];
                     }
@@ -3531,7 +3558,7 @@ class ChartsComponent {
                                 return {};
                             if (this.config.showAdvancedChartOptions) {
                                 return {
-                                    aggregationFunction: dp.renderType ?? 'avg',
+                                    aggregationFunction: dp.renderType || 'avg',
                                     aggregationInterval: interval
                                 };
                             }
@@ -3548,11 +3575,11 @@ class ChartsComponent {
                         this.config.aggregation &&
                         this.config.showAdvancedChartOptions &&
                         dp.renderType !== 'area' && {
-                        aggregationFunction: dp.renderType,
+                        aggregationFunction: dp.renderType || 'avg',
                         aggregationInterval: this.AGGREGATION_INTERVAL_MAP[this.config.aggregation]
                     })
                 })).pipe(map(res => {
-                    const values = res.data.values;
+                    const values = res.data.values || {};
                     if (res.data.truncated && this.config.dateFrom) {
                         values[new Date(this.config.dateFrom).toISOString()] = [{ min: null, max: null }];
                     }
@@ -3563,7 +3590,7 @@ class ChartsComponent {
                     }
                     // If the datapoint already has a unit (e.g. from config), keep it. Otherwise, try to get it from the series response.
                     if (!dp.unit) {
-                        const unitFromSeries = res.data.series[0]?.unit;
+                        const unitFromSeries = res.data.series?.[0]?.unit;
                         if (unitFromSeries) {
                             dp.unit = unitFromSeries;
                         }
@@ -3613,7 +3640,7 @@ class ChartsComponent {
                         return {};
                     if (this.config.showAdvancedChartOptions) {
                         return {
-                            aggregationFunction: aggregatedDatapoint.renderType ?? 'avg',
+                            aggregationFunction: aggregatedDatapoint.renderType || 'avg',
                             aggregationInterval: interval
                         };
                     }
@@ -3632,11 +3659,11 @@ class ChartsComponent {
                 (this.config.aggregation || customTimeRange) &&
                 this.config.showAdvancedChartOptions &&
                 aggregatedDatapoint.renderType !== 'area' && {
-                aggregationFunction: aggregatedDatapoint.renderType,
+                aggregationFunction: aggregatedDatapoint.renderType || 'avg',
                 aggregationInterval: this.AGGREGATION_INTERVAL_MAP[(customTimeRange ? this.getAggregationTypeForTimeRange() : this.config.aggregation)]
             })
         })).pipe(map(res => {
-            const values = res.data.values;
+            const values = res.data.values || {};
             if (res.data.truncated && this.config.dateFrom) {
                 values[new Date(this.config.dateFrom).toISOString()] = [{ min: null, max: null }];
             }