Skip to content
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

Jump to bottom

Datasources: Propagate TestDataDB default selection to PanelModel #57703

Closed
wants to merge 10 commits into from
Closed

Datasources: Propagate TestDataDB default selection to PanelModel #57703

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8280a70
send selection changed event to panel after query editor renders
mmandrus Oct 26, 2022
c21c04a
Merge branch 'main' into mmandrus/fix-testdatadb-default-selection
mmandrus Oct 26, 2022
97f5615
do some things to fix e2e tests
mmandrus Oct 27, 2022
ef48f58
update e2e test to look for most recent 3 elements only
mmandrus Oct 27, 2022
0ae3fc6
Merge branch 'main' into mmandrus/fix-testdatadb-default-selection
mmandrus Oct 27, 2022
b161aad
revert changes
mmandrus Oct 27, 2022
031efb9
Revert "send selection changed event to panel after query editor rend…
mmandrus Oct 27, 2022
0fffb65
use default query to try to make sure panel targets are well-formed
mmandrus Oct 27, 2022
3120d24
add console warn if query is not well-formed
mmandrus Oct 27, 2022
beba157
another try - ensure default query without modifying the dashboard mo…
mmandrus Oct 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions public/app/plugins/datasource/testdata/QueryEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { ChangeEvent, FormEvent, useMemo } from 'react';
import React, { ChangeEvent, FormEvent, useMemo, useEffect } from 'react';
import { useAsync } from 'react-use';

import { QueryEditorProps, SelectableValue } from '@grafana/data';
Expand Down Expand Up @@ -172,6 +172,16 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
);
const showLabels = useMemo(() => showLabelsFor.includes(query.scenarioId ?? ''), [query]);

const selectedValue = options.find((item) => item.value === query.scenarioId);
useEffect(() => {
if (selectedValue) {
// This updates the panel model with the default scenario
onScenarioChange(selectedValue);
}
// Adding a dependency on onScenarioChange causes an infinite loop
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedValue]);

if (loading) {
return null;
}
Expand All @@ -183,7 +193,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
<Select
inputId={`test-data-scenario-select-${query.refId}`}
options={options}
value={options.find((item) => item.value === query.scenarioId)}
value={selectedValue}
onChange={onScenarioChange}
width={32}
/>
Expand Down