From 438ed088e0e8a4c0e078aa23b513a5e7662e2762 Mon Sep 17 00:00:00 2001 From: Kristina Demeshchik Date: Fri, 6 Mar 2026 15:40:49 -0500 Subject: [PATCH 1/2] skip mixed ds --- packages/scenes/src/querying/SceneQueryRunner.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/scenes/src/querying/SceneQueryRunner.ts b/packages/scenes/src/querying/SceneQueryRunner.ts index d027c5b97..f73aab0c1 100644 --- a/packages/scenes/src/querying/SceneQueryRunner.ts +++ b/packages/scenes/src/querying/SceneQueryRunner.ts @@ -293,7 +293,10 @@ export class SceneQueryRunner extends SceneObjectBase implemen } private _isRelevantAutoVariable(variable: AdHocFiltersVariable | GroupByVariable) { - const datasource = this.state.datasource ?? findFirstDatasource(this.state.queries); + const datasource = (this.state.datasource && this.state.datasource.uid !== '-- Mixed --') + ? this.state.datasource + : findFirstDatasource(this.state.queries); + return variable.state.applyMode === 'auto' && datasource?.uid === variable.state.datasource?.uid; } @@ -465,7 +468,10 @@ export class SceneQueryRunner extends SceneObjectBase implemen } try { - const datasource = this.state.datasource ?? findFirstDatasource(queries); + const datasource = (this.state.datasource && this.state.datasource.uid !== '-- Mixed --') + ? this.state.datasource + : findFirstDatasource(this.state.queries); + const ds = await getDataSource(datasource, this._scopedVars); this._drilldownDependenciesManager.findAndSubscribeToDrilldowns(ds.uid, this); From 076eb055b0659efe01d484112ac4bfa1055b50bf Mon Sep 17 00:00:00 2001 From: Kristina Demeshchik Date: Fri, 6 Mar 2026 15:42:11 -0500 Subject: [PATCH 2/2] re-use --- .../scenes/src/querying/SceneQueryRunner.ts | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/scenes/src/querying/SceneQueryRunner.ts b/packages/scenes/src/querying/SceneQueryRunner.ts index f73aab0c1..51116d279 100644 --- a/packages/scenes/src/querying/SceneQueryRunner.ts +++ b/packages/scenes/src/querying/SceneQueryRunner.ts @@ -292,12 +292,13 @@ export class SceneQueryRunner extends SceneObjectBase implemen } } - private _isRelevantAutoVariable(variable: AdHocFiltersVariable | GroupByVariable) { - const datasource = (this.state.datasource && this.state.datasource.uid !== '-- Mixed --') - ? this.state.datasource - : findFirstDatasource(this.state.queries); + private _getEffectiveDatasource(): DataSourceRef | undefined { + const ds = this.state.datasource; + return ds && ds.uid !== '-- Mixed --' ? ds : findFirstDatasource(this.state.queries); + } - return variable.state.applyMode === 'auto' && datasource?.uid === variable.state.datasource?.uid; + private _isRelevantAutoVariable(variable: AdHocFiltersVariable | GroupByVariable) { + return variable.state.applyMode === 'auto' && this._getEffectiveDatasource()?.uid === variable.state.datasource?.uid; } private shouldRunQueriesOnActivate() { @@ -468,11 +469,7 @@ export class SceneQueryRunner extends SceneObjectBase implemen } try { - const datasource = (this.state.datasource && this.state.datasource.uid !== '-- Mixed --') - ? this.state.datasource - : findFirstDatasource(this.state.queries); - - const ds = await getDataSource(datasource, this._scopedVars); + const ds = await getDataSource(this._getEffectiveDatasource(), this._scopedVars); this._drilldownDependenciesManager.findAndSubscribeToDrilldowns(ds.uid, this);