@c8y/ngx-components 1023.14.38 → 1023.14.44

package/fesm2022/c8y-ngx-components-datapoint-explorer-view.mjs

@@ -814,6 +814,8 @@ class DatapointExplorerComponent {
             showRange: true,
             showChart: true
         };
+        /** Flag to skip onTimeContextChange during zoom handling */
+        this.isHandlingZoom = false;
         this.chartViewContext = CHART_VIEW_CONTEXT.DATAPOINT_EXPLORER;
         this.TIME_PICKER_CONFIG = {
             showMinutes: true,
@@ -873,6 +875,10 @@ class DatapointExplorerComponent {
         });
     }
     onTimeContextChange(timeProps) {
+        // Skip context changes during zoom handling - zoom already set the correct dates
+        if (this.isHandlingZoom) {
+            return;
+        }
         const realtime = this.formGroup.controls.realtime.value;
         if (timeProps.realtime !== realtime) {
             this.formGroup.patchValue({
@@ -949,6 +955,7 @@ class DatapointExplorerComponent {
             ...configSummaryGS
         });
         // Ensure realtime properties and dates are set correctly
+        // formGroup.valueChanges subscription will update this.config
         this.formGroup.patchValue({
             alarms: this.alarms,
             events: this.events,
@@ -958,59 +965,37 @@ class DatapointExplorerComponent {
             isAutoRefreshEnabled: config.realtime ? true : config.isAutoRefreshEnabled || false,
             refreshInterval: config.realtime ? 5000 : config.refreshInterval || 0
         });
-        // Update config directly to ensure ChartsComponent receives correct values
-        // Create NEW object reference so Angular detects the change
-        const { alarms, events, ...configValues } = this.formGroup.value;
-        this.config = {
-            ...this.config, // Keep existing properties
-            ...configValues,
-            alarmsEventsConfigs: [...(alarms || []), ...(events || [])]
-        };
     }
     onSliderZoom(timeProps) {
-        // When user manually zooms with slider, pause realtime and disable auto-refresh
+        this.isHandlingZoom = true;
+        // Update main form - pause realtime and disable auto-refresh
         this.formGroup.patchValue({
             ...timeProps,
             realtime: false,
             isAutoRefreshEnabled: false,
             refreshInterval: 0
         });
-        // When user zooms, it becomes a custom time range
+        // Update timeProps binding
         this.timeProps = {
             dateFrom: new Date(timeProps.dateFrom.getTime()),
             dateTo: new Date(timeProps.dateTo.getTime()),
             interval: 'custom',
             realtime: false
         };
-        // Directly stop realtime and update the button state and interval
+        // Sync timeContext state
         if (this.timeContext) {
             this.timeContext.stopRealtime();
-            const currentInterval = this.timeContext.form.value.currentDateContextInterval;
-            setTimeout(() => {
-                this.timeContext.form.patchValue({
-                    currentDateContextFromDate: timeProps.dateFrom.toISOString(),
-                    currentDateContextToDate: timeProps.dateTo.toISOString(),
-                    temporaryUserSelectedFromDate: timeProps.dateFrom.toISOString(),
-                    temporaryUserSelectedToDate: timeProps.dateTo.toISOString(),
-                    realtime: false
-                }, { emitEvent: false });
-                // Enable aggregation control since realtime is now off
-                this.timeContext.form.controls.aggregation.enable();
-                if (currentInterval !== 'custom') {
-                    this.timeContext.form.patchValue({
-                        currentDateContextInterval: 'custom'
-                    });
-                }
-                else {
-                    this.timeContext['update']({
-                        date: [timeProps.dateFrom, timeProps.dateTo],
-                        interval: 'custom',
-                        realtime: false,
-                        aggregation: this.timeContext.form.value.aggregation
-                    });
-                }
-            }, 0);
+            this.timeContext.form.patchValue({
+                currentDateContextFromDate: timeProps.dateFrom.toISOString(),
+                currentDateContextToDate: timeProps.dateTo.toISOString(),
+                temporaryUserSelectedFromDate: timeProps.dateFrom.toISOString(),
+                temporaryUserSelectedToDate: timeProps.dateTo.toISOString(),
+                currentDateContextInterval: 'custom',
+                realtime: false
+            }, { emitEvent: false });
+            this.timeContext.form.controls.aggregation.enable();
         }
+        this.isHandlingZoom = false;
     }
     updateTimeRangeOnRealtime(timeRange) {
         this.formGroup.patchValue(timeRange, { emitEvent: false });