@grafana/scenes 5.33.1--canary.996.12371059735.0 → 5.34.0

package/dist/index.js

@@ -2481,7 +2481,7 @@ function patchGetAdhocFilters(filterVar) {
 function findActiveAdHocFilterVariableByUid(dsUid) {
   var _a;
   for (const filter of allActiveFilterSets.values()) {
-    if (interpolate(filter, (_a = filter.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
+    if (((_a = filter.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
       return filter;
     }
   }
@@ -2527,7 +2527,7 @@ const allActiveGroupByVariables = /* @__PURE__ */ new Set();
 function findActiveGroupByVariablesByUid(dsUid) {
   var _a;
   for (const groupByVariable of allActiveGroupByVariables.values()) {
-    if (interpolate(groupByVariable, (_a = groupByVariable.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
+    if (((_a = groupByVariable.state.datasource) == null ? void 0 : _a.uid) === dsUid) {
       return groupByVariable;
     }
   }
@@ -5570,7 +5570,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.findAndSubscribeToAdHocFilters(datasource == null ? void 0 : datasource.uid);
       const runRequest = runtime.getRunRequest();
       const { primary, secondaries, processors } = this.prepareRequests(timeRange, ds);
       writeSceneLog("SceneQueryRunner", "Starting runRequest", this.state.key);
@@ -5699,13 +5699,13 @@ class SceneQueryRunner extends SceneObjectBase {
     });
     return Array.from(found.values());
   }
-  findAndSubscribeToAdHocFilters(interpolatedUid) {
-    const filtersVar = findActiveAdHocFilterVariableByUid(interpolatedUid);
+  findAndSubscribeToAdHocFilters(uid) {
+    const filtersVar = findActiveAdHocFilterVariableByUid(uid);
     if (this._adhocFiltersVar !== filtersVar) {
       this._adhocFiltersVar = filtersVar;
       this._updateExplicitVariableDependencies();
     }
-    const groupByVar = findActiveGroupByVariablesByUid(interpolatedUid);
+    const groupByVar = findActiveGroupByVariablesByUid(uid);
     if (this._groupByVar !== groupByVar) {
       this._groupByVar = groupByVar;
       this._updateExplicitVariableDependencies();
@@ -5799,16 +5799,13 @@ function escapeLokiRegexp(value) {
   return value.replace(RE2_METACHARACTERS, "\\$&");
 }
 function getQueriesForVariables(sourceObject) {
-  var _a;
   const runners = sceneGraph.findAllObjects(
     sourceObject.getRoot(),
     (o) => o instanceof SceneQueryRunner
   );
-  const interpolatedDsUuid = sceneGraph.interpolate(sourceObject, (_a = sourceObject.state.datasource) == null ? void 0 : _a.uid);
   const applicableRunners = filterOutInactiveRunnerDuplicates(runners).filter((r) => {
-    var _a2;
-    const interpolatedQueryDsUuid = sceneGraph.interpolate(sourceObject, (_a2 = r.state.datasource) == null ? void 0 : _a2.uid);
-    return interpolatedQueryDsUuid === interpolatedDsUuid;
+    var _a, _b;
+    return ((_a = r.state.datasource) == null ? void 0 : _a.uid) === ((_b = sourceObject.state.datasource) == null ? void 0 : _b.uid);
   });
   if (applicableRunners.length === 0) {
     return [];
@@ -6108,6 +6105,12 @@ const hasCustomVariableSupport = (datasource) => {
   const variableSupport = datasource.variables;
   return "query" in variableSupport && "editor" in variableSupport && Boolean(variableSupport.query) && Boolean(variableSupport.editor);
 };
+const hasDataSourceVariableSupport = (datasource) => {
+  if (!datasource.variables) {
+    return false;
+  }
+  return datasource.variables.getType() === data.VariableSupportType.Datasource;
+};
 
 var __defProp$w = Object.defineProperty;
 var __defProps$k = Object.defineProperties;
@@ -6203,6 +6206,29 @@ class CustomQueryRunner {
     return this._runRequest(this.datasource, request, this.datasource.variables.query.bind(this.datasource.variables));
   }
 }
+const variableDummyRefId = "variable-query";
+class DatasourceQueryRunner {
+  constructor(datasource, _runRequest = runtime.getRunRequest()) {
+    this.datasource = datasource;
+    this._runRequest = _runRequest;
+  }
+  getTarget(variable) {
+    var _a;
+    if (hasDataSourceVariableSupport(this.datasource)) {
+      if (typeof variable.state.query === "string") {
+        return variable.state.query;
+      }
+      return __spreadProps$k(__spreadValues$w({}, variable.state.query), { refId: (_a = variable.state.query.refId) != null ? _a : variableDummyRefId });
+    }
+    throw new Error("Couldn't create a target with supplied arguments.");
+  }
+  runRequest(_, request) {
+    if (!hasDataSourceVariableSupport(this.datasource)) {
+      return getEmptyMetricFindValueObservable();
+    }
+    return this._runRequest(this.datasource, request, this.datasource.query);
+  }
+}
 function getEmptyMetricFindValueObservable() {
   return rxjs.of({ state: data.LoadingState.Done, series: [], timeRange: data.getDefaultTimeRange() });
 }
@@ -6216,6 +6242,9 @@ function createQueryVariableRunnerFactory(datasource) {
   if (hasCustomVariableSupport(datasource)) {
     return new CustomQueryRunner(datasource);
   }
+  if (hasDataSourceVariableSupport(datasource)) {
+    return new DatasourceQueryRunner(datasource);
+  }
   throw new Error(`Couldn't create a query runner for datasource ${datasource.type}`);
 }
 let createQueryVariableRunner = createQueryVariableRunnerFactory;