@grafana/scenes 6.32.1--canary.1233.17398013859.0 → 6.33.0

package/dist/index.d.ts

@@ -1659,6 +1659,7 @@ declare class AnnotationsDataLayer extends SceneDataLayerBase<AnnotationsDataLay
     static Component: typeof AnnotationsDataLayerRenderer;
     private _scopedVars;
     private _timeRangeSub;
+    private _drilldownDependenciesManager;
     constructor(initialState: AnnotationsDataLayerState);
     onEnable(): void;
     onDisable(): void;
@@ -1780,10 +1781,9 @@ declare class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> impleme
     private _scopedVars;
     private _layerAnnotations?;
     private _resultAnnotations?;
-    private _adhocFiltersVar?;
-    private _groupByVar?;
     getResultsStream(): ReplaySubject<SceneDataProviderResult>;
     protected _variableDependency: VariableDependencyConfig<QueryRunnerState>;
+    private _drilldownDependenciesManager;
     constructor(initialState: QueryRunnerState);
     private _onActivate;
     private _handleDataLayers;
@@ -1828,11 +1828,6 @@ declare class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> impleme
      * This will return an array of the closest provider of each type.
      */
     private getClosestExtraQueryProviders;
-    /**
-     * Walk up scene graph and find the closest filterset with matching data source
-     */
-    private findAndSubscribeToAdHocFilters;
-    private _updateExplicitVariableDependencies;
     private isQueryModeAuto;
 }
 

package/dist/index.js

@@ -2868,49 +2868,6 @@ function getEnrichedDataRequest(sourceRunner) {
   return null;
 }
 
