@grafana/scenes 6.0.3--canary.990.13366792126.0 → 6.1.0--canary.882.13435236858.0

package/dist/index.js

@@ -984,14 +984,14 @@ class SceneObjectUrlSyncConfig {
   updateFromUrl(values) {
     this._sceneObject.updateFromUrl(values);
   }
+  shouldCreateHistoryStep(values) {
+    return this._nextChangeShouldAddHistoryStep;
+  }
   performBrowserHistoryAction(callback) {
     this._nextChangeShouldAddHistoryStep = true;
     callback();
     this._nextChangeShouldAddHistoryStep = false;
   }
-  shouldCreateHistoryStep(values) {
-    return this._nextChangeShouldAddHistoryStep;
-  }
 }
 
 const INTERVAL_STRING_REGEX = /^\d+[yYmMsSwWhHdD]$/;
@@ -1896,7 +1896,8 @@ class MultiValueVariable extends SceneObjectBase {
       return { value: "", text: "" };
     }
   }
-  changeValueTo(value, text) {
+  changeValueTo(value, text, isUserAction = false) {
+    var _a, _b;
     if (value === this.state.value && text === this.state.text) {
       return;
     }
@@ -1926,7 +1927,12 @@ class MultiValueVariable extends SceneObjectBase {
     if (lodash.isEqual(value, this.state.value) && lodash.isEqual(text, this.state.text)) {
       return;
     }
-    this.setStateHelper({ value, text, loading: false });
+    const stateChangeAction = () => this.setStateHelper({ value, text, loading: false });
+    if (isUserAction) {
+      (_b = (_a = this._urlSync).performBrowserHistoryAction) == null ? void 0 : _b.call(_a, stateChangeAction);
+    } else {
+      stateChangeAction();
+    }
     this.publishEvent(new SceneVariableValueChangedEvent(this), true);
   }
   findLabelTextForValue(value) {
@@ -1980,6 +1986,7 @@ function findOptionMatchingCurrent(currentValue, currentText, options) {
 class MultiValueUrlSyncHandler {
   constructor(_sceneObject) {
     this._sceneObject = _sceneObject;
+    this._nextChangeShouldAddHistoryStep = false;
   }
   getKey() {
     return `var-${this._sceneObject.state.name}`;
@@ -2020,6 +2027,14 @@ class MultiValueUrlSyncHandler {
       this._sceneObject.changeValueTo(urlValue);
     }
   }
+  performBrowserHistoryAction(callback) {
+    this._nextChangeShouldAddHistoryStep = true;
+    callback();
+    this._nextChangeShouldAddHistoryStep = false;
+  }
+  shouldCreateHistoryStep(values) {
+    return this._nextChangeShouldAddHistoryStep;
+  }
 }
 function handleLegacyUrlAllValue(value) {
   if (lodash.isArray(value) && value[0] === ALL_VARIABLE_TEXT) {
@@ -2915,7 +2930,7 @@ function VariableValueSelect({ model }) {
     options: filteredOptions,
     "data-testid": e2eSelectors.selectors.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts(`${value}`),
     onChange: (newValue) => {
-      model.changeValueTo(newValue.value, newValue.label);
+      model.changeValueTo(newValue.value, newValue.label, true);
       queryController == null ? void 0 : queryController.startProfile(model);
       if (hasCustomValue !== newValue.__isNew__) {
         setHasCustomValue(newValue.__isNew__);
@@ -2982,14 +2997,14 @@ function VariableValueSelectMulti({ model }) {
     hideSelectedOptions: false,
     onInputChange,
     onBlur: () => {
-      model.changeValueTo(uncommittedValue);
+      model.changeValueTo(uncommittedValue, void 0, true);
       queryController == null ? void 0 : queryController.startProfile(model);
     },
     filterOption: filterNoOp$2,
     "data-testid": e2eSelectors.selectors.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts(`${uncommittedValue}`),
     onChange: (newValue, action) => {
       if (action.action === "clear" && noValueOnClear) {
-        model.changeValueTo([]);
+        model.changeValueTo([], void 0, true);
       }
       setUncommittedValue(newValue.map((x) => x.value));
     }
@@ -3213,7 +3228,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;
@@ -3230,8 +3245,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 });
@@ -3389,12 +3403,13 @@ function GroupByVariableRenderer({ model }) {
     onBlur: () => {
       model.changeValueTo(
         uncommittedValue.map((x) => x.value),
-        uncommittedValue.map((x) => x.label)
+        uncommittedValue.map((x) => x.label),
+        true
       );
     },
     onChange: (newValue, action) => {
       if (action.action === "clear" && noValueOnClear) {
-        model.changeValueTo([]);
+        model.changeValueTo([], void 0, true);
       }
       setUncommittedValue(newValue);
     },
@@ -5368,13 +5383,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;
@@ -5458,7 +5469,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);
@@ -5476,8 +5487,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 });
@@ -5493,7 +5503,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);
@@ -5509,8 +5519,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 });
@@ -5698,7 +5707,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(
@@ -5709,7 +5717,6 @@ class SceneQueryRunner extends SceneObjectBase {
           })
         );
       }
-      this.subscribeToScopesChanges(scopesBridge);
       this.subscribeToTimeRangeChanges(timeRange);
       if (this.shouldRunQueriesOnActivate()) {
         this.runQueries();
@@ -5855,21 +5862,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;
@@ -5879,17 +5871,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;
@@ -5909,8 +5899,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;
     }
@@ -5923,22 +5913,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) {
@@ -5977,7 +5962,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({
@@ -5997,8 +5982,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);
@@ -6966,108 +6950,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;
@@ -7211,10 +7093,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,
@@ -7231,8 +7109,7 @@ const sceneGraph = {
   findAllObjects,
   getAncestor,
   getQueryController,
-  findDescendents,
-  getScopesBridge
+  findDescendents
 };
 
 class UniqueUrlKeyMapper {
@@ -12975,10 +12852,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"
@@ -12986,10 +12859,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,
@@ -12997,7 +12868,7 @@ SceneApp.Component = ({ model }) => {
     element: /* @__PURE__ */ React__default["default"].createElement(page.Component, {
       model: page
     })
-  })))));
+  }))));
 };
 const SceneAppContext = React.createContext(null);
 const sceneAppCache = /* @__PURE__ */ new Map();
@@ -13352,21 +13223,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 });
@@ -13474,16 +13330,13 @@ function SceneAppPageRenderer({ model }) {
   return /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Routes, null, routes);
 }
 function getFallbackRoute(page) {
+  var _a, _b, _c;
   return /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
     key: "fallback route",
     path: "*",
-    Component: () => {
-      var _a, _b, _c;
-      const fallbackPage = (_c = (_b = (_a = page.state).getFallbackPage) == null ? void 0 : _b.call(_a)) != null ? _c : getDefaultFallbackPage();
-      return /* @__PURE__ */ React__default["default"].createElement(SceneAppPageView, {
-        page: fallbackPage
-      });
-    }
+    element: /* @__PURE__ */ React__default["default"].createElement(SceneAppPageView, {
+      page: (_c = (_b = (_a = page.state).getFallbackPage) == null ? void 0 : _b.call(_a)) != null ? _c : getDefaultFallbackPage()
+    })
   });
 }
 function getDefaultFallbackPage() {
@@ -14366,7 +14219,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;