diff --git a/packages/grafana-prometheus/src/components/PromExploreExtraField.test.tsx b/packages/grafana-prometheus/src/components/PromExploreExtraField.test.tsx index 881cd1c0e12..4c22e2f16f2 100644 --- a/packages/grafana-prometheus/src/components/PromExploreExtraField.test.tsx +++ b/packages/grafana-prometheus/src/components/PromExploreExtraField.test.tsx @@ -4,7 +4,11 @@ import React from 'react'; import { PrometheusDatasource } from '../datasource'; import { PromQuery } from '../types'; -import { PromExploreExtraField, PromExploreExtraFieldProps, testIds } from './PromExploreExtraField'; +import { + PromExploreExtraField, + PromExploreExtraFieldProps, + promExploreExtraFieldTestIds, +} from './PromExploreExtraField'; const setup = (propOverrides?: PromExploreExtraFieldProps) => { const query = { exemplar: false } as PromQuery; @@ -27,11 +31,11 @@ const setup = (propOverrides?: PromExploreExtraFieldProps) => { describe('PromExploreExtraField', () => { it('should render step field', () => { setup(); - expect(screen.getByTestId(testIds.stepField)).toBeInTheDocument(); + expect(screen.getByTestId(promExploreExtraFieldTestIds.stepField)).toBeInTheDocument(); }); it('should render query type field', () => { setup(); - expect(screen.getByTestId(testIds.queryTypeField)).toBeInTheDocument(); + expect(screen.getByTestId(promExploreExtraFieldTestIds.queryTypeField)).toBeInTheDocument(); }); }); diff --git a/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx b/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx index f4bc23d0e4d..c9ad0a79e36 100644 --- a/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx +++ b/packages/grafana-prometheus/src/components/PromExploreExtraField.tsx @@ -49,10 +49,14 @@ export const PromExploreExtraField = memo(({ query, datasource, onChange, onRunQ const onQueryTypeChange = getQueryTypeChangeHandler(query, onChange); return ( -
$__interval
and $__rate_interval
variables.
- >
- }
+ return (
+ $__interval
and $__rate_interval
variables.
+ >
+ }
+ >
+ # Results per page
{ ); }; -export const testIds = { +export const metricsModaltestIds = { metricModal: 'metric-modal', searchMetric: 'search-metric', searchWithMetadata: 'search-with-metadata', diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/index.ts b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/index.ts new file mode 100644 index 00000000000..3f073bdca3f --- /dev/null +++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/index.ts @@ -0,0 +1 @@ +export * from './MetricsModal'; diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.test.tsx index 57f6efa2236..dec1d39a4c0 100644 --- a/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.test.tsx +++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.test.tsx @@ -10,7 +10,7 @@ import { EmptyLanguageProviderMock } from '../../../language_provider.mock'; import { PromOptions } from '../../../types'; import { PromVisualQuery } from '../../types'; -import { PromQail, testIds } from './PromQail'; +import { PromQail, queryAssistanttestIds } from './PromQail'; // don't care about interaction tracking in our unit tests jest.mock('@grafana/runtime', () => ({ @@ -56,7 +56,7 @@ describe('PromQail', () => { expect(screen.getByText('Do you know what you want to query?')).toBeInTheDocument(); }); - const aiPrompt = screen.getByTestId(testIds.clickForAi); + const aiPrompt = screen.getByTestId(queryAssistanttestIds.clickForAi); userEvent.click(aiPrompt); @@ -75,7 +75,7 @@ describe('PromQail', () => { expect(screen.getByText('Do you know what you want to query?')).toBeInTheDocument(); }); - const historicalPrompt = screen.getByTestId(testIds.clickForHistorical); + const historicalPrompt = screen.getByTestId(queryAssistanttestIds.clickForHistorical); userEvent.click(historicalPrompt); @@ -142,7 +142,7 @@ function setup(query: PromVisualQuery) { } function clickSecurityButton() { - const securityInfoButton = screen.getByTestId(testIds.securityInfoButton); + const securityInfoButton = screen.getByTestId(queryAssistanttestIds.securityInfoButton); userEvent.click(securityInfoButton); } diff --git a/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.tsx b/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.tsx index 940abb80b5b..43d07d1a553 100644 --- a/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.tsx +++ b/packages/grafana-prometheus/src/querybuilder/components/promQail/PromQail.tsx @@ -125,7 +125,7 @@ export const PromQail = (props: PromQailProps) => { fill="solid" variant="primary" onClick={() => dispatch(showStartingMessage(false))} - data-testid={testIds.securityInfoButton} + data-testid={queryAssistanttestIds.securityInfoButton} > Continue @@ -181,7 +181,7 @@ export const PromQail = (props: PromQailProps) => { className={styles.leftButton} fill="solid" variant="secondary" - data-testid={testIds.clickForHistorical} + data-testid={queryAssistanttestIds.clickForHistorical} onClick={() => { const isLoading = true; const suggestionType = SuggestionType.Historical; @@ -198,7 +198,7 @@ export const PromQail = (props: PromQailProps) => {