@grafana/scenes 6.1.2--canary.990.13540617999.0 → 6.1.2

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _grafana_data from '@grafana/data';
-import { BusEventWithPayload, EventBus, BusEvent, BusEventType, BusEventHandler, PanelMenuItem, FieldConfigSource, PanelModel, PanelPlugin, AbsoluteTimeRange, PanelData, InterpolateFunction, TimeRange, DataQueryRequest, DataSourceGetTagKeysOptions, DataSourceGetTagValuesOptions, DataTransformContext, DataFrame, Scope, IconName, PageLayoutType, UrlQueryMap, DataQuery as DataQuery$1, DataSourceApi, Registry, RegistryItem, ScopedVars, AdHocVariableFilter, SelectableValue, MetricFindValue, GetTagResponse, VariableRefresh as VariableRefresh$1, VariableSort, EventFilterOptions, AnnotationEvent, AnnotationQuery, DataTransformerConfig, TimeOption, FieldConfig, FieldType, FieldValueMatcherConfig, ScopedVar, RawTimeRange } from '@grafana/data';
+import { BusEventWithPayload, EventBus, BusEvent, BusEventType, BusEventHandler, PanelMenuItem, FieldConfigSource, PanelModel, PanelPlugin, AbsoluteTimeRange, PanelData, InterpolateFunction, TimeRange, DataQueryRequest, DataSourceGetTagKeysOptions, DataSourceGetTagValuesOptions, DataTransformContext, DataFrame, IconName, PageLayoutType, UrlQueryMap, DataQuery as DataQuery$1, DataSourceApi, Registry, RegistryItem, ScopedVars, AdHocVariableFilter, SelectableValue, MetricFindValue, GetTagResponse, VariableRefresh as VariableRefresh$1, VariableSort, EventFilterOptions, AnnotationEvent, AnnotationQuery, DataTransformerConfig, TimeOption, FieldConfig, FieldType, FieldValueMatcherConfig, ScopedVar, RawTimeRange } from '@grafana/data';
 import * as React$1 from 'react';
 import React__default, { ComponentType, CSSProperties, PointerEvent, ForwardRefExoticComponent } from 'react';
 import * as rxjs from 'rxjs';