-let originalGetAdhocFilters = void 0;
-let allActiveFilterSets = /* @__PURE__ */ new Set();
-function patchGetAdhocFilters(filterVar) {
-  filterVar.addActivationHandler(() => {
-    allActiveFilterSets.add(filterVar);
-    return () => allActiveFilterSets.delete(filterVar);
-  });
-  if (originalGetAdhocFilters) {
-    return;
-  }
-  const templateSrv = runtime.getTemplateSrv();
-  if (!(templateSrv == null ? void 0 : templateSrv.getAdhocFilters)) {
-    console.log("Failed to patch getAdhocFilters");
-    return;
-  }
-  originalGetAdhocFilters = templateSrv.getAdhocFilters;
-  templateSrv.getAdhocFilters = function getAdhocFiltersScenePatch(dsName) {
-    var _a;
-    if (allActiveFilterSets.size === 0) {
-      return originalGetAdhocFilters.call(templateSrv, dsName);
-    }
-    const ds = runtime.getDataSourceSrv().getInstanceSettings(dsName);
-    if (!ds) {
-      return [];
-    }
-    for (const filter of allActiveFilterSets.values()) {
-      if (((_a = filter.state.datasource) == null ? void 0 : _a.uid) === ds.uid) {
-        return filter.state.filters;
-      }
-    }
-    return [];
-  }.bind(templateSrv);
-}
-function findActiveAdHocFilterVariableByUid(dsUid) {
-  var _a;
-  for (const filter of allActiveFilterSets.values()) {
-    if (interpolate(filter, (_a = filter.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
-      return filter;
-    }
-  }
-  return void 0;
-}
-
 const allActiveGroupByVariables = /* @__PURE__ */ new Set();
 function findActiveGroupByVariablesByUid(dsUid) {
   var _a;
@@ -3808,6 +3765,49 @@ function toSelectableValue$1(input) {
   return result;
 }
 
+let originalGetAdhocFilters = void 0;
+const allActiveFilterSets = /* @__PURE__ */ new Set();
+function patchGetAdhocFilters(filterVar) {
+  filterVar.addActivationHandler(() => {
+    allActiveFilterSets.add(filterVar);
+    return () => allActiveFilterSets.delete(filterVar);
+  });
+  if (originalGetAdhocFilters) {
+    return;
+  }
+  const templateSrv = runtime.getTemplateSrv();
+  if (!(templateSrv == null ? void 0 : templateSrv.getAdhocFilters)) {
+    console.log("Failed to patch getAdhocFilters");
+    return;
+  }
+  originalGetAdhocFilters = templateSrv.getAdhocFilters;
+  templateSrv.getAdhocFilters = function getAdhocFiltersScenePatch(dsName) {
+    var _a;
+    if (allActiveFilterSets.size === 0) {
+      return originalGetAdhocFilters.call(templateSrv, dsName);
+    }
+    const ds = runtime.getDataSourceSrv().getInstanceSettings(dsName);
+    if (!ds) {
+      return [];
+    }
+    for (const filter of allActiveFilterSets.values()) {
+      if (((_a = filter.state.datasource) == null ? void 0 : _a.uid) === ds.uid) {
+        return filter.state.filters;
+      }
+    }
+    return [];
+  }.bind(templateSrv);
+}
+function findActiveAdHocFilterVariableByUid(dsUid) {
+  var _a;
+  for (const filter of allActiveFilterSets.values()) {
+    if (interpolate(filter, (_a = filter.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
+      return filter;
+    }
+  }
+  return void 0;
+}
+
 function LoadingIndicator(props) {
   return /* @__PURE__ */ React__default.default.createElement(ui.Tooltip, { content: i18n.t("grafana-scenes.utils.loading-indicator.content-cancel-query", "Cancel query") }, /* @__PURE__ */ React__default.default.createElement(
     ui.Icon,
@@ -6409,6 +6409,60 @@ function areDifferentLayers(a, b) {
   return false;
 }
 
+class DrilldownDependenciesManager {
+  constructor(variableDependency) {
+    this._variableDependency = variableDependency;
+  }
+  /**
+   * Walk up scene graph and find the closest filterset with matching data source
+   */
+  findAndSubscribeToDrilldowns(interpolatedUid) {
+    const filtersVar = findActiveAdHocFilterVariableByUid(interpolatedUid);
+    const groupByVar = findActiveGroupByVariablesByUid(interpolatedUid);
+    let hasChanges = false;
+    if (this._adhocFiltersVar !== filtersVar) {
+      this._adhocFiltersVar = filtersVar;
+      hasChanges = true;
+    }
+    if (this._groupByVar !== groupByVar) {
+      this._groupByVar = groupByVar;
+      hasChanges = true;
+    }
+    if (hasChanges) {
+      this._updateExplicitDrilldownVariableDependencies();
+    }
+  }
+  _updateExplicitDrilldownVariableDependencies() {
+    const explicitDependencies = [];
+    if (this._adhocFiltersVar) {
+      explicitDependencies.push(this._adhocFiltersVar.state.name);
+    }
+    if (this._groupByVar) {
+      explicitDependencies.push(this._groupByVar.state.name);
+    }
+    this._variableDependency.setVariableNames(explicitDependencies);
+  }
+  get adHocFiltersVar() {
+    return this._adhocFiltersVar;
+  }
+  get groupByVar() {
+    return this._groupByVar;
+  }
+  getFilters() {
+    var _a;
+    return this._adhocFiltersVar ? [...(_a = this._adhocFiltersVar.state.originFilters) != null ? _a : [], ...this._adhocFiltersVar.state.filters].filter(
+      (f) => isFilterComplete(f) && isFilterApplicable(f)
+    ) : void 0;
+  }
+  getGroupByKeys() {
+    return this._groupByVar ? this._groupByVar.getApplicableKeys() : void 0;
+  }
+  cleanup() {
+    this._adhocFiltersVar = void 0;
+    this._groupByVar = void 0;
+  }
+}
+
 let counter$1 = 100;
 function getNextRequestId$1() {
   return "SQR" + counter$1++;
@@ -6426,6 +6480,7 @@ class SceneQueryRunner extends SceneObjectBase {
       onAnyVariableChanged: this.onAnyVariableChanged.bind(this),
       dependsOnScopes: true
     });
+    this._drilldownDependenciesManager = new DrilldownDependenciesManager(this._variableDependency);
     this.onDataReceived = (data$1) => {
       const preProcessedData = data.preProcessPanelData(data$1, this.state.data);
       this._resultAnnotations = data$1.annotations;
@@ -6541,7 +6596,7 @@ class SceneQueryRunner extends SceneObjectBase {
    * Check if value changed is a adhoc filter o group by variable that did not exist when we issued the last query
    */
   onAnyVariableChanged(variable) {
-    if (this._adhocFiltersVar === variable || this._groupByVar === variable || !this.isQueryModeAuto()) {
+    if (this._drilldownDependenciesManager.adHocFiltersVar === variable || this._drilldownDependenciesManager.groupByVar === variable || !this.isQueryModeAuto()) {
       return;
     }
     if (variable instanceof AdHocFiltersVariable && this._isRelevantAutoVariable(variable)) {
@@ -6595,8 +6650,7 @@ class SceneQueryRunner extends SceneObjectBase {
     (_a = this._timeSub) == null ? void 0 : _a.unsubscribe();
     this._timeSub = void 0;
     this._timeSubRange = void 0;
-    this._adhocFiltersVar = void 0;
-    this._groupByVar = void 0;
+    this._drilldownDependenciesManager.cleanup();
   }
   setContainerWidth(width) {
     if (!this._containerWidth && width > 0) {
@@ -6677,7 +6731,7 @@ class SceneQueryRunner extends SceneObjectBase {
     try {
       const datasource = (_c = this.state.datasource) != null ? _c : findFirstDatasource(queries);
       const ds = await getDataSource(datasource, this._scopedVars);
-      this.findAndSubscribeToAdHocFilters(ds.uid);
+      this._drilldownDependenciesManager.findAndSubscribeToDrilldowns(ds.uid);
       const runRequest = runtime.getRunRequest();
       const { primary, secondaries, processors } = this.prepareRequests(timeRange, ds);
       writeSceneLog("SceneQueryRunner", "Starting runRequest", this.state.key);
@@ -6721,7 +6775,7 @@ class SceneQueryRunner extends SceneObjectBase {
     return clone;
   }
   prepareRequests(timeRange, ds) {
-    var _a, _b;
+    var _a;
     const { minInterval, queries } = this.state;
     let request = {
       app: "scenes",
@@ -6745,14 +6799,13 @@ class SceneQueryRunner extends SceneObjectBase {
       // This asks the scene root to provide context properties like app, panel and dashboardUID
       ...getEnrichedDataRequest(this)
     };
-    if (this._adhocFiltersVar) {
-      request.filters = [
-        ...(_a = this._adhocFiltersVar.state.originFilters) != null ? _a : [],
-        ...this._adhocFiltersVar.state.filters
-      ].filter((f) => isFilterComplete(f) && isFilterApplicable(f));
+    const filters = this._drilldownDependenciesManager.getFilters();
+    const groupByKeys = this._drilldownDependenciesManager.getGroupByKeys();
+    if (filters) {
+      request.filters = filters;
     }
-    if (this._groupByVar) {
-      request.groupByKeys = this._groupByVar.getApplicableKeys();
+    if (groupByKeys) {
+      request.groupByKeys = groupByKeys;
     }
     request.targets = request.targets.map((query) => {
       var _a2;
@@ -6772,7 +6825,7 @@ class SceneQueryRunner extends SceneObjectBase {
     const primaryTimeRange = timeRange.state.value;
     let secondaryRequests = [];
     let secondaryProcessors = /* @__PURE__ */ new Map();
-    for (const provider of (_b = this.getClosestExtraQueryProviders()) != null ? _b : []) {
+    for (const provider of (_a = this.getClosestExtraQueryProviders()) != null ? _a : []) {
       for (const { req, processor } of provider.getExtraQueries(request)) {
         const requestId = getNextRequestId$1();
         secondaryRequests.push({ ...req, requestId });
@@ -6819,31 +6872,6 @@ class SceneQueryRunner extends SceneObjectBase {
     });
     return Array.from(found.values());
   }
-  /**
-   * Walk up scene graph and find the closest filterset with matching data source
-   */
-  findAndSubscribeToAdHocFilters(interpolatedUid) {
-    const filtersVar = findActiveAdHocFilterVariableByUid(interpolatedUid);
-    if (this._adhocFiltersVar !== filtersVar) {
-      this._adhocFiltersVar = filtersVar;
-      this._updateExplicitVariableDependencies();
-    }
-    const groupByVar = findActiveGroupByVariablesByUid(interpolatedUid);
-    if (this._groupByVar !== groupByVar) {
-      this._groupByVar = groupByVar;
-      this._updateExplicitVariableDependencies();
-    }
-  }
-  _updateExplicitVariableDependencies() {
-    const explicitDependencies = [];
-    if (this._adhocFiltersVar) {
-      explicitDependencies.push(this._adhocFiltersVar.state.name);
-    }
-    if (this._groupByVar) {
-      explicitDependencies.push(this._groupByVar.state.name);
-    }
-    this._variableDependency.setVariableNames(explicitDependencies);
-  }
   isQueryModeAuto() {
     var _a;
     return ((_a = this.state.runQueriesMode) != null ? _a : "auto") === "auto";
@@ -9797,7 +9825,7 @@ let counter = 100;
 function getNextRequestId() {
   return "AQ" + counter++;
 }
-function executeAnnotationQuery(datasource, timeRange, query, layer) {
+function executeAnnotationQuery(datasource, timeRange, query, layer, filters, groupByKeys) {
   var _a;
   if (datasource.annotationQuery && shouldUseLegacyRunner(datasource)) {
     console.warn("Using deprecated annotationQuery method, please upgrade your datasource");
@@ -9864,6 +9892,8 @@ function executeAnnotationQuery(datasource, timeRange, query, layer) {
       }
     ],
     scopes: sceneGraph.getScopes(layer),
+    filters,
+    groupByKeys,
     ...getEnrichedDataRequest(layer)
   };
   const runRequest = runtime.getRunRequest();
@@ -9962,6 +9992,7 @@ class AnnotationsDataLayer extends SceneDataLayerBase {
     this._scopedVars = {
       __sceneObject: wrapInSafeSerializableSceneObject(this)
     };
+    this._drilldownDependenciesManager = new DrilldownDependenciesManager(this._variableDependency);
   }
   onEnable() {
     this.publishEvent(new runtime.RefreshEvent(), true);
@@ -9993,10 +10024,12 @@ class AnnotationsDataLayer extends SceneDataLayerBase {
     this.runWithTimeRange(timeRange);
   }
   async runWithTimeRange(timeRange) {
+    var _a;
     const { query } = this.state;
     if (!query.enable) {
       return;
     }
+    this._drilldownDependenciesManager.findAndSubscribeToDrilldowns((_a = query.datasource) == null ? void 0 : _a.uid);
     if (this.querySub) {
       this.querySub.unsubscribe();
     }
@@ -10006,7 +10039,14 @@ class AnnotationsDataLayer extends SceneDataLayerBase {
     }
     try {
       const ds = await this.resolveDataSource(query);
-      let stream = executeAnnotationQuery(ds, timeRange, query, this).pipe(
+      let stream = executeAnnotationQuery(
+        ds,
+        timeRange,
+        query,
+        this,
+        this._drilldownDependenciesManager.getFilters(),
+        this._drilldownDependenciesManager.getGroupByKeys()
+      ).pipe(
         registerQueryWithController({
           type: "AnnotationsDataLayer/annotationsLoading",
           origin: this,