Skip to content

ADdhoc: skip mixed ds #1386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
kristinademeshchik wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

ADdhoc: skip mixed ds #1386

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
438ed08
skip mixed ds
kristinademeshchik Mar 6, 2026
076eb05
re-use
kristinademeshchik Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/scenes/src/querying/SceneQueryRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,13 @@ export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> implemen
}
}

private _getEffectiveDatasource(): DataSourceRef | undefined {
const ds = this.state.datasource;
return ds && ds.uid !== '-- Mixed --' ? ds : findFirstDatasource(this.state.queries);
}

private _isRelevantAutoVariable(variable: AdHocFiltersVariable | GroupByVariable) {
const datasource = this.state.datasource ?? findFirstDatasource(this.state.queries);
return variable.state.applyMode === 'auto' && datasource?.uid === variable.state.datasource?.uid;
return variable.state.applyMode === 'auto' && this._getEffectiveDatasource()?.uid === variable.state.datasource?.uid;
}

private shouldRunQueriesOnActivate() {
Expand Down Expand Up @@ -465,8 +469,7 @@ export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> implemen
}

try {
const datasource = this.state.datasource ?? findFirstDatasource(queries);
const ds = await getDataSource(datasource, this._scopedVars);
const ds = await getDataSource(this._getEffectiveDatasource(), this._scopedVars);

this._drilldownDependenciesManager.findAndSubscribeToDrilldowns(ds.uid, this);

Expand Down
Loading