diff --git a/e2e/shared/smokeTestScenario.ts b/e2e/shared/smokeTestScenario.ts index 686dd9269e1..eb838b36dc2 100644 --- a/e2e/shared/smokeTestScenario.ts +++ b/e2e/shared/smokeTestScenario.ts @@ -14,7 +14,7 @@ export const smokeTestScenario = { e2e.components.DataSource.TestData.QueryTab.scenarioSelectContainer() .should('be.visible') .within(() => { - e2e.components.Select.input().should('be.visible').click(); + e2e().get('input[id*="scenario-input-"]').should('be.visible').click(); }); cy.contains('CSV Metric Values').scrollIntoView().should('be.visible').click(); diff --git a/e2e/suite1/specs/explore.spec.ts b/e2e/suite1/specs/explore.spec.ts index b4d424a6d80..c815e092be0 100644 --- a/e2e/suite1/specs/explore.spec.ts +++ b/e2e/suite1/specs/explore.spec.ts @@ -14,7 +14,7 @@ e2e.scenario({ e2e.components.DataSource.TestData.QueryTab.scenarioSelectContainer() .should('be.visible') .within(() => { - e2e.components.Select.input().should('be.visible').click(); + e2e().get('input[id*="scenario-input-"]').should('be.visible').click(); }); cy.contains('CSV Metric Values').scrollIntoView().should('be.visible').click(); diff --git a/e2e/suite1/specs/panelEdit_queries.spec.ts b/e2e/suite1/specs/panelEdit_queries.spec.ts index 67f38e592ac..7f1fa883632 100644 --- a/e2e/suite1/specs/panelEdit_queries.spec.ts +++ b/e2e/suite1/specs/panelEdit_queries.spec.ts @@ -50,7 +50,7 @@ e2e.scenario({ e2e.components.DataSource.TestData.QueryTab.scenarioSelectContainer() .should('be.visible') .within(() => { - e2e.components.Select.input().eq(0).should('be.visible').click(); + e2e().get('input[id*="scenario-input-"]').eq(0).should('be.visible').click(); }); cy.contains('CSV Metric Values').scrollIntoView().should('be.visible').eq(0).click(); diff --git a/packages/grafana-data/src/field/overrides/processors.ts b/packages/grafana-data/src/field/overrides/processors.ts index 84cb4d2a7fb..4d12da0b87d 100644 --- a/packages/grafana-data/src/field/overrides/processors.ts +++ b/packages/grafana-data/src/field/overrides/processors.ts @@ -39,6 +39,7 @@ export interface SliderFieldConfigSettings { min: number; max: number; step?: number; + ariaLabelForHandle?: string; } export interface DataLinksFieldConfigSettings {} diff --git a/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts b/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts index ca66a5523c1..9bc019c5fcb 100644 --- a/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts +++ b/packages/grafana-data/src/field/standardFieldConfigEditorRegistry.ts @@ -19,6 +19,7 @@ export interface StandardEditorProps void; item: StandardEditorsRegistryItem; context: StandardEditorContext; + id?: string; } export interface StandardEditorsRegistryItem extends RegistryItem { editor: ComponentType>; diff --git a/packages/grafana-ui/src/components/Button/ToolbarButton.tsx b/packages/grafana-ui/src/components/Button/ToolbarButton.tsx index 9ecec261c08..44c2536800a 100644 --- a/packages/grafana-ui/src/components/Button/ToolbarButton.tsx +++ b/packages/grafana-ui/src/components/Button/ToolbarButton.tsx @@ -17,6 +17,8 @@ export interface Props extends ButtonHTMLAttributes { tooltip?: string; /** For image icons */ imgSrc?: string; + /** Alt text for imgSrc */ + imgAlt?: string; /** if true or false will show angle-down/up */ isOpen?: boolean; /** Controls flex-grow: 1 */ @@ -39,6 +41,7 @@ export const ToolbarButton = forwardRef( className, children, imgSrc, + imgAlt, fullWidth, isOpen, narrow, @@ -72,12 +75,12 @@ export const ToolbarButton = forwardRef(