diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx index 82ca0af7ee1..4a1e679771c 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx @@ -55,4 +55,13 @@ describe('MetricQueryEditor', () => { const l = await screen.findByLabelText('Project'); expect(l).toBeInTheDocument(); }); + + it('renders a Project dropdown', async () => { + const query = createMockQuery(); + query.queryType = QueryType.TIME_SERIES_QUERY; + + render(); + const projectDropdown = await screen.findByLabelText('Project'); + expect(projectDropdown).toBeInTheDocument(); + }); }); diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx index 6da65007a55..3375a3dd17d 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx @@ -15,6 +15,7 @@ import { import { GraphPeriod } from './GraphPeriod'; import { MQLQueryEditor } from './MQLQueryEditor'; +import { Project } from './Project'; import { VisualMetricQueryEditor } from './VisualMetricQueryEditor'; export interface Props { @@ -99,6 +100,13 @@ function Editor({ {query.queryType === QueryType.TIME_SERIES_QUERY && query.timeSeriesQuery && ( <> + onChangeTimeSeriesQuery({ ...query.timeSeriesQuery!, projectName: projectName })} + templateVariableOptions={variableOptionGroup.options} + projectName={query.timeSeriesQuery.projectName!} + /> onChangeTimeSeriesQuery({ ...query.timeSeriesQuery!, query: q })} onRunQuery={onRunQuery} diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx index 59f8038c6df..a36b41f2cd2 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Project.tsx @@ -22,7 +22,6 @@ export function Project({ refId, projectName, datasource, onChange, templateVari const projectsWithTemplateVariables = useMemo( () => [ - projects, { label: 'Template Variables', options: templateVariableOptions,