IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Query Editor: Internal context to actions (#64518)

Browse Source 
loadedDataSourceIdentifier is not always loaded, but always queried; comment adds understanding to a specific use case
This commit is contained in:
Polina Boneva
2023-03-09 16:43:13 +02:00
committed by GitHub
parent 17537b033d
commit 0b1ad0a879
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/features/query/components/QueryEditorRow.tsx
View File

@@ -64,7 +64,7 @@ interface Props<TQuery extends DataQuery> {
interface State<TQuery extends DataQuery> { interface State<TQuery extends DataQuery> {
/** DatasourceUid or ds variable expression used to resolve current datasource */ /** DatasourceUid or ds variable expression used to resolve current datasource */
loadedDataSourceIdentifier?: string | null; queriedDataSourceIdentifier?: string | null;
datasource: DataSourceApi<TQuery> | null; datasource: DataSourceApi<TQuery> | null;
datasourceUid?: string | null; datasourceUid?: string | null;
hasTextEditMode: boolean; hasTextEditMode: boolean;
@@ -158,18 +158,19 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
try { try {
datasource = await this.dataSourceSrv.get(interpolatedUID); datasource = await this.dataSourceSrv.get(interpolatedUID);
} catch (error) { } catch (error) {
// If the DS doesn't exist, it fails. Getting with no args returns the default DS.
datasource = await this.dataSourceSrv.get(); datasource = await this.dataSourceSrv.get();
} }
this.setState({ this.setState({
datasource: datasource as unknown as DataSourceApi<TQuery>, datasource: datasource as unknown as DataSourceApi<TQuery>,
loadedDataSourceIdentifier: interpolatedUID, queriedDataSourceIdentifier: interpolatedUID,
hasTextEditMode: has(datasource, 'components.QueryCtrl.prototype.toggleEditorMode'), hasTextEditMode: has(datasource, 'components.QueryCtrl.prototype.toggleEditorMode'),
}); });
} }
componentDidUpdate(prevProps: Props<TQuery>) { componentDidUpdate(prevProps: Props<TQuery>) {
const { datasource, loadedDataSourceIdentifier } = this.state; const { datasource, queriedDataSourceIdentifier } = this.state;
const { data, query } = this.props; const { data, query } = this.props;
if (prevProps.id !== this.props.id) { if (prevProps.id !== this.props.id) {
@@ -191,7 +192,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
} }
// check if we need to load another datasource // check if we need to load another datasource
if (datasource && loadedDataSourceIdentifier !== this.getInterpolatedDataSourceUID()) { if (datasource && queriedDataSourceIdentifier !== this.getInterpolatedDataSourceUID()) {
if (this.angularQueryEditor) { if (this.angularQueryEditor) {
this.angularQueryEditor.destroy(); this.angularQueryEditor.destroy();
this.angularQueryEditor = null; this.angularQueryEditor = null;
@@ -252,7 +253,7 @@ export class QueryEditorRow<TQuery extends DataQuery> extends PureComponent<Prop
isWaitingForDatasourceToLoad(): boolean { isWaitingForDatasourceToLoad(): boolean {
// if we not yet have loaded the datasource in state the // if we not yet have loaded the datasource in state the
// ds in props and the ds in state will have different values. // ds in props and the ds in state will have different values.
return this.getInterpolatedDataSourceUID() !== this.state.loadedDataSourceIdentifier; return this.getInterpolatedDataSourceUID() !== this.state.queriedDataSourceIdentifier;
} }
renderPluginEditor = () => { renderPluginEditor = () => {