@@ -7,7 +7,7 @@ import { Observable, Subscription, Unsubscribable, MonoTypeOperatorFunction, Rep
 import * as _grafana_schema from '@grafana/schema';
 import { VariableType, VariableHide, TimeZone, DataTopic, DataQuery, DataSourceRef, VariableRefresh, LoadingState, DashboardCursorSync, MatcherConfig, TableFieldOptions } from '@grafana/schema';
 import { PanelContext, WeekStart, IconName as IconName$1 } from '@grafana/ui';
-import { ScopesContextValue, LocationService, VariableInterpolation } from '@grafana/runtime';
+import { LocationService, VariableInterpolation } from '@grafana/runtime';
 import { Location } from 'history';
 import ReactGridLayout from 'react-grid-layout';
 import { Options, FieldConfig as FieldConfig$1 } from '@grafana/schema/dist/esm/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen';
@@ -645,41 +645,6 @@ declare class EmbeddedScene extends SceneObjectBase<EmbeddedSceneState> {
 }
 declare function EmbeddedSceneRenderer({ model }: SceneComponentProps<EmbeddedScene>): React__default.JSX.Element;
 
-interface SceneObjectUrlSyncConfigOptions {
-    keys: string[] | (() => string[]);
-}
-declare class SceneObjectUrlSyncConfig implements SceneObjectUrlSyncHandler {
-    private _sceneObject;
-    private _keys;
-    private _nextChangeShouldAddHistoryStep;
-    constructor(_sceneObject: SceneObjectWithUrlSync, _options: SceneObjectUrlSyncConfigOptions);
-    getKeys(): string[];
-    getUrlState(): SceneObjectUrlValues;
-    updateFromUrl(values: SceneObjectUrlValues): void;
-    shouldCreateHistoryStep(values: SceneObjectUrlValues): boolean;
-    performBrowserHistoryAction(callback: () => void): void;
-}
-
-declare class SceneScopesBridge extends SceneObjectBase implements SceneObjectWithUrlSync {
-    static Component: typeof SceneScopesBridgeRenderer;
-    protected _urlSync: SceneObjectUrlSyncConfig;
-    protected _renderBeforeActivation: boolean;
-    private _contextSubject;
-    private _pendingScopes;
-    getUrlState(): SceneObjectUrlValues;
-    updateFromUrl(values: SceneObjectUrlValues): void;
-    getValue(): Scope[];
-    subscribeToValue(cb: (newScopes: Scope[], prevScopes: Scope[]) => void): Unsubscribable;
-    isLoading(): boolean;
-    subscribeToLoading(cb: (loading: boolean) => void): Unsubscribable;
-    setEnabled(enabled: boolean): void;
-    setReadOnly(readOnly: boolean): void;
-    updateContext(newContext: ScopesContextValue | undefined): void;
-    private get context();
-    private get contextObservable();
-}
-declare function SceneScopesBridgeRenderer({ model }: SceneComponentProps<SceneScopesBridge>): null;
-
 interface SceneRouteMatch<Params extends {
     [K in keyof Params]?: string;
 } = {}> {
@@ -692,7 +657,6 @@ interface SceneAppState extends SceneObjectState {
     pages: SceneAppPageLike[];
     name?: string;
     urlSyncOptions?: SceneUrlSyncOptions;
-    scopesBridge?: SceneScopesBridge;
 }
 interface SceneAppRoute {
     path: string;
@@ -737,7 +701,6 @@ interface SceneAppPageState extends SceneObjectState {
      */
     getFallbackPage?: () => SceneAppPageLike;
     layout?: PageLayoutType;
-    useScopes?: boolean;
 }
 interface SceneAppPageLike extends SceneObject<SceneAppPageState>, DataRequestEnricher {
     initializeScene(scene: SceneObject): void;
@@ -960,10 +923,8 @@ declare class AdHocFiltersVariable extends SceneObjectBase<AdHocFiltersVariableS
     static Component: typeof AdHocFiltersVariableRenderer;
     private _scopedVars;
     private _dataSourceSrv;
-    private _scopesBridge;
     protected _urlSync: AdHocFiltersVariableUrlSyncHandler;
     constructor(state: Partial<AdHocFiltersVariableState>);
-    private _activationHandler;
     setState(update: Partial<AdHocFiltersVariableState>): void;
     /**
      * Updates the variable's `filters` and `filterExpression` state.
@@ -1204,7 +1165,6 @@ declare class GroupByVariable extends MultiValueVariable<GroupByVariableState> {
     static Component: typeof GroupByVariableRenderer;
     isLazy: boolean;
     protected _urlSync: SceneObjectUrlSyncHandler;
-    private _scopesBridge;
     validateAndUpdate(): Observable<ValidateAndUpdateResult>;
     private _updateValueGivenNewOptions;
     getValueOptions(args: VariableGetOptionsArgs): Observable<VariableValueOption[]>;
@@ -1221,7 +1181,7 @@ declare class GroupByVariable extends MultiValueVariable<GroupByVariableState> {
         text: string[];
     };
 }
-declare function GroupByVariableRenderer({ model }: SceneComponentProps<GroupByVariable>): React__default.JSX.Element;
+declare function GroupByVariableRenderer({ model }: SceneComponentProps<MultiValueVariable>): React__default.JSX.Element;
 
 declare function isAdHocVariable(variable: SceneVariable): variable is AdHocFiltersVariable;
 declare function isConstantVariable(variable: SceneVariable): variable is ConstantVariable;
@@ -1400,10 +1360,6 @@ declare function getAncestor<ParentType>(sceneObject: SceneObject, ancestorType:
  * This will search down the full scene graph, looking for objects that match the provided descendentType type.
  */
 declare function findDescendents<T extends SceneObject>(scene: SceneObject, descendentType: SceneType<T>): T[];
-/**
- * Will walk up the scene object graph to the closest $scopesBridge scene object
- */
-declare function getScopesBridge(sceneObject: SceneObject): SceneScopesBridge | undefined;
 
 declare const sceneGraph: {
     getVariables: typeof getVariables;
@@ -1421,7 +1377,6 @@ declare const sceneGraph: {
     getAncestor: typeof getAncestor;
     getQueryController: typeof getQueryController;
     findDescendents: typeof findDescendents;
-    getScopesBridge: typeof getScopesBridge;
 };
 
 interface ActWhenVariableChangedState extends SceneObjectState {
@@ -1599,6 +1554,21 @@ declare class SceneDataNode extends SceneObjectBase<SceneDataNodeState> implemen
     getResultsStream(): rxjs.Observable<SceneDataProviderResult>;
 }
 
+interface SceneObjectUrlSyncConfigOptions {
+    keys: string[] | (() => string[]);
+}
+declare class SceneObjectUrlSyncConfig implements SceneObjectUrlSyncHandler {
+    private _sceneObject;
+    private _keys;
+    private _nextChangeShouldAddHistoryStep;
+    constructor(_sceneObject: SceneObjectWithUrlSync, _options: SceneObjectUrlSyncConfigOptions);
+    getKeys(): string[];
+    getUrlState(): SceneObjectUrlValues;
+    updateFromUrl(values: SceneObjectUrlValues): void;
+    shouldCreateHistoryStep(values: SceneObjectUrlValues): boolean;
+    performBrowserHistoryAction(callback: () => void): void;
+}
+
 declare class SceneTimeRange extends SceneObjectBase<SceneTimeRangeState> implements SceneTimeRangeLike {
     protected _urlSync: SceneObjectUrlSyncConfig;
     constructor(state?: Partial<SceneTimeRangeState>);
@@ -1673,8 +1643,6 @@ declare class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> impleme
     private _dataLayersMerger;
     private _timeSub?;
     private _timeSubRange?;
-    private _scopesSub?;
-    private _scopesSubBridge?;
     private _containerWidth?;
     private _variableValueRecorder;
     private _results;
@@ -1713,12 +1681,11 @@ declare class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> impleme
     private _onDeactivate;
     setContainerWidth(width: number): void;
     isDataReadyToDisplay(): boolean;
-    private subscribeToScopesChanges;
     private subscribeToTimeRangeChanges;
     runQueries(): void;
     private getMaxDataPoints;
     cancelQuery(): void;
-    private runWithTimeRangeAndScopes;
+    private runWithTimeRange;
     clone(withState?: Partial<QueryRunnerState>): this;
     private prepareRequests;
     private onDataReceived;
@@ -2442,7 +2409,6 @@ declare const LazyLoader: LazyLoaderType;
  * Responsible for top level pages routing
  */
 declare class SceneApp extends SceneObjectBase<SceneAppState> implements DataRequestEnricher {
-    protected _renderBeforeActivation: boolean;
     enrichDataRequest(): {
         app: string;
     };
@@ -2460,9 +2426,7 @@ declare class SceneAppPage extends SceneObjectBase<SceneAppPageState> implements
     static Component: typeof SceneAppPageRenderer;
     private _sceneCache;
     private _drilldownCache;
-    private _scopesBridge;
     constructor(state: SceneAppPageState);
-    private _activationHandler;
     initializeScene(scene: EmbeddedScene): void;
     getScene(routeMatch: SceneRouteMatch): EmbeddedScene;
     getDrilldownPage(drilldown: SceneAppDrilldownView, routeMatch: SceneRouteMatch<{}>): SceneAppPageLike;
@@ -2963,4 +2927,4 @@ declare const sceneUtils: {
     isGroupByVariable: typeof isGroupByVariable;
 };
 
-export { AdHocFilterWithLabels, AdHocFiltersVariable, CancelActivationHandler, ConstantVariable, ControlsLabel, ControlsLayout, CustomFormatterVariable, CustomTransformOperator, CustomTransformerDefinition, CustomVariable, CustomVariableValue, DataLayerFilter, DataProviderProxy, DataRequestEnricher, DataSourceVariable, DeepPartial, EmbeddedScene, EmbeddedSceneState, ExtraQueryDataProcessor, ExtraQueryDescriptor, ExtraQueryProvider, FieldConfigBuilder, FieldConfigBuilders, FieldConfigOverridesBuilder, FiltersRequestEnricher, FormatVariable, GroupByVariable, InterpolationFormatParameter, IntervalVariable, LazyLoader, LocalValueVariable, MacroVariableConstructor, MultiValueVariable, MultiValueVariableState, NestedScene, NewSceneObjectAddedEvent, PanelBuilders, PanelOptionsBuilders, QueryRunnerState, QueryVariable, RuntimeDataSource, SafeSerializableSceneObject, SceneActivationHandler, SceneApp, SceneAppDrilldownView, SceneAppPage, SceneAppPageLike, SceneAppPageState, SceneAppRoute, SceneByFrameRepeater, SceneByVariableRepeater, SceneCSSGridItem, SceneCSSGridLayout, SceneCanvasText, SceneComponent, SceneComponentProps, SceneControlsSpacer, SceneDataLayerBase, SceneDataLayerControls, SceneDataLayerProvider, SceneDataLayerProviderState, SceneDataLayerSet, SceneDataLayerSetBase, SceneDataNode, SceneDataProvider, SceneDataProviderResult, SceneDataQuery, SceneDataState, SceneDataTransformer, SceneDataTransformerState, SceneDeactivationHandler, SceneDebugger, SceneFlexItem, SceneFlexItemLike, SceneFlexItemState, SceneFlexLayout, SceneGridItem, SceneGridItemLike, SceneGridItemStateLike, SceneGridLayout, SceneGridLayoutDragStartEvent, SceneGridRow, SceneInteractionProfileEvent, SceneLayout, SceneLayoutChildOptions, SceneLayoutState, SceneObject, SceneObjectBase, SceneObjectRef, SceneObjectState, SceneObjectStateChangedEvent, SceneObjectStateChangedPayload, SceneObjectUrlSyncConfig, SceneObjectUrlSyncHandler, SceneObjectUrlValue, SceneObjectUrlValues, SceneObjectWithUrlSync, SceneQueryControllerEntry, SceneQueryControllerEntryType, SceneQueryControllerLike, SceneQueryRunner, SceneReactObject, SceneRefreshPicker, SceneRefreshPickerState, SceneRouteMatch, SceneScopesBridge, SceneStateChangedHandler, SceneStatelessBehavior, SceneTimePicker, SceneTimeRange, SceneTimeRangeCompare, SceneTimeRangeLike, SceneTimeRangeState, SceneTimeRangeTransformerBase, SceneTimeZoneOverride, SceneToolbarButton, SceneToolbarInput, SceneUrlSyncOptions, SceneVariable, SceneVariableDependencyConfigLike, SceneVariableSet, SceneVariableSetState, SceneVariableState, SceneVariableValueChangedEvent, SceneVariables, SplitLayout, TestVariable, TextBoxVariable, UrlSyncContextProvider, UrlSyncManager, UrlSyncManagerLike, UseStateHookOptions, UserActionEvent, ValidateAndUpdateResult, VariableCustomFormatterFn, VariableDependencyConfig, VariableGetOptionsArgs, VariableValue, VariableValueControl, VariableValueOption, VariableValueSelectWrapper, VariableValueSelectors, VariableValueSingle, VizConfig, VizConfigBuilder, VizConfigBuilders, VizPanel, VizPanelBuilder, VizPanelExploreButton, VizPanelMenu, VizPanelState, index$1 as behaviors, index as dataLayers, formatRegistry, getExploreURL, isCustomVariableValue, isDataLayer, isDataRequestEnricher, isFiltersRequestEnricher, isSceneObject, registerQueryWithController, registerRuntimeDataSource, renderSelectForVariable, sceneGraph, sceneUtils, useSceneApp, useSceneObjectState, useUrlSync };
+export { AdHocFilterWithLabels, AdHocFiltersVariable, CancelActivationHandler, ConstantVariable, ControlsLabel, ControlsLayout, CustomFormatterVariable, CustomTransformOperator, CustomTransformerDefinition, CustomVariable, CustomVariableValue, DataLayerFilter, DataProviderProxy, DataRequestEnricher, DataSourceVariable, DeepPartial, EmbeddedScene, EmbeddedSceneState, ExtraQueryDataProcessor, ExtraQueryDescriptor, ExtraQueryProvider, FieldConfigBuilder, FieldConfigBuilders, FieldConfigOverridesBuilder, FiltersRequestEnricher, FormatVariable, GroupByVariable, InterpolationFormatParameter, IntervalVariable, LazyLoader, LocalValueVariable, MacroVariableConstructor, MultiValueVariable, MultiValueVariableState, NestedScene, NewSceneObjectAddedEvent, PanelBuilders, PanelOptionsBuilders, QueryRunnerState, QueryVariable, RuntimeDataSource, SafeSerializableSceneObject, SceneActivationHandler, SceneApp, SceneAppDrilldownView, SceneAppPage, SceneAppPageLike, SceneAppPageState, SceneAppRoute, SceneByFrameRepeater, SceneByVariableRepeater, SceneCSSGridItem, SceneCSSGridLayout, SceneCanvasText, SceneComponent, SceneComponentProps, SceneControlsSpacer, SceneDataLayerBase, SceneDataLayerControls, SceneDataLayerProvider, SceneDataLayerProviderState, SceneDataLayerSet, SceneDataLayerSetBase, SceneDataNode, SceneDataProvider, SceneDataProviderResult, SceneDataQuery, SceneDataState, SceneDataTransformer, SceneDataTransformerState, SceneDeactivationHandler, SceneDebugger, SceneFlexItem, SceneFlexItemLike, SceneFlexItemState, SceneFlexLayout, SceneGridItem, SceneGridItemLike, SceneGridItemStateLike, SceneGridLayout, SceneGridLayoutDragStartEvent, SceneGridRow, SceneInteractionProfileEvent, SceneLayout, SceneLayoutChildOptions, SceneLayoutState, SceneObject, SceneObjectBase, SceneObjectRef, SceneObjectState, SceneObjectStateChangedEvent, SceneObjectStateChangedPayload, SceneObjectUrlSyncConfig, SceneObjectUrlSyncHandler, SceneObjectUrlValue, SceneObjectUrlValues, SceneObjectWithUrlSync, SceneQueryControllerEntry, SceneQueryControllerEntryType, SceneQueryControllerLike, SceneQueryRunner, SceneReactObject, SceneRefreshPicker, SceneRefreshPickerState, SceneRouteMatch, SceneStateChangedHandler, SceneStatelessBehavior, SceneTimePicker, SceneTimeRange, SceneTimeRangeCompare, SceneTimeRangeLike, SceneTimeRangeState, SceneTimeRangeTransformerBase, SceneTimeZoneOverride, SceneToolbarButton, SceneToolbarInput, SceneUrlSyncOptions, SceneVariable, SceneVariableDependencyConfigLike, SceneVariableSet, SceneVariableSetState, SceneVariableState, SceneVariableValueChangedEvent, SceneVariables, SplitLayout, TestVariable, TextBoxVariable, UrlSyncContextProvider, UrlSyncManager, UrlSyncManagerLike, UseStateHookOptions, UserActionEvent, ValidateAndUpdateResult, VariableCustomFormatterFn, VariableDependencyConfig, VariableGetOptionsArgs, VariableValue, VariableValueControl, VariableValueOption, VariableValueSelectWrapper, VariableValueSelectors, VariableValueSingle, VizConfig, VizConfigBuilder, VizConfigBuilders, VizPanel, VizPanelBuilder, VizPanelExploreButton, VizPanelMenu, VizPanelState, index$1 as behaviors, index as dataLayers, formatRegistry, getExploreURL, isCustomVariableValue, isDataLayer, isDataRequestEnricher, isFiltersRequestEnricher, isSceneObject, registerQueryWithController, registerRuntimeDataSource, renderSelectForVariable, sceneGraph, sceneUtils, useSceneApp, useSceneObjectState, useUrlSync };

package/dist/index.js

@@ -537,23 +537,28 @@ function cloneSceneObjectState(sceneState, withState) {
       continue;
     }
     const propValue = clonedState[key];
-    if (propValue instanceof SceneObjectBase) {
-      clonedState[key] = propValue.clone();
-    }
     if (propValue instanceof SceneObjectRef) {
       console.warn("Cloning object with SceneObjectRef");
       continue;
     }
-    if (Array.isArray(propValue)) {
+    if (propValue instanceof SceneObjectBase) {
+      clonedState[key] = propValue.clone();
+    } else if (Array.isArray(propValue)) {
       const newArray = [];
       for (const child of propValue) {
         if (child instanceof SceneObjectBase) {
           newArray.push(child.clone());
+        } else if (typeof child === "object") {
+          newArray.push(lodash.cloneDeep(child));
         } else {
           newArray.push(child);
         }
       }
       clonedState[key] = newArray;
+    } else if (typeof propValue === "object") {
+      clonedState[key] = lodash.cloneDeep(propValue);
+    } else {
+      clonedState[key] = propValue;
     }
   }
   return clonedState;
@@ -3228,7 +3233,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;
@@ -3245,8 +3250,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 });
@@ -5384,13 +5388,9 @@ class AdHocFiltersVariable extends SceneObjectBase {
     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) {
     let filterExpressionChanged = false;
@@ -5474,7 +5474,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);
@@ -5492,8 +5492,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 });
@@ -5509,7 +5508,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
     return keys.map(toSelectableValue);
   }
   async _getValuesFor(filter) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     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);
@@ -5525,8 +5524,7 @@ class AdHocFiltersVariable extends SceneObjectBase {
       key: filter.key,
       filters: otherFilters,
       timeRange,
-      queries,
-      scopes: (_d = this._scopesBridge) == null ? void 0 : _d.getValue()
+      queries
     }, getEnrichedFiltersRequest(this)));
     if (responseHasError(response)) {
       this.setState({ error: response.error.message });
@@ -5714,7 +5712,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(
@@ -5725,7 +5722,6 @@ class SceneQueryRunner extends SceneObjectBase {
           })
         );
       }
