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

[v10.0.x] Cloud Monitoring: Support AliasBy property in MQL mode #73165

Merged
merged 1 commit into from Aug 10, 2023
Merged

[v10.0.x] Cloud Monitoring: Support AliasBy property in MQL mode #73165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx
View file
Open in desktop
@@ -1,4 +1,4 @@
import { render, screen } from '@testing-library/react';
import { render, screen, waitFor } from '@testing-library/react';
import React from 'react';

import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource';
Expand Down Expand Up @@ -64,4 +64,17 @@ describe('MetricQueryEditor', () => {
const projectDropdown = await screen.findByLabelText('Project');
expect(projectDropdown).toBeInTheDocument();
});

it('preserves the aliasBy property when switching between Builder and MQL queries', async () => {
const query = createMockQuery({ aliasBy: 'AliasTest' });
query.queryType = QueryType.TIME_SERIES_QUERY;

render(<MetricQueryEditor {...defaultProps} query={query} />);
await waitFor(() => expect(screen.getByLabelText('Alias by').closest('input')!.value).toEqual('AliasTest'));

query.queryType = QueryType.TIME_SERIES_LIST;

render(<MetricQueryEditor {...defaultProps} query={query} />);
await waitFor(() => expect(screen.getByLabelText('Alias by').closest('input')!.value).toEqual('AliasTest'));
});
});
28 changes: 20 additions & 8 deletions public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.tsx
View file
Open in desktop
@@ -1,7 +1,7 @@
import React, { useCallback, useEffect } from 'react';

import { SelectableValue } from '@grafana/data';
import { EditorRows } from '@grafana/experimental';
import { EditorRows, Stack } from '@grafana/experimental';

import CloudMonitoringDatasource from '../datasource';
import {
Expand All @@ -13,6 +13,7 @@ import {
TimeSeriesQuery,
} from '../types';

import { AliasBy } from './AliasBy';
import { GraphPeriod } from './GraphPeriod';
import { MQLQueryEditor } from './MQLQueryEditor';
import { Project } from './Project';
Expand Down Expand Up @@ -75,6 +76,7 @@ function Editor({
queryType: QueryType.TIME_SERIES_LIST,
intervalMs: query.intervalMs,
timeSeriesList: defaultTimeSeriesList(datasource),
aliasBy: query.aliasBy,
});
}
if (query.queryType === QueryType.TIME_SERIES_QUERY && !query.timeSeriesQuery) {
Expand All @@ -84,6 +86,7 @@ function Editor({
queryType: QueryType.TIME_SERIES_QUERY,
intervalMs: query.intervalMs,
timeSeriesQuery: defaultTimeSeriesQuery(datasource),
aliasBy: query.aliasBy,
});
}
}, [onQueryChange, query, datasource]);
Expand All @@ -105,13 +108,22 @@ function Editor({

{query.queryType === QueryType.TIME_SERIES_QUERY && query.timeSeriesQuery && (
<>
<Project
refId={refId}
datasource={datasource}
onChange={(projectName) => onChangeTimeSeriesQuery({ ...query.timeSeriesQuery!, projectName: projectName })}
templateVariableOptions={variableOptionGroup.options}
projectName={query.timeSeriesQuery.projectName!}
/>
<Stack gap={1} direction="row">
<Project
refId={refId}
datasource={datasource}
onChange={(projectName) =>
onChangeTimeSeriesQuery({ ...query.timeSeriesQuery!, projectName: projectName })
}
templateVariableOptions={variableOptionGroup.options}
projectName={query.timeSeriesQuery.projectName!}
/>
<AliasBy
refId={refId}
value={query.aliasBy}
onChange={(aliasBy: string) => onQueryChange({ ...query, aliasBy })}
/>
</Stack>
<MQLQueryEditor
onChange={(q: string) => onChangeTimeSeriesQuery({ ...query.timeSeriesQuery!, query: q })}
onRunQuery={onRunQuery}
Expand Down