public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Loki: Change run query button text based on number of queries (#76196)

Browse Source 
Loki: Change run query button name based on number of queries
This commit is contained in:
Ivana Huckova
2023-10-09 17:14:34 +02:00
committed by GitHub
parent 22bef78a7b
commit e587d4e879
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
+17 -8
View File
@@ -88,21 +88,26 @@ describe('LokiQueryEditorSelector', () => {
await expectBuilder(); await expectBuilder();
}); });
it('shows Run Queries button in Dashboards', async () => { it('shows Run Query button in Dashboards', async () => {
renderWithProps({}, { app: CoreApp.Dashboard }); renderWithProps({}, { app: CoreApp.Dashboard });
await expectRunQueriesButton(); await expectRunQueryButton();
}); });
it('hides Run Queries button in Explore', async () => { it('hides Run Query button in Explore', async () => {
renderWithProps({}, { app: CoreApp.Explore }); renderWithProps({}, { app: CoreApp.Explore });
await expectCodeEditor(); await expectCodeEditor();
expectNoRunQueriesButton(); expectNoRunQueryButton();
}); });
it('hides Run Queries button in Correlations Page', async () => { it('hides Run Query button in Correlations Page', async () => {
renderWithProps({}, { app: CoreApp.Correlations }); renderWithProps({}, { app: CoreApp.Correlations });
await expectCodeEditor(); await expectCodeEditor();
expectNoRunQueriesButton(); expectNoRunQueryButton();
});
it('shows Run Queries button in Dashboards when multiple queries', async () => {
renderWithProps({}, { app: CoreApp.Dashboard, queries: [defaultQuery, defaultQuery] });
await expectRunQueriesButton();
}); });
it('changes to builder mode', async () => { it('changes to builder mode', async () => {
@@ -204,8 +209,12 @@ async function expectRunQueriesButton() {
expect(await screen.findByRole('button', { name: /run queries/i })).toBeInTheDocument(); expect(await screen.findByRole('button', { name: /run queries/i })).toBeInTheDocument();
} }
function expectNoRunQueriesButton() { async function expectRunQueryButton() {
expect(screen.queryByRole('button', { name: /run queries/i })).not.toBeInTheDocument(); expect(await screen.findByRole('button', { name: /run query/i })).toBeInTheDocument();
}
function expectNoRunQueryButton() {
expect(screen.queryByRole('button', { name: /run query/i })).not.toBeInTheDocument();
} }
async function switchToMode(mode: QueryEditorMode) { async function switchToMode(mode: QueryEditorMode) {
public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
+1 -1
View File
@@ -179,7 +179,7 @@ export const LokiQueryEditor = React.memo<LokiQueryEditorProps>((props) => {
icon={data?.state === LoadingState.Loading ? 'fa fa-spinner' : undefined} icon={data?.state === LoadingState.Loading ? 'fa fa-spinner' : undefined}
disabled={data?.state === LoadingState.Loading} disabled={data?.state === LoadingState.Loading}
> >
Run queries {queries && queries.length > 1 ? `Run queries` : `Run query`}
</Button> </Button>
)} )}
<QueryEditorModeToggle mode={editorMode!} onChange={onEditorModeChange} /> <QueryEditorModeToggle mode={editorMode!} onChange={onEditorModeChange} />