mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
* Feat: timeGroup macro handling in VQB * Add tests * Add functions to SQL ds * Fix lint errors * Add feature toggle * Add rendering based on object * Fix lint * Fix CI failures * Fix tests * Address review comments * Add docs * Fix JSX runtime warnings * Remove docs part that mentions suggest more macros * Update docs/sources/shared/datasources/sql-query-builder-macros.md Co-authored-by: Jack Baldry <jack.baldry@grafana.com> * Add smoke test for this feature * lint * Add supported macros to influx * Add setupTests.ts to include in tsconfig.json * Import jest-dom instead of setupTests.ts --------- Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
72 lines
3.3 KiB
TypeScript
72 lines
3.3 KiB
TypeScript
import { selectors } from '@grafana/e2e-selectors';
|
|
import { expect, test } from '@grafana/plugin-e2e';
|
|
|
|
import { normalTableName, tableNameWithSpecialCharacter } from './mocks/mysql.mocks';
|
|
import { mockDataSourceRequest } from './utils';
|
|
|
|
test.beforeEach(mockDataSourceRequest);
|
|
|
|
test('code editor autocomplete should handle table name escaping/quoting', async ({ explorePage, selectors, page }) => {
|
|
await page.getByLabel('Code').check();
|
|
|
|
const editor = explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox');
|
|
await editor.fill('S');
|
|
await page.getByLabel('SELECT <column> FROM <table>').locator('a').click();
|
|
await expect(page.getByLabel(tableNameWithSpecialCharacter)).toBeVisible();
|
|
await page.keyboard.press('Enter');
|
|
|
|
await expect(editor).toHaveValue(`SELECT FROM grafana.\`${tableNameWithSpecialCharacter}\``);
|
|
|
|
for (let i = 0; i < tableNameWithSpecialCharacter.length + 2; i++) {
|
|
await page.keyboard.press('Backspace');
|
|
}
|
|
|
|
await page.keyboard.press('Control+I');
|
|
await expect(page.getByLabel(tableNameWithSpecialCharacter)).toBeVisible();
|
|
});
|
|
|
|
test('visual query builder should handle time filter macro', async ({ explorePage, page }) => {
|
|
await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.headerTableSelector).click();
|
|
await page.getByText(normalTableName, { exact: true }).click();
|
|
|
|
// Open column selector
|
|
await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.selectColumn).click();
|
|
const select = page.getByLabel('Select options menu');
|
|
await select.locator(page.getByText('createdAt')).click();
|
|
|
|
// Toggle where row
|
|
await page.getByLabel('Filter').last().click();
|
|
|
|
// Click add filter button
|
|
await page.getByRole('button', { name: 'Add filter' }).click();
|
|
await page.getByRole('button', { name: 'Add filter' }).click(); // For some reason we need to click twice
|
|
|
|
// Open field selector
|
|
await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.filterField).click();
|
|
await select.locator(page.getByText('createdAt')).click();
|
|
|
|
// Open operator selector
|
|
await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.filterOperator).click();
|
|
await select.locator(page.getByText('Macros')).click();
|
|
|
|
// Open macros value selector
|
|
await explorePage.getByGrafanaSelector('Macros value selector').click();
|
|
await select.locator(page.getByText('timeFilter', { exact: true })).click();
|
|
|
|
// Validate that the timeFilter macro was added
|
|
await expect(
|
|
explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox')
|
|
).toHaveValue(`SELECT\n createdAt\nFROM\n DataMaker.normalTable\nWHERE\n $__timeFilter(createdAt)\nLIMIT\n 50`);
|
|
|
|
// Validate that the timeFilter macro was removed when changed to equals operator
|
|
await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.filterOperator).click();
|
|
await select.locator(page.getByText('==')).click();
|
|
|
|
await explorePage.getByGrafanaSelector(selectors.components.DateTimePicker.input).click();
|
|
await explorePage.getByGrafanaSelector(selectors.components.DateTimePicker.input).blur();
|
|
|
|
await expect(
|
|
explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox')
|
|
).not.toHaveValue(`SELECT\n createdAt\nFROM\n DataMaker.normalTable\nWHERE\n createdAt = NULL\nLIMIT\n 50`);
|
|
});
|