@grafana/scenes 6.3.1--canary.990.13763142318.0 → 6.4.0--canary.1062.13769817941.0

package/dist/index.js

@@ -3270,7 +3270,7 @@ class GroupByVariable extends MultiValueVariable {
     this.isLazy = true;
     this._urlSync = new GroupByVariableUrlSyncHandler(this);
     this._getKeys = async (ds) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c;
       const override = await ((_b = (_a = this.state).getTagKeysProvider) == null ? void 0 : _b.call(_a, this, null));
       if (override && override.replace) {
         return override.values;
@@ -3287,8 +3287,7 @@ class GroupByVariable extends MultiValueVariable {
       const response = await ds.getTagKeys(__spreadValues$F({
         filters: otherFilters,
         queries,
-        timeRange,
-        scopes: (_d = this._scopesBridge) == null ? void 0 : _d.getValue()
+        timeRange
       }, getEnrichedFiltersRequest(this)));
       if (responseHasError(response)) {
         this.setState({ error: response.error.message });
@@ -3972,19 +3971,44 @@ class AdHocFiltersVariableUrlSyncHandler {
   }
   getUrlState() {
     const filters = this._variable.state.filters;
-    if (filters.length === 0) {
+    const baseFilters = this._variable.state.baseFilters;
+    let value = [];
+    if (filters.length === 0 && (baseFilters == null ? void 0 : baseFilters.length) === 0) {
       return { [this.getKey()]: [""] };
     }
-    const value = filters.filter(isFilterComplete).filter((filter) => !filter.hidden).map((filter) => toArray(filter).map(escapeUrlPipeDelimiters).join("|"));
-    return { [this.getKey()]: value };
+    if (filters.length) {
+      value.push(
+        ...filters.filter(isFilterComplete).filter((filter) => !filter.hidden).map((filter) => toArray(filter).map(escapeUrlPipeDelimiters).join("|"))
+      );
+    }
+    if (baseFilters == null ? void 0 : baseFilters.length) {
+      value.push(
+        ...baseFilters == null ? void 0 : baseFilters.filter(isFilterComplete).filter((filter) => !filter.hidden && filter.origin && filter.originalValue).map(
+          (filter) => {
+            var _a, _b;
+            return toArray(filter).map(escapeInjectedFilterUrlDelimiters).join("|").concat(
+              `#${(_b = (_a = filter.originalValue) == null ? void 0 : _a.map(escapeInjectedFilterUrlDelimiters).join("|")) != null ? _b : ""}#${filter.origin}`
+            );
+          }
+        )
+      );
+    }
+    return {
+      [this.getKey()]: value.length ? value : [""]
+    };
   }
   updateFromUrl(values) {
     const urlValue = values[this.getKey()];
     if (urlValue == null) {
       return;
     }
-    const filters = deserializeUrlToFilters(urlValue);
-    this._variable.setState({ filters });
+    if (urlValue) {
+      const filters = deserializeUrlToFilters(urlValue);
+      this._variable.setState({
+        filters: filters.filter((f) => !f.origin),
+        baseFilters: filters.filter((f) => f.origin)
+      });
+    }
   }
 }
 function deserializeUrlToFilters(value) {
@@ -4009,10 +4033,12 @@ function toArray(filter) {
   return result;
 }
 function toFilter(urlValue) {
+  var _a;
   if (typeof urlValue !== "string" || urlValue.length === 0) {
     return null;
   }
-  const [key, keyLabel, operator, _operatorLabel, ...values] = urlValue.split("|").reduce((acc, v) => {
+  const [filter, originalValues, origin] = urlValue.split("#");
+  const [key, keyLabel, operator, _operatorLabel, ...values] = filter.split("|").reduce((acc, v) => {
     const [key2, label] = v.split(",");
     acc.push(key2, label != null ? label : key2);
     return acc;
@@ -4024,9 +4050,14 @@ function toFilter(urlValue) {
     value: values[0],
     values: isMultiValueOperator(operator) ? values.filter((_, index) => index % 2 === 0) : void 0,
     valueLabels: values.filter((_, index) => index % 2 === 1),
-    condition: ""
+    condition: "",
+    origin: isFilterOrigin(origin) ? origin : void 0,
+    originalValue: originalValues && originalValues.length ? (_a = originalValues.split("|")) != null ? _a : [originalValues] : void 0
   };
 }
+function isFilterOrigin(value) {
+  return value === FilterOrigin.Scopes || value === FilterOrigin.Dashboards;
+}
 function isFilter(filter) {
   return filter !== null && typeof filter.key === "string" && typeof filter.value === "string";
 }
@@ -4874,13 +4905,20 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
     className: styles.pillWrapper
   }, (filter == null ? void 0 : filter.key) ? /* @__PURE__ */ React__default["default"].createElement("div", {
     className: css.cx(styles.basePill, styles.keyPill)
-  }, keyLabel) : null, (filter == null ? void 0 : filter.key) && (filter == null ? void 0 : filter.operator) && filterInputType !== "operator" ? /* @__PURE__ */ React__default["default"].createElement("div", {
+  }, keyLabel) : null, (filter == null ? void 0 : filter.key) && (filter == null ? void 0 : filter.operator) && filterInputType !== "operator" ? /* @__PURE__ */ React__default["default"].createElement("div", __spreadValues$B({
     id: operatorIdentifier,
-    className: css.cx(styles.basePill, styles.operatorPill, operatorIdentifier),
-    role: "button",
+    className: css.cx(
+      styles.basePill,
+      !filter.origin && styles.operatorPill,
+      filter.origin && styles.keyPill,
+      operatorIdentifier
+    ),
     "aria-label": "Edit filter operator",
     tabIndex: 0,
     onClick: (event) => {
+      if (filter.origin) {
+        return;
+      }
       event.stopPropagation();
       setInputValue("");
       switchInputType("operator", setInputType, void 0, refs.domReference.current);
@@ -4892,7 +4930,7 @@ const AdHocCombobox = React.forwardRef(function AdHocCombobox2({ filter, model,
         switchInputType("operator", setInputType, void 0, refs.domReference.current);
       }
     }
-  }, filter.operator) : null, /* @__PURE__ */ React__default["default"].createElement("div", {
+  }, !filter.origin && { role: "button" }), filter.operator) : null, /* @__PURE__ */ React__default["default"].createElement("div", {
     ref: multiValuePillWrapperRef
   }), isMultiValueEdit ? filterMultiValues.map((item, i) => /* @__PURE__ */ React__default["default"].createElement(MultiValuePill, {
     key: `${item.value}-${i}`,
@@ -5139,13 +5177,13 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
   const handleChangeViewMode = React.useCallback(
     (event, shouldFocusOnPillWrapperOverride) => {
       event == null ? void 0 : event.stopPropagation();
-      if (readOnly || filter.origin) {
+      if (readOnly) {
         return;
       }
       setShouldFocusOnPillWrapper(shouldFocusOnPillWrapperOverride != null ? shouldFocusOnPillWrapperOverride : !viewMode);
       setViewMode(!viewMode);
     },
-    [readOnly, viewMode, filter.origin]
+    [readOnly, viewMode]
   );
   React.useEffect(() => {
     var _a2;
@@ -5209,11 +5247,20 @@ function AdHocFilterPill({ filter, model, readOnly, focusOnWipInputRef }) {
       size: "md",
       className: styles.pillIcon,
       tooltip: `Remove filter with key ${keyLabel}`
-    }) : null, filter.origin && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
+    }) : null, filter.origin && !filter.originalValue && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
       name: "info-circle",
       size: "md",
       className: styles.pillIcon,
       tooltip: `This is a ${filter.origin} injected filter`
+    }), filter.origin && filter.originalValue && /* @__PURE__ */ React__default["default"].createElement(ui.IconButton, {
+      onClick: (e) => {
+        e.stopPropagation();
+        model.restoreOriginalFilter(filter);
+      },
+      name: "history",
+      size: "md",
+      className: styles.pillIcon,
+      tooltip: `Restore filter to its original value`
     }));
   }
   return /* @__PURE__ */ React__default["default"].createElement(AdHocCombobox, {
@@ -5411,30 +5458,35 @@ const OPERATORS = [
 ];
 class AdHocFiltersVariable extends SceneObjectBase {
   constructor(state) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     super(__spreadValues$z({
       type: "adhoc",
       name: (_a = state.name) != null ? _a : "Filters",
       filters: [],
       datasource: null,
       applyMode: "auto",
-      filterExpression: (_b = state.filterExpression) != null ? _b : renderExpression(state.expressionBuilder, state.filters)
+      filterExpression: (_e = state.filterExpression) != null ? _e : renderExpression(state.expressionBuilder, [
+        ...(_c = (_b = state.baseFilters) == null ? void 0 : _b.filter((filter) => filter.origin)) != null ? _c : [],
+        ...(_d = state.filters) != null ? _d : []
+      ])
     }, state));
     this._scopedVars = { __sceneObject: wrapInSafeSerializableSceneObject(this) };
     this._dataSourceSrv = runtime.getDataSourceSrv();
     this._urlSync = new AdHocFiltersVariableUrlSyncHandler(this);
-    this._activationHandler = () => {
-      this._scopesBridge = sceneGraph.getScopesBridge(this);
-    };
     if (this.state.applyMode === "auto") {
       patchGetAdhocFilters(this);
     }
-    this.addActivationHandler(this._activationHandler);
   }
   setState(update) {
+    var _a, _b, _c;
     let filterExpressionChanged = false;
-    if (update.filters && update.filters !== this.state.filters && !update.filterExpression) {
-      update.filterExpression = renderExpression(this.state.expressionBuilder, update.filters);
+    if ((update.filters && update.filters !== this.state.filters || update.baseFilters && update.baseFilters !== this.state.baseFilters) && !update.filterExpression) {
+      const filters = (_a = update.filters) != null ? _a : this.state.filters;
+      const baseFilters = (_b = update.baseFilters) != null ? _b : this.state.baseFilters;
+      update.filterExpression = renderExpression(this.state.expressionBuilder, [
+        ...(_c = baseFilters == null ? void 0 : baseFilters.filter((filter) => filter.origin)) != null ? _c : [],
+        ...filters != null ? filters : []
+      ]);
       filterExpressionChanged = update.filterExpression !== this.state.filterExpression;
     }
     super.setState(update);
@@ -5443,10 +5495,14 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
   }
   updateFilters(filters, options) {
+    var _a, _b;
     let filterExpressionChanged = false;
     let filterExpression = void 0;
     if (filters && filters !== this.state.filters) {
-      filterExpression = renderExpression(this.state.expressionBuilder, filters);
+      filterExpression = renderExpression(this.state.expressionBuilder, [
+        ...(_b = (_a = this.state.baseFilters) == null ? void 0 : _a.filter((filter) => filter.origin)) != null ? _b : [],
+        ...filters
+      ]);
       filterExpressionChanged = filterExpression !== this.state.filterExpression;
     }
     super.setState({
@@ -5457,11 +5513,40 @@ class AdHocFiltersVariable extends SceneObjectBase {
       this.publishEvent(new SceneVariableValueChangedEvent(this), true);
     }
   }
+  restoreOriginalFilter(filter) {
+    var _a;
+    const original = {
+      originalValue: void 0
+    };
+    if ((_a = filter.originalValue) == null ? void 0 : _a.length) {
+      original.value = filter.originalValue[0];
+      original.values = filter.originalValue;
+      original.valueLabels = filter.originalValue;
+    }
+    this._updateFilter(filter, original);
+  }
   getValue() {
     return this.state.filterExpression;
   }
   _updateFilter(filter, update) {
-    const { filters, _wip } = this.state;
+    var _a;
+    const { baseFilters, filters, _wip } = this.state;
+    if (filter.origin) {
+      const currentValues = filter.values ? filter.values : [filter.value];
+      const updateValues = update.values || (update.value ? [update.value] : void 0);
+      const originalValueOverride = update.hasOwnProperty("originalValue");
+      if (!originalValueOverride && updateValues && !filter.originalValue && !lodash.isEqual(currentValues, updateValues)) {
+        update.originalValue = currentValues;
+      }
+      if (!originalValueOverride && lodash.isEqual(updateValues, filter.originalValue)) {
+        update.originalValue = void 0;
+      }
+      const updatedBaseFilters = (_a = baseFilters == null ? void 0 : baseFilters.map((f) => {
+        return f === filter ? __spreadValues$z(__spreadValues$z({}, f), update) : f;
+      })) != null ? _a : [];
+      this.setState({ baseFilters: updatedBaseFilters });
+      return;
+    }
     if (filter === _wip) {
       if ("value" in update && update["value"] !== "") {
         this.setState({ filters: [...filters, __spreadValues$z(__spreadValues$z({}, _wip), update)], _wip: void 0 });
@@ -5513,7 +5598,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     }
   }
   async _getKeys(currentKey) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const override = await ((_b = (_a = this.state).getTagKeysProvider) == null ? void 0 : _b.call(_a, this, currentKey));
     if (override && override.replace) {
       return dataFromResponse(override.values).map(toSelectableValue);
@@ -5531,8 +5616,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     const response = await ds.getTagKeys(__spreadValues$z({
       filters: otherFilters,
       queries,
-      timeRange,
-      scopes: (_d = this._scopesBridge) == null ? void 0 : _d.getValue()
+      timeRange
     }, getEnrichedFiltersRequest(this)));
     if (responseHasError(response)) {
       this.setState({ error: response.error.message });
@@ -5548,7 +5632,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     return keys.map(toSelectableValue);
   }
   async _getValuesFor(filter) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const override = await ((_b = (_a = this.state).getTagValuesProvider) == null ? void 0 : _b.call(_a, this, filter));
     if (override && override.replace) {
       return dataFromResponse(override.values).map(toSelectableValue);
@@ -5557,16 +5641,33 @@ class AdHocFiltersVariable extends SceneObjectBase {
     if (!ds || !ds.getTagValues) {
       return [];
     }
-    const otherFilters = this.state.filters.filter((f) => f.key !== filter.key).concat((_c = this.state.baseFilters) != null ? _c : []);
+    const filteredBaseFilters = (_d = (_c = this.state.baseFilters) == null ? void 0 : _c.filter((f) => f.origin && f.key !== filter.key)) != null ? _d : [];
+    const otherFilters = this.state.filters.filter((f) => f.key !== filter.key).concat(filteredBaseFilters);
     const timeRange = sceneGraph.getTimeRange(this).state.value;
     const queries = this.state.useQueriesAsFilterForOptions ? getQueriesForVariables(this) : void 0;
+    const injectedScopes = (_f = (_e = getEnrichedFiltersRequest(this)) == null ? void 0 : _e.scopes) == null ? void 0 : _f.map((scope) => {
+      return __spreadProps$n(__spreadValues$z({}, scope), {
+        spec: __spreadProps$n(__spreadValues$z({}, scope.spec), {
+          filters: scope.spec.filters.filter(
+            (f) => {
+              var _a2;
+              return !((_a2 = this.state.baseFilters) == null ? void 0 : _a2.find((bf) => bf.key === f.key && "scopes" /* Scopes */));
+            }
+          )
+        })
+      });
+    });
+    const scopeProps = {};
+    if (injectedScopes) {
+      scopeProps.scopes = injectedScopes;
+      scopeProps.scopesInjected = true;
+    }
     const response = await ds.getTagValues(__spreadValues$z({
       key: filter.key,
       filters: otherFilters,
       timeRange,
-      queries,
-      scopes: (_d = this._scopesBridge) == null ? void 0 : _d.getValue()
-    }, getEnrichedFiltersRequest(this)));
+      queries
+    }, scopeProps));
     if (responseHasError(response)) {
       this.setState({ error: response.error.message });
     }
@@ -5753,7 +5854,6 @@ class SceneQueryRunner extends SceneObjectBase {
   _onActivate() {
     if (this.isQueryModeAuto()) {
       const timeRange = sceneGraph.getTimeRange(this);
-      const scopesBridge = sceneGraph.getScopesBridge(this);
       const providers = this.getClosestExtraQueryProviders();
       for (const provider of providers) {
         this._subs.add(
@@ -5764,7 +5864,6 @@ class SceneQueryRunner extends SceneObjectBase {
           })
         );
       }
-      this.subscribeToScopesChanges(scopesBridge);
       this.subscribeToTimeRangeChanges(timeRange);
       if (this.shouldRunQueriesOnActivate()) {
         this.runQueries();
@@ -5910,21 +6009,6 @@ class SceneQueryRunner extends SceneObjectBase {
   isDataReadyToDisplay() {
     return Boolean(this.state._hasFetchedData);
   }
-  subscribeToScopesChanges(scopesBridge) {
-    if (!scopesBridge) {
-      return;
-    }
-    if (this._scopesSubBridge === scopesBridge) {
-      return;
-    }
-    if (this._scopesSub) {
-      this._scopesSub.unsubscribe();
-    }
-    this._scopesSubBridge = scopesBridge;
-    this._scopesSub = scopesBridge.subscribeToValue(() => {
-      this.runWithTimeRangeAndScopes(sceneGraph.getTimeRange(this), scopesBridge);
-    });
-  }
   subscribeToTimeRangeChanges(timeRange) {
     if (this._timeSubRange === timeRange) {
       return;
@@ -5934,17 +6018,15 @@ class SceneQueryRunner extends SceneObjectBase {
     }
     this._timeSubRange = timeRange;
     this._timeSub = timeRange.subscribeToState(() => {
-      this.runWithTimeRangeAndScopes(timeRange, sceneGraph.getScopesBridge(this));
+      this.runWithTimeRange(timeRange);
     });
   }
   runQueries() {
     const timeRange = sceneGraph.getTimeRange(this);
-    const scopesBridge = sceneGraph.getScopesBridge(this);
     if (this.isQueryModeAuto()) {
       this.subscribeToTimeRangeChanges(timeRange);
-      this.subscribeToScopesChanges(scopesBridge);
     }
-    this.runWithTimeRangeAndScopes(timeRange, scopesBridge);
+    this.runWithTimeRange(timeRange);
   }
   getMaxDataPoints() {
     var _a;
@@ -5964,8 +6046,8 @@ class SceneQueryRunner extends SceneObjectBase {
       data: __spreadProps$m(__spreadValues$y({}, this.state.data), { state: schema.LoadingState.Done })
     });
   }
-  async runWithTimeRangeAndScopes(timeRange, scopesBridge) {
-    var _a, _b, _c, _d;
+  async runWithTimeRange(timeRange) {
+    var _a, _b, _c;
     if (!this.state.maxDataPoints && this.state.maxDataPointsFromWidth && !this._containerWidth) {
       return;
     }
@@ -5978,22 +6060,17 @@ class SceneQueryRunner extends SceneObjectBase {
       this.setState({ data: __spreadProps$m(__spreadValues$y({}, (_b = this.state.data) != null ? _b : emptyPanelData), { state: schema.LoadingState.Loading }) });
       return;
     }
-    if (scopesBridge == null ? void 0 : scopesBridge.isLoading()) {
-      writeSceneLog("SceneQueryRunner", "Scopes are in loading state, skipping query execution");
-      this.setState({ data: __spreadProps$m(__spreadValues$y({}, (_c = this.state.data) != null ? _c : emptyPanelData), { state: schema.LoadingState.Loading }) });
-      return;
-    }
     const { queries } = this.state;
     if (!(queries == null ? void 0 : queries.length)) {
       this._setNoDataState();
       return;
     }
     try {
-      const datasource = (_d = this.state.datasource) != null ? _d : findFirstDatasource(queries);
+      const datasource = (_c = this.state.datasource) != null ? _c : findFirstDatasource(queries);
       const ds = await getDataSource(datasource, this._scopedVars);
       this.findAndSubscribeToAdHocFilters(ds.uid);
       const runRequest = runtime.getRunRequest();
-      const { primary, secondaries, processors } = this.prepareRequests(timeRange, ds, scopesBridge);
+      const { primary, secondaries, processors } = this.prepareRequests(timeRange, ds);
       writeSceneLog("SceneQueryRunner", "Starting runRequest", this.state.key);
       let stream = runRequest(ds, primary);
       if (secondaries.length > 0) {
@@ -6032,7 +6109,7 @@ class SceneQueryRunner extends SceneObjectBase {
     clone["_results"].next({ origin: this, data: (_a = this.state.data) != null ? _a : emptyPanelData });
     return clone;
   }
-  prepareRequests(timeRange, ds, scopesBridge) {
+  prepareRequests(timeRange, ds) {
     var _a, _b;
     const { minInterval, queries } = this.state;
     let request = __spreadValues$y({
@@ -6052,8 +6129,7 @@ class SceneQueryRunner extends SceneObjectBase {
         to: timeRange.state.to
       },
       cacheTimeout: this.state.cacheTimeout,
-      queryCachingTTL: this.state.queryCachingTTL,
-      scopes: scopesBridge == null ? void 0 : scopesBridge.getValue()
+      queryCachingTTL: this.state.queryCachingTTL
     }, getEnrichedDataRequest(this));
     if (this._adhocFiltersVar) {
       request.filters = [];
@@ -6284,6 +6360,15 @@ function escapeUrlCommaDelimiters(value) {
   }
   return /,/g[Symbol.replace](value, "__gfc__");
 }
+function escapeUrlHashDelimiters(value) {
+  if (value === null || value === void 0) {
+    return "";
+  }
+  return /#/g[Symbol.replace](value, "__gfh__");
+}
+function escapeInjectedFilterUrlDelimiters(value) {
+  return escapeUrlHashDelimiters(escapeUrlPipeDelimiters(value));
+}
 function escapeURLDelimiters(value) {
   return escapeUrlCommaDelimiters(escapeUrlPipeDelimiters(value));
 }
@@ -6293,6 +6378,7 @@ function unescapeUrlDelimiters(value) {
   }
   value = /__gfp__/g[Symbol.replace](value, "|");
   value = /__gfc__/g[Symbol.replace](value, ",");
+  value = /__gfh__/g[Symbol.replace](value, "#");
   return value;
 }
 function toUrlCommaDelimitedString(key, label) {
@@ -7005,105 +7091,6 @@ function containsSearchFilter(query) {
   return str.indexOf(SEARCH_FILTER_VARIABLE) > -1;
 }
 
-class SceneScopesBridge extends SceneObjectBase {
-  constructor() {
-    super(...arguments);
-    this._urlSync = new SceneObjectUrlSyncConfig(this, { keys: ["scopes"] });
-    this._renderBeforeActivation = true;
-    this._contextSubject = new rxjs.BehaviorSubject(void 0);
-    this._pendingScopes = null;
-  }
-  getUrlState() {
-    var _a, _b, _c;
-    return {
-      scopes: (_c = this._pendingScopes) != null ? _c : ((_b = (_a = this.context) == null ? void 0 : _a.state.value) != null ? _b : []).map((scope) => scope.metadata.name)
-    };
-  }
-  updateFromUrl(values) {
-    var _a, _b;
-    let scopes = (_a = values["scopes"]) != null ? _a : [];
-    scopes = (Array.isArray(scopes) ? scopes : [scopes]).map(String);
-    if (!this.context) {
-      this._pendingScopes = scopes;
-      return;
-    }
-    (_b = this.context) == null ? void 0 : _b.changeScopes(scopes);
-  }
-  getValue() {
-    var _a, _b;
-    return (_b = (_a = this.context) == null ? void 0 : _a.state.value) != null ? _b : [];
-  }
-  subscribeToValue(cb) {
-    return this.contextObservable.pipe(
-      rxjs.map((context) => {
-        var _a;
-        return (_a = context == null ? void 0 : context.state.value) != null ? _a : [];
-      }),
-      rxjs.pairwise(),
-      rxjs.filter(([prevScopes, newScopes]) => !lodash.isEqual(prevScopes, newScopes))
-    ).subscribe(([prevScopes, newScopes]) => {
-      cb(newScopes, prevScopes);
-    });
-  }
-  isLoading() {
-    var _a, _b;
-    return (_b = (_a = this.context) == null ? void 0 : _a.state.loading) != null ? _b : false;
-  }
-  subscribeToLoading(cb) {
-    return this.contextObservable.pipe(
-      rxjs.filter((context) => !!context),
-      rxjs.pairwise(),
-      rxjs.map(
-        ([prevContext, newContext]) => {
-          var _a, _b;
-          return [(_a = prevContext == null ? void 0 : prevContext.state.loading) != null ? _a : false, (_b = newContext == null ? void 0 : newContext.state.loading) != null ? _b : false];
-        }
-      ),
-      rxjs.filter(([prevLoading, newLoading]) => prevLoading !== newLoading)
-    ).subscribe(([_prevLoading, newLoading]) => {
-      cb(newLoading);
-    });
-  }
-  setEnabled(enabled) {
-    var _a;
-    (_a = this.context) == null ? void 0 : _a.setEnabled(enabled);
-  }
-  setReadOnly(readOnly) {
-    var _a;
-    (_a = this.context) == null ? void 0 : _a.setReadOnly(readOnly);
-  }
-  updateContext(newContext) {
-    var _a, _b;
-    if (this._pendingScopes && newContext) {
-      setTimeout(() => {
-        newContext == null ? void 0 : newContext.changeScopes(this._pendingScopes);
-        this._pendingScopes = null;
-      });
-    }
-    if (this.context !== newContext || ((_a = this.context) == null ? void 0 : _a.state) !== (newContext == null ? void 0 : newContext.state)) {
-      const shouldUpdate = ((_b = this.context) == null ? void 0 : _b.state.value) !== (newContext == null ? void 0 : newContext.state.value);
-      this._contextSubject.next(newContext);
-      if (shouldUpdate) {
-        this.forceRender();
-      }
-    }
-  }
-  get context() {
-    return this._contextSubject.getValue();
-  }
-  get contextObservable() {
-    return this._contextSubject.asObservable();
-  }
-}
-SceneScopesBridge.Component = SceneScopesBridgeRenderer;
-function SceneScopesBridgeRenderer({ model }) {
-  const context = runtime.useScopes();
-  React.useEffect(() => {
-    model.updateContext(context);
-  }, [context, model]);
-  return null;
-}
-
 function getVariables(sceneObject) {
   var _a;
   return (_a = getClosest(sceneObject, (s) => s.state.$variables)) != null ? _a : EmptyVariableSet;
@@ -7247,10 +7234,6 @@ function findDescendents(scene, descendentType) {
   const targetScenes = findAllObjects(scene, isDescendentType);
   return targetScenes.filter(isDescendentType);
 }
-function getScopesBridge(sceneObject) {
-  var _a;
-  return (_a = findObject(sceneObject, (s) => s instanceof SceneScopesBridge)) != null ? _a : void 0;
-}
 
 const sceneGraph = {
   getVariables,
@@ -7267,8 +7250,7 @@ const sceneGraph = {
   findAllObjects,
   getAncestor,
   getQueryController,
-  findDescendents,
-  getScopesBridge
+  findDescendents
 };
 
 class UniqueUrlKeyMapper {
@@ -13022,10 +13004,6 @@ class SplitLayout extends SceneObjectBase {
 SplitLayout.Component = SplitLayoutRenderer;
 
 class SceneApp extends SceneObjectBase {
-  constructor() {
-    super(...arguments);
-    this._renderBeforeActivation = true;
-  }
   enrichDataRequest() {
     return {
       app: this.state.name || "app"
@@ -13033,10 +13011,8 @@ class SceneApp extends SceneObjectBase {
   }
 }
 SceneApp.Component = ({ model }) => {
-  const { pages, scopesBridge } = model.useState();
-  return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, scopesBridge && /* @__PURE__ */ React__default["default"].createElement(scopesBridge.Component, {
-    model: scopesBridge
-  }), /* @__PURE__ */ React__default["default"].createElement(SceneAppContext.Provider, {
+  const { pages } = model.useState();
+  return /* @__PURE__ */ React__default["default"].createElement(SceneAppContext.Provider, {
     value: model
   }, /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Routes, null, pages.map((page) => /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
     key: page.state.url,
@@ -13044,7 +13020,7 @@ SceneApp.Component = ({ model }) => {
     element: /* @__PURE__ */ React__default["default"].createElement(page.Component, {
       model: page
     })
-  })))));
+  }))));
 };
 const SceneAppContext = React.createContext(null);
 const sceneAppCache = /* @__PURE__ */ new Map();
@@ -13399,21 +13375,6 @@ class SceneAppPage extends SceneObjectBase {
     super(state);
     this._sceneCache = /* @__PURE__ */ new Map();
     this._drilldownCache = /* @__PURE__ */ new Map();
-    this._activationHandler = () => {
-      if (!this.state.useScopes) {
-        return;
-      }
-      this._scopesBridge = sceneGraph.getScopesBridge(this);
-      if (!this._scopesBridge) {
-        throw new Error("Use of scopes is enabled but no scopes bridge found");
-      }
-      this._scopesBridge.setEnabled(true);
-      return () => {
-        var _a;
-        (_a = this._scopesBridge) == null ? void 0 : _a.setEnabled(false);
-      };
-    };
-    this.addActivationHandler(this._activationHandler);
   }
   initializeScene(scene) {
     this.setState({ initializedScene: scene });
@@ -14413,7 +14374,6 @@ exports.SceneObjectUrlSyncConfig = SceneObjectUrlSyncConfig;
 exports.SceneQueryRunner = SceneQueryRunner;
 exports.SceneReactObject = SceneReactObject;
 exports.SceneRefreshPicker = SceneRefreshPicker;
-exports.SceneScopesBridge = SceneScopesBridge;
 exports.SceneTimePicker = SceneTimePicker;
 exports.SceneTimeRange = SceneTimeRange;
 exports.SceneTimeRangeCompare = SceneTimeRangeCompare;