IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Dashboards: relabel add query button (#73607)

Browse Source
This commit is contained in:
Giordano Ricci 2023-08-22 14:47:45 +01:00 committed by GitHub
parent 35818fa9ab
commit 53867e3fcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.betterer.results
View File

@ -2859,8 +2859,7 @@ exports[`better eslint`] = {
], ],
"public/app/features/query/components/QueryGroup.tsx:5381": [ "public/app/features/query/components/QueryGroup.tsx:5381": [
[0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"], [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
[0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"], [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"]
[0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "2"]
], ],
"public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.test.ts:5381": [ "public/app/features/query/state/DashboardQueryRunner/AlertStatesWorker.test.ts:5381": [
[0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "0"],

2
packages/grafana-e2e-selectors/src/selectors/components.ts
View File

@ -184,7 +184,7 @@ export const Components = {
content: 'Query editor tab content', content: 'Query editor tab content',
queryInspectorButton: 'Query inspector button', queryInspectorButton: 'Query inspector button',
queryHistoryButton: 'data-testid query-history-button', queryHistoryButton: 'data-testid query-history-button',
addQuery: 'Query editor add query button', addQuery: 'data-testid query-tab-add-query',
}, },
QueryHistory: { QueryHistory: {
queryText: 'Query text', queryText: 'Query text',

6
public/app/features/query/components/QueryGroup.test.tsx
View File

@ -61,7 +61,7 @@ describe('QueryGroup', () => {
it('Should add query on click', async () => { it('Should add query on click', async () => {
renderScenario({}); renderScenario({});
const addQueryButton = await screen.findByTestId('query-tab-add-query'); const addQueryButton = await screen.findByRole('button', { name: /Add query/i });
const queryRowsContainer = await screen.findByTestId('query-editor-rows'); const queryRowsContainer = await screen.findByTestId('query-editor-rows');
expect(queryRowsContainer.children.length).toBe(2); expect(queryRowsContainer.children.length).toBe(2);
@ -92,7 +92,7 @@ describe('QueryGroup', () => {
it('New query should be expanded', async () => { it('New query should be expanded', async () => {
renderScenario({}); renderScenario({});
const addQueryButton = await screen.findByTestId('query-tab-add-query'); const addQueryButton = await screen.findByRole('button', { name: /Add query/i });
const queryRowsContainer = await screen.findByTestId('query-editor-rows'); const queryRowsContainer = await screen.findByTestId('query-editor-rows');
await userEvent.click(addQueryButton); await userEvent.click(addQueryButton);
@ -119,7 +119,7 @@ describe('QueryGroup', () => {
it('Should not show add expression button when expressions are disabled', async () => { it('Should not show add expression button when expressions are disabled', async () => {
config.expressionsEnabled = false; config.expressionsEnabled = false;
renderScenario({}); renderScenario({});
await screen.findByTestId('query-tab-add-query'); await screen.findByRole('button', { name: /Add query/i });
const addExpressionButton = screen.queryByTestId('query-tab-add-expression'); const addExpressionButton = screen.queryByTestId('query-tab-add-expression');
expect(addExpressionButton).not.toBeInTheDocument(); expect(addExpressionButton).not.toBeInTheDocument();
}); });

5
public/app/features/query/components/QueryGroup.tsx
View File

@ -371,10 +371,9 @@ export class QueryGroup extends PureComponent<Props, State> {
icon="plus" icon="plus"
onClick={this.onAddQueryClick} onClick={this.onAddQueryClick}
variant="secondary" variant="secondary"
aria-label={selectors.components.QueryTab.addQuery} data-testid={selectors.components.QueryTab.addQuery}
data-testid="query-tab-add-query"
> >
Query Add query
</Button> </Button>
)} )}
{config.expressionsEnabled && this.isExpressionsSupported(dsSettings) && ( {config.expressionsEnabled && this.isExpressionsSupported(dsSettings) && (