-      this.subscribeToScopesChanges(scopesBridge);
       this.subscribeToTimeRangeChanges(timeRange);
       if (this.shouldRunQueriesOnActivate()) {
         this.runQueries();
@@ -5871,21 +5867,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;
@@ -5895,17 +5876,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;
@@ -5925,8 +5904,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;
     }
@@ -5939,22 +5918,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) {
@@ -5993,7 +5967,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;
     const { minInterval, queries } = this.state;
     let request = __spreadValues$y({
@@ -6013,8 +5987,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 = this._adhocFiltersVar.state.filters.filter(isFilterComplete);
@@ -6982,108 +6955,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.filter((context) => !!context && !context.state.loading),
-      rxjs.pairwise(),
-      rxjs.map(
-        ([prevContext, newContext]) => {
-          var _a, _b;
-          return [(_a = prevContext == null ? void 0 : prevContext.state.value) != null ? _a : [], (_b = newContext == null ? void 0 : newContext.state.value) != null ? _b : []];
-        }
-      ),
-      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;
@@ -7227,10 +7098,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,
@@ -7247,8 +7114,7 @@ const sceneGraph = {
   findAllObjects,
   getAncestor,
   getQueryController,
-  findDescendents,
-  getScopesBridge
+  findDescendents
 };
 
 class UniqueUrlKeyMapper {
@@ -13002,10 +12868,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"
@@ -13013,10 +12875,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,
@@ -13024,7 +12884,7 @@ SceneApp.Component = ({ model }) => {
     element: /* @__PURE__ */ React__default["default"].createElement(page.Component, {
       model: page
     })
-  })))));
+  }))));
 };
 const SceneAppContext = React.createContext(null);
 const sceneAppCache = /* @__PURE__ */ new Map();
@@ -13379,21 +13239,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 });
@@ -14392,7 +14237,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;