@grafana/scenes 4.18.0--canary.724.9001989710.0 → 4.18.0--canary.725.9002029358.0

package/dist/index.d.ts

@@ -549,7 +549,6 @@ interface DataQueryExtended extends DataQuery$1 {
 declare class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> implements SceneDataProvider {
     private _querySub?;
     private _dataLayersSub?;
-    private _dataLayersMerger;
     private _timeSub?;
     private _timeSubRange?;
     private _containerWidth?;
@@ -1221,7 +1220,19 @@ declare class AnnotationsDataLayer extends SceneDataLayerBase<AnnotationsDataLay
     runLayer(): void;
     private runWithTimeRange;
     protected resolveDataSource(query: AnnotationQuery): Promise<_grafana_data.DataSourceApi<_grafana_data.DataQuery, _grafana_data.DataSourceJsonData, {}>>;
-    protected processEvents(query: AnnotationQuery, events: AnnotationQueryResults): PanelData;
+    protected processEvents(query: AnnotationQuery, events: AnnotationQueryResults): {
+        state: LoadingState;
+        series: _grafana_data.DataFrame[];
+        structureRev?: number;
+        annotations?: _grafana_data.DataFrame[];
+        alertState?: _grafana_data.AlertStateInfo;
+        request?: _grafana_data.DataQueryRequest<_grafana_data.DataQuery>;
+        timings?: _grafana_data.DataQueryTimings;
+        errors?: _grafana_data.DataQueryError[];
+        error?: _grafana_data.DataQueryError;
+        timeRange: _grafana_data.TimeRange;
+        traceIds?: string[];
+    };
 }
 declare function AnnotationsDataLayerRenderer({ model }: SceneComponentProps<AnnotationsDataLayer>): React__default.JSX.Element;
 
@@ -1306,7 +1317,6 @@ declare abstract class SceneDataLayerSetBase<T extends SceneDataLayerProviderSta
      * Subject to emit results to.
      */
     private _results;
-    private _dataLayersMerger;
     protected subscribeToAllLayers(layers: SceneDataLayerProvider[]): void;
     private _onLayerUpdateReceived;
     getResultsStream(): Observable<SceneDataProviderResult>;
@@ -1350,6 +1360,7 @@ interface SceneDataTransformerState extends SceneDataState {
 declare class SceneDataTransformer extends SceneObjectBase<SceneDataTransformerState> implements SceneDataProvider {
     private _transformSub?;
     private _results;
+    private _prevDataFromSource?;
     /**
      * Scan transformations for variable usage and re-process transforms when a variable values change
      */
@@ -1362,6 +1373,8 @@ declare class SceneDataTransformer extends SceneObjectBase<SceneDataTransformerS
     reprocessTransformations(): void;
     cancelQuery(): void;
     getResultsStream(): ReplaySubject<SceneDataProviderResult>;
+    clone(withState?: Partial<SceneDataTransformerState>): this;
+    private haveAlreadyTransformedData;
     private transform;
 }
 

package/dist/index.js

@@ -3745,46 +3745,23 @@ function toSelectableValue({ text, value }) {
   };
 }
 
-class DataLayersMerger {
-  constructor() {
-    this._resultsMap = /* @__PURE__ */ new Map();
-    this._prevLayers = [];
-  }
-  getMergedStream(layers) {
-    if (areDifferentLayers(layers, this._prevLayers)) {
-      this._resultsMap = /* @__PURE__ */ new Map();
-      this._prevLayers = layers;
-    }
-    const resultStreams = layers.map((l) => l.getResultsStream());
-    const deactivationHandlers = [];
-    for (const layer of layers) {
-      deactivationHandlers.push(layer.activate());
-    }
-    return rxjs.merge(resultStreams).pipe(
-      rxjs.mergeAll(),
-      rxjs.filter((v) => {
-        return this._resultsMap.get(v.origin.state.key) !== v;
-      }),
-      rxjs.map((v) => {
-        this._resultsMap.set(v.origin.state.key, v);
-        return this._resultsMap.values();
-      }),
-      rxjs.finalize(() => {
-        deactivationHandlers.forEach((handler) => handler());
-      })
-    );
-  }
-}
-function areDifferentLayers(a, b) {
-  if (a.length !== b.length) {
-    return true;
-  }
-  for (let i = 0; i < a.length; i++) {
-    if (a[i] !== b[i]) {
-      return true;
-    }
-  }
-  return false;
+function mergeMultipleDataLayers(layers) {
+  const resultStreams = layers.map((l) => l.getResultsStream());
+  const resultsMap = /* @__PURE__ */ new Map();
+  const deactivationHandlers = [];
+  for (const layer of layers) {
+    deactivationHandlers.push(layer.activate());
+  }
+  return rxjs.merge(resultStreams).pipe(
+    rxjs.mergeAll(),
+    rxjs.map((v) => {
+      resultsMap.set(v.origin.state.key, v);
+      return resultsMap.values();
+    }),
+    rxjs.finalize(() => {
+      deactivationHandlers.forEach((handler) => handler());
+    })
+  );
 }
 
 var __defProp$w = Object.defineProperty;
@@ -3813,7 +3790,6 @@ function getNextRequestId$1() {
 class SceneQueryRunner extends SceneObjectBase {
   constructor(initialState) {
     super(initialState);
-    this._dataLayersMerger = new DataLayersMerger();
     this._variableValueRecorder = new VariableValueRecorder();
     this._results = new rxjs.ReplaySubject(1);
     this._scopedVars = { __sceneObject: { value: this, text: "__sceneObject" } };
@@ -3928,10 +3904,10 @@ class SceneQueryRunner extends SceneObjectBase {
     if (dataLayers.length === 0) {
       return;
     }
-    this._dataLayersSub = this._dataLayersMerger.getMergedStream(dataLayers).subscribe(this._onLayersReceived.bind(this));
+    this._dataLayersSub = mergeMultipleDataLayers(dataLayers).subscribe(this._onLayersReceived.bind(this));
   }
   _onLayersReceived(results) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const timeRange = sceneGraph.getTimeRange(this);
     const { dataLayerFilter } = this.state;
     let annotations = [];
@@ -3963,15 +3939,12 @@ class SceneQueryRunner extends SceneObjectBase {
         }
       }
     }
-    if (alertState === ((_c = this.state.data) == null ? void 0 : _c.alertState) && allFramesEmpty(annotations) && allFramesEmpty(this._layerAnnotations)) {
-      return;
-    }
-    this._layerAnnotations = annotations;
     const baseStateUpdate = this.state.data ? this.state.data : __spreadProps$k(__spreadValues$w({}, emptyPanelData), { timeRange: timeRange.state.value });
+    this._layerAnnotations = annotations;
     this.setState({
       data: __spreadProps$k(__spreadValues$w({}, baseStateUpdate), {
-        annotations: [...(_d = this._resultAnnotations) != null ? _d : [], ...annotations],
-        alertState: alertState != null ? alertState : (_e = this.state.data) == null ? void 0 : _e.alertState
+        annotations: [...(_c = this._resultAnnotations) != null ? _c : [], ...annotations],
+        alertState: alertState != null ? alertState : (_d = this.state.data) == null ? void 0 : _d.alertState
       })
     });
   }
@@ -4207,17 +4180,6 @@ function findFirstDatasource(targets) {
   var _a, _b;
   return (_b = (_a = targets.find((t) => t.datasource !== null)) == null ? void 0 : _a.datasource) != null ? _b : void 0;
 }
-function allFramesEmpty(frames) {
-  if (!frames) {
-    return true;
-  }
-  for (let i = 0; i < frames.length; i++) {
-    if (frames[i].length > 0) {
-      return false;
-    }
-  }
-  return true;
-}
 
 function isVariableValueEqual(a, b) {
   if (a === b) {
@@ -5286,7 +5248,7 @@ class SceneDataLayerBase extends SceneObjectBase {
     super(__spreadValues$r({
       isEnabled: true
     }, initialState));
-    this._results = new rxjs.ReplaySubject(1);
+    this._results = new rxjs.ReplaySubject();
     this.isDataLayer = true;
     this._variableValueRecorder = new VariableValueRecorder();
     this._variableDependency = new VariableDependencyConfig(this, {
@@ -6010,12 +5972,11 @@ class SceneDataLayerSetBase extends SceneObjectBase {
   constructor() {
     super(...arguments);
     this.isDataLayer = true;
-    this._results = new rxjs.ReplaySubject(1);
-    this._dataLayersMerger = new DataLayersMerger();
+    this._results = new rxjs.ReplaySubject();
   }
   subscribeToAllLayers(layers) {
     if (layers.length > 0) {
-      this.querySub = this._dataLayersMerger.getMergedStream(layers).subscribe(this._onLayerUpdateReceived.bind(this));
+      this.querySub = mergeMultipleDataLayers(layers).subscribe(this._onLayerUpdateReceived.bind(this));
     } else {
       this._results.next({ origin: this, data: emptyPanelData });
       this.setStateHelper({ data: emptyPanelData });
@@ -6147,7 +6108,7 @@ class SceneDataTransformer extends SceneObjectBase {
     return true;
   }
   reprocessTransformations() {
-    this.transform(this.getSourceData().state.data);
+    this.transform(this.getSourceData().state.data, true);
   }
   cancelQuery() {
     var _a, _b;
@@ -6156,8 +6117,42 @@ class SceneDataTransformer extends SceneObjectBase {
   getResultsStream() {
     return this._results;
   }
-  transform(data$1) {
+  clone(withState) {
+    const clone = super.clone(withState);
+    if (this._prevDataFromSource) {
+      clone["_prevDataFromSource"] = this._prevDataFromSource;
+    }
+    return clone;
+  }
+  haveAlreadyTransformedData(data) {
+    if (!this._prevDataFromSource) {
+      return false;
+    }
+    if (data === this._prevDataFromSource) {
+      return true;
+    }
+    const { series, annotations } = this._prevDataFromSource;
+    if (data.series === series && data.annotations === annotations) {
+      if (this.state.data && data.state !== this.state.data.state) {
+        this.setState({ data: __spreadProps$a(__spreadValues$k({}, this.state.data), { state: data.state }) });
+      }
+      return true;
+    }
+    return false;
+  }
+  transform(data$1, force = false) {
     var _a;
+    if (this.state.transformations.length === 0 || !data$1) {
+      this._prevDataFromSource = data$1;
+      this.setState({ data: data$1 });
+      if (data$1) {
+        this._results.next({ origin: this, data: data$1 });
+      }
+      return;
+    }
+    if (!force && this.haveAlreadyTransformedData(data$1)) {
+      return;
+    }
     const seriesTransformations = this.state.transformations.filter((transformation) => {
       if ("options" in transformation || "topic" in transformation) {
         return transformation.topic == null || transformation.topic === data.DataTopic.Series;
@@ -6170,13 +6165,6 @@ class SceneDataTransformer extends SceneObjectBase {
       }
       return false;
     }).map((transformation) => "operator" in transformation ? transformation.operator : transformation);
-    if (this.state.transformations.length === 0 || !data$1) {
-      this.setState({ data: data$1 });
-      if (data$1) {
-        this._results.next({ origin: this, data: data$1 });
-      }
-      return;
-    }
     if (this._transformSub) {
       this._transformSub.unsubscribe();
     }
@@ -6211,9 +6199,10 @@ class SceneDataTransformer extends SceneObjectBase {
         });
         return rxjs.of(result);
       })
-    ).subscribe((data2) => {
-      this.setState({ data: data2 });
-      this._results.next({ origin: this, data: data2 });
+    ).subscribe((transformedData) => {
+      this.setState({ data: transformedData });
+      this._results.next({ origin: this, data: transformedData });
+      this._prevDataFromSource = data$1;
     });
   }
 }