@grafana/scenes 4.17.2--canary.723.8999827741.0 → 4.18.0--canary.724.9001989710.0

package/dist/index.js

@@ -3325,7 +3325,6 @@ function AdHocFilterRenderer({ filter, model }) {
   const valueValue = keyLabelToOption(filter.value, filter.valueLabel);
   const valueSelect = /* @__PURE__ */ React__default["default"].createElement(ui.Select, {
     allowCustomValue: true,
-    isValidNewOption: (inputValue) => inputValue.trim().length > 0,
     allowCreateWhileLoading: true,
     formatCreateLabel: (inputValue) => `Use custom value: ${inputValue}`,
     disabled: model.state.readOnly,
@@ -3746,23 +3745,46 @@ function toSelectableValue({ text, value }) {
   };
 }
 
-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());
+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());
+      })
+    );
   }
-  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());
-    })
-  );
+}
+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;
 }
 
 var __defProp$w = Object.defineProperty;
@@ -3791,6 +3813,7 @@ 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" } };
@@ -3905,10 +3928,10 @@ class SceneQueryRunner extends SceneObjectBase {
     if (dataLayers.length === 0) {
       return;
     }
-    this._dataLayersSub = mergeMultipleDataLayers(dataLayers).subscribe(this._onLayersReceived.bind(this));
+    this._dataLayersSub = this._dataLayersMerger.getMergedStream(dataLayers).subscribe(this._onLayersReceived.bind(this));
   }
   _onLayersReceived(results) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const timeRange = sceneGraph.getTimeRange(this);
     const { dataLayerFilter } = this.state;
     let annotations = [];
@@ -3940,12 +3963,15 @@ class SceneQueryRunner extends SceneObjectBase {
         }
       }
     }
-    const baseStateUpdate = this.state.data ? this.state.data : __spreadProps$k(__spreadValues$w({}, emptyPanelData), { timeRange: timeRange.state.value });
+    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.setState({
       data: __spreadProps$k(__spreadValues$w({}, baseStateUpdate), {
-        annotations: [...(_c = this._resultAnnotations) != null ? _c : [], ...annotations],
-        alertState: alertState != null ? alertState : (_d = this.state.data) == null ? void 0 : _d.alertState
+        annotations: [...(_d = this._resultAnnotations) != null ? _d : [], ...annotations],
+        alertState: alertState != null ? alertState : (_e = this.state.data) == null ? void 0 : _e.alertState
       })
     });
   }
@@ -4181,6 +4207,17 @@ 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) {
@@ -5249,7 +5286,7 @@ class SceneDataLayerBase extends SceneObjectBase {
     super(__spreadValues$r({
       isEnabled: true
     }, initialState));
-    this._results = new rxjs.ReplaySubject();
+    this._results = new rxjs.ReplaySubject(1);
     this.isDataLayer = true;
     this._variableValueRecorder = new VariableValueRecorder();
     this._variableDependency = new VariableDependencyConfig(this, {
@@ -5973,11 +6010,12 @@ class SceneDataLayerSetBase extends SceneObjectBase {
   constructor() {
     super(...arguments);
     this.isDataLayer = true;
-    this._results = new rxjs.ReplaySubject();
+    this._results = new rxjs.ReplaySubject(1);
+    this._dataLayersMerger = new DataLayersMerger();
   }
   subscribeToAllLayers(layers) {
     if (layers.length > 0) {
-      this.querySub = mergeMultipleDataLayers(layers).subscribe(this._onLayerUpdateReceived.bind(this));
+      this.querySub = this._dataLayersMerger.getMergedStream(layers).subscribe(this._onLayerUpdateReceived.bind(this));
     } else {
       this._results.next({ origin: this, data: emptyPanelData });
       this.setStateHelper({ data: emptyPanelData });