From c443f244a08d05f282139ac093d5260fca20ac1c Mon Sep 17 00:00:00 2001
From: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Date: Tue, 12 Oct 2021 13:26:01 +0100
Subject: [PATCH] A11y/Dashboard: Fix misc. fastpass issues (#40296)

* A11y/Dashboard: Fix misc. fastpass issues
See #39429
---
 e2e/shared/smokeTestScenario.ts               |  2 +-
 e2e/suite1/specs/explore.spec.ts              |  2 +-
 e2e/suite1/specs/panelEdit_queries.spec.ts    |  2 +-
 .../src/field/overrides/processors.ts         |  1 +
 .../standardFieldConfigEditorRegistry.ts      |  1 +
 .../src/components/Button/ToolbarButton.tsx   |  9 ++++++---
 .../src/components/OptionsUI/fieldColor.tsx   | 15 +++++++++++++--
 .../src/components/OptionsUI/slider.tsx       |  1 +
 .../src/components/OptionsUI/stats.tsx        |  2 ++
 .../src/components/Slider/Slider.tsx          |  2 ++
 .../grafana-ui/src/components/Slider/types.ts |  1 +
 .../components/StatsPicker/StatsPicker.tsx    |  4 +++-
 .../ThresholdsEditorNew/ThresholdsEditor.tsx  |  3 +++
 .../AddPanelWidget/AddPanelWidget.tsx         |  2 +-
 .../PanelEditor/OptionsPaneCategory.tsx       |  8 +++++---
 .../PanelEditor/getPanelFrameOptions.tsx      |  2 ++
 .../PanelEditor/getVizualizationOptions.tsx   |  3 ++-
 .../RepeatRowSelect/RepeatRowSelect.tsx       |  5 +++--
 .../components/ShareModal/ShareLink.tsx       |  1 +
 .../VizTypePicker/PanelTypeCard.tsx           |  2 +-
 .../features/query/components/QueryGroup.tsx  |  4 +++-
 .../datasource/testdata/QueryEditor.tsx       |  1 +
 .../app/plugins/panel/graph/tab_display.html  | 19 ++++++++++++-------
 .../timeseries/ThresholdsStyleEditor.tsx      |  6 ++++--
 public/app/plugins/panel/timeseries/config.ts |  3 +++
 25 files changed, 74 insertions(+), 27 deletions(-)

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<TValue = any, TSettings = any, TOptions = a
   onChange: (value?: TValue) => void;
   item: StandardEditorsRegistryItem<TValue, TSettings>;
   context: StandardEditorContext<TOptions, TState>;
+  id?: string;
 }
 export interface StandardEditorsRegistryItem<TValue = any, TSettings = any> extends RegistryItem {
   editor: ComponentType<StandardEditorProps<TValue, TSettings>>;
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<HTMLButtonElement> {
   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<HTMLButtonElement, Props>(
       className,
       children,
       imgSrc,
+      imgAlt,
       fullWidth,
       isOpen,
       narrow,
@@ -72,12 +75,12 @@ export const ToolbarButton = forwardRef<HTMLButtonElement, Props>(
       <button
         ref={ref}
         className={buttonStyles}
-        aria-label={getButttonAriaLabel(ariaLabel, tooltip)}
+        aria-label={getButtonAriaLabel(ariaLabel, tooltip)}
         aria-expanded={isOpen}
         {...rest}
       >
         {renderIcon(icon)}
-        {imgSrc && <img className={styles.img} src={imgSrc} />}
+        {imgSrc && <img className={styles.img} src={imgSrc} alt={imgAlt ?? ''} />}
         {children && !iconOnly && <div className={contentStyles}>{children}</div>}
         {isOpen === false && <Icon name="angle-down" />}
         {isOpen === true && <Icon name="angle-up" />}
@@ -94,7 +97,7 @@ export const ToolbarButton = forwardRef<HTMLButtonElement, Props>(
   }
 );
 
-function getButttonAriaLabel(ariaLabel: string | undefined, tooltip: string | undefined) {
+function getButtonAriaLabel(ariaLabel: string | undefined, tooltip: string | undefined) {
   return ariaLabel ? ariaLabel : tooltip ? selectors.components.PageToolbar.item(tooltip) : undefined;
 }
 
diff --git a/packages/grafana-ui/src/components/OptionsUI/fieldColor.tsx b/packages/grafana-ui/src/components/OptionsUI/fieldColor.tsx
index 13bbbb40fee..21b1f4f24da 100644
--- a/packages/grafana-ui/src/components/OptionsUI/fieldColor.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/fieldColor.tsx
@@ -22,6 +22,7 @@ export const FieldColorEditor: React.FC<FieldConfigEditorProps<FieldColor | unde
   value,
   onChange,
   item,
+  id,
 }) => {
   const theme = useTheme2();
   const styles = useStyles2(getStyles);
@@ -81,6 +82,7 @@ export const FieldColorEditor: React.FC<FieldConfigEditorProps<FieldColor | unde
           value={mode}
           onChange={onModeChange}
           className={styles.select}
+          inputId={id}
         />
         <ColorValueEditor value={value?.fixedColor} onChange={onColorChange} />
       </div>
@@ -97,7 +99,14 @@ export const FieldColorEditor: React.FC<FieldConfigEditorProps<FieldColor | unde
     return (
       <>
         <div style={{ marginBottom: theme.spacing(2) }}>
-          <Select menuShouldPortal minMenuHeight={200} options={options} value={mode} onChange={onModeChange} />
+          <Select
+            menuShouldPortal
+            minMenuHeight={200}
+            options={options}
+            value={mode}
+            onChange={onModeChange}
+            inputId={id}
+          />
         </div>
         <Field label="Color series by">
           <RadioButtonGroup value={value?.seriesBy ?? 'last'} options={seriesModes} onChange={onSeriesModeChange} />
@@ -106,7 +115,9 @@ export const FieldColorEditor: React.FC<FieldConfigEditorProps<FieldColor | unde
     );
   }
 
-  return <Select menuShouldPortal minMenuHeight={200} options={options} value={mode} onChange={onModeChange} />;
+  return (
+    <Select menuShouldPortal minMenuHeight={200} options={options} value={mode} onChange={onModeChange} inputId={id} />
+  );
 };
 
 interface ModeProps {
diff --git a/packages/grafana-ui/src/components/OptionsUI/slider.tsx b/packages/grafana-ui/src/components/OptionsUI/slider.tsx
index 294f01c3dc2..f1571a690e3 100644
--- a/packages/grafana-ui/src/components/OptionsUI/slider.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/slider.tsx
@@ -17,6 +17,7 @@ export const SliderValueEditor: React.FC<FieldConfigEditorProps<number, SliderFi
       max={settings?.max || 100}
       step={settings?.step}
       onChange={onChange}
+      ariaLabelForHandle={settings?.ariaLabelForHandle}
     />
   );
 };
diff --git a/packages/grafana-ui/src/components/OptionsUI/stats.tsx b/packages/grafana-ui/src/components/OptionsUI/stats.tsx
index 453da4dc12e..01bdca1c455 100644
--- a/packages/grafana-ui/src/components/OptionsUI/stats.tsx
+++ b/packages/grafana-ui/src/components/OptionsUI/stats.tsx
@@ -6,6 +6,7 @@ export const StatsPickerEditor: React.FC<FieldConfigEditorProps<string[], StatsP
   value,
   onChange,
   item,
+  id,
 }) => {
   return (
     <StatsPicker
@@ -13,6 +14,7 @@ export const StatsPickerEditor: React.FC<FieldConfigEditorProps<string[], StatsP
       onChange={onChange}
       allowMultiple={!!item.settings?.allowMultiple}
       defaultStat={item.settings?.defaultStat}
+      inputId={id}
     />
   );
 };
diff --git a/packages/grafana-ui/src/components/Slider/Slider.tsx b/packages/grafana-ui/src/components/Slider/Slider.tsx
index 89caa014427..329105ff912 100644
--- a/packages/grafana-ui/src/components/Slider/Slider.tsx
+++ b/packages/grafana-ui/src/components/Slider/Slider.tsx
@@ -19,6 +19,7 @@ export const Slider: FunctionComponent<SliderProps> = ({
   reverse,
   step,
   value,
+  ariaLabelForHandle,
 }) => {
   const isHorizontal = orientation === 'horizontal';
   const theme = useTheme2();
@@ -79,6 +80,7 @@ export const Slider: FunctionComponent<SliderProps> = ({
           onAfterChange={onAfterChange}
           vertical={!isHorizontal}
           reverse={reverse}
+          ariaLabelForHandle={ariaLabelForHandle}
         />
         {/* Uses text input so that the number spinners are not shown */}
         <Input
diff --git a/packages/grafana-ui/src/components/Slider/types.ts b/packages/grafana-ui/src/components/Slider/types.ts
index 7838465b79c..8c61d377de3 100644
--- a/packages/grafana-ui/src/components/Slider/types.ts
+++ b/packages/grafana-ui/src/components/Slider/types.ts
@@ -12,6 +12,7 @@ export interface SliderProps {
   formatTooltipResult?: (value: number) => number;
   onChange?: (value: number) => void;
   onAfterChange?: (value?: number) => void;
+  ariaLabelForHandle?: string;
 }
 
 export interface RangeSliderProps {
diff --git a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx
index 0aaad675ce0..6742fa7c573 100644
--- a/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx
+++ b/packages/grafana-ui/src/components/StatsPicker/StatsPicker.tsx
@@ -15,6 +15,7 @@ export interface Props {
   className?: string;
   width?: number;
   menuPlacement?: 'auto' | 'bottom' | 'top';
+  inputId?: string;
 }
 
 export class StatsPicker extends PureComponent<Props> {
@@ -63,7 +64,7 @@ export class StatsPicker extends PureComponent<Props> {
   };
 
   render() {
-    const { stats, allowMultiple, defaultStat, placeholder, className, menuPlacement, width } = this.props;
+    const { stats, allowMultiple, defaultStat, placeholder, className, menuPlacement, width, inputId } = this.props;
 
     const select = fieldReducers.selectOptions(stats);
     return (
@@ -79,6 +80,7 @@ export class StatsPicker extends PureComponent<Props> {
         placeholder={placeholder}
         onChange={this.onSelectionChange}
         menuPlacement={menuPlacement}
+        inputId={inputId}
       />
     );
   }
diff --git a/packages/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.tsx b/packages/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.tsx
index 1f0efae6ce2..cbb515a5f3d 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.tsx
+++ b/packages/grafana-ui/src/components/ThresholdsEditorNew/ThresholdsEditor.tsx
@@ -151,11 +151,13 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
   renderInput(threshold: ThresholdWithKey, styles: ThresholdStyles, idx: number) {
     const isPercent = this.props.thresholds.mode === ThresholdsMode.Percentage;
 
+    const ariaLabel = `Threshold ${idx + 1}`;
     if (!isFinite(threshold.value)) {
       return (
         <Input
           type="text"
           value={'Base'}
+          aria-label={ariaLabel}
           disabled
           prefix={
             <div className={styles.colorPicker}>
@@ -177,6 +179,7 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
         key={isPercent.toString()}
         onChange={(event: ChangeEvent<HTMLInputElement>) => this.onChangeThresholdValue(event, threshold)}
         value={threshold.value}
+        aria-label={ariaLabel}
         ref={idx === 0 ? this.latestThresholdInputRef : null}
         onBlur={this.onBlur}
         prefix={
diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index 04ce2afee20..1aeb343e469 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -225,7 +225,7 @@ const AddPanelWidgetHandle: React.FC<AddPanelWidgetHandleProps> = ({ children, o
       )}
       {children && <span>{children}</span>}
       <div className="flex-grow-1" />
-      <IconButton name="times" onClick={onCancel} surface="header" />
+      <IconButton aria-label="Close 'Add Panel' widget" name="times" onClick={onCancel} surface="header" />
     </div>
   );
 };
diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
index 43c7604c547..14f4dc1602e 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
@@ -83,9 +83,7 @@ export const OptionsPaneCategory: FC<OptionsPaneCategoryProps> = React.memo(
           <div className={cx(styles.toggle, 'editor-options-group-toggle')}>
             <Icon name={isExpanded ? 'angle-down' : 'angle-right'} />
           </div>
-          <div className={styles.title} role="heading">
-            {renderTitle(isExpanded)}
-          </div>
+          <h6 className={styles.title}>{renderTitle(isExpanded)}</h6>
         </div>
         {isExpanded && <div className={bodyStyles}>{children}</div>}
       </div>
@@ -108,6 +106,10 @@ const getStyles = (theme: GrafanaTheme2) => {
     title: css`
       flex-grow: 1;
       overflow: hidden;
+      line-height: 1.5;
+      font-size: 1rem;
+      font-weight: ${theme.typography.fontWeightMedium};
+      margin: 0;
     `,
     header: css`
       display: flex;
diff --git a/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx b/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
index 116cbbfb481..5cd1e34348b 100644
--- a/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getPanelFrameOptions.tsx
@@ -39,6 +39,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
         render: function renderDescription() {
           return (
             <TextArea
+              id="description-text-area"
               defaultValue={panel.description}
               onBlur={(e) => onPanelConfigChange('description', e.currentTarget.value)}
             />
@@ -96,6 +97,7 @@ export function getPanelFrameCategory(props: OptionPaneRenderProps): OptionsPane
             render: function renderRepeatOptions() {
               return (
                 <RepeatRowSelect
+                  id="repeat-by-variable-select"
                   repeat={panel.repeat}
                   onChange={(value?: string | null) => {
                     onPanelConfigChange('repeat', value);
diff --git a/public/app/features/dashboard/components/PanelEditor/getVizualizationOptions.tsx b/public/app/features/dashboard/components/PanelEditor/getVizualizationOptions.tsx
index 7d18b4dc39b..f5e9d9c8f38 100644
--- a/public/app/features/dashboard/components/PanelEditor/getVizualizationOptions.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/getVizualizationOptions.tsx
@@ -98,7 +98,7 @@ export function getVizualizationOptions(props: OptionPaneRenderProps): OptionsPa
             );
           };
 
-          return <Editor value={value} onChange={onChange} item={fieldOption} context={context} />;
+          return <Editor value={value} onChange={onChange} item={fieldOption} context={context} id={fieldOption.id} />;
         },
       })
     );
@@ -161,6 +161,7 @@ export function fillOptionsPaneItems(
               }}
               item={pluginOption}
               context={context}
+              id={pluginOption.id}
             />
           );
         },
diff --git a/public/app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect.tsx b/public/app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect.tsx
index 89ffb1d0045..9dda02baca4 100644
--- a/public/app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect.tsx
+++ b/public/app/features/dashboard/components/RepeatRowSelect/RepeatRowSelect.tsx
@@ -7,11 +7,12 @@ import { getVariables } from '../../../variables/state/selectors';
 import { StoreState } from '../../../../types';
 
 export interface Props {
+  id?: string;
   repeat?: string | null;
   onChange: (name: string | null) => void;
 }
 
-export const RepeatRowSelect: FC<Props> = ({ repeat, onChange }) => {
+export const RepeatRowSelect: FC<Props> = ({ repeat, onChange, id }) => {
   const variables = useSelector((state: StoreState) => getVariables(state));
 
   const variableOptions = useMemo(() => {
@@ -36,5 +37,5 @@ export const RepeatRowSelect: FC<Props> = ({ repeat, onChange }) => {
 
   const onSelectChange = useCallback((option: SelectableValue<string | null>) => onChange(option.value!), [onChange]);
 
-  return <Select menuShouldPortal value={repeat} onChange={onSelectChange} options={variableOptions} />;
+  return <Select inputId={id} menuShouldPortal value={repeat} onChange={onSelectChange} options={variableOptions} />;
 };
diff --git a/public/app/features/dashboard/components/ShareModal/ShareLink.tsx b/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
index 48bfc3ef8f0..38f9091d71f 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareLink.tsx
@@ -114,6 +114,7 @@ export class ShareLink extends PureComponent<Props, State> {
 
           <Field label="Link URL">
             <Input
+              id="link-url-input"
               value={shareUrl}
               readOnly
               addonAfter={
diff --git a/public/app/features/dashboard/components/VizTypePicker/PanelTypeCard.tsx b/public/app/features/dashboard/components/VizTypePicker/PanelTypeCard.tsx
index b2fcb17c660..c672bce9087 100644
--- a/public/app/features/dashboard/components/VizTypePicker/PanelTypeCard.tsx
+++ b/public/app/features/dashboard/components/VizTypePicker/PanelTypeCard.tsx
@@ -41,7 +41,7 @@ export const PanelTypeCard: React.FC<Props> = ({
       onClick={disabled ? undefined : onClick}
       title={isCurrent ? 'Click again to close this section' : plugin.name}
     >
-      <img className={styles.img} src={plugin.info.logos.small} alt={`${plugin.name} logo`} />
+      <img className={styles.img} src={plugin.info.logos.small} alt="" />
 
       <div className={styles.itemContent}>
         <div className={styles.name}>{title}</div>
diff --git a/public/app/features/query/components/QueryGroup.tsx b/public/app/features/query/components/QueryGroup.tsx
index 36474e2c5ce..186a67b415a 100644
--- a/public/app/features/query/components/QueryGroup.tsx
+++ b/public/app/features/query/components/QueryGroup.tsx
@@ -203,7 +203,9 @@ export class QueryGroup extends PureComponent<Props, State> {
     return (
       <div>
         <div className={styles.dataSourceRow}>
-          <InlineFormLabel width={'auto'}>Data source</InlineFormLabel>
+          <InlineFormLabel htmlFor="data-source-picker" width={'auto'}>
+            Data source
+          </InlineFormLabel>
           <div className={styles.dataSourceRowItem}>
             <DataSourcePicker
               onChange={this.onChangeDataSource}
diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx
index 29adc8e3fa1..0546173f618 100644
--- a/public/app/plugins/datasource/testdata/QueryEditor.tsx
+++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx
@@ -175,6 +175,7 @@ export const QueryEditor = ({ query, datasource, onChange, onRunQuery }: Props)
             value={options.find((item) => item.value === query.scenarioId)}
             onChange={onScenarioChange}
             width={32}
+            inputId={`scenario-input-${query.refId}`}
           />
         </InlineField>
         {currentScenario?.stringInput && (
diff --git a/public/app/plugins/panel/graph/tab_display.html b/public/app/plugins/panel/graph/tab_display.html
index 3d941f8f711..407c6a01bf0 100644
--- a/public/app/plugins/panel/graph/tab_display.html
+++ b/public/app/plugins/panel/graph/tab_display.html
@@ -16,9 +16,10 @@
   ></gf-form-switch>
 
   <div class="gf-form" ng-if="ctrl.panel.lines">
-    <label class="gf-form-label width-8">Line width</label>
+    <label class="gf-form-label width-8" for="linewidth-select-input">Line width</label>
     <div class="gf-form-select-wrapper max-width-5">
       <select
+        id="linewidth-select-input"
         class="gf-form-input"
         ng-model="ctrl.panel.linewidth"
         ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]"
@@ -37,9 +38,10 @@
   ></gf-form-switch>
 
   <div class="gf-form" ng-if="ctrl.panel.lines">
-    <label class="gf-form-label width-8">Area fill</label>
+    <label class="gf-form-label width-8" for="fill-select-input">Area fill</label>
     <div class="gf-form-select-wrapper max-width-5">
       <select
+        id="fill-select-input"
         class="gf-form-input"
         ng-model="ctrl.panel.fill"
         ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]"
@@ -69,9 +71,10 @@
   ></gf-form-switch>
 
   <div class="gf-form" ng-if="ctrl.panel.points">
-    <label class="gf-form-label width-8">Point Radius</label>
+    <label class="gf-form-label width-8" for="pointradius-select-input">Point Radius</label>
     <div class="gf-form-select-wrapper max-width-5">
       <select
+        id="pointradius-select-input"
         class="gf-form-input"
         ng-model="ctrl.panel.pointradius"
         ng-options="f for f in [0.5,1,2,3,4,5,6,7,8,9,10]"
@@ -87,7 +90,6 @@
     checked="ctrl.panel.options.alertThreshold"
     on-change="ctrl.render()"
   ></gf-form-switch>
-
 </div>
 
 <div class="gf-form-group">
@@ -110,9 +112,10 @@
   >
   </gf-form-switch>
   <div class="gf-form">
-    <label class="gf-form-label width-7">Null value</label>
+    <label class="gf-form-label width-7" for="null-value-select-input">Null value</label>
     <div class="gf-form-select-wrapper">
       <select
+        id="null-value-select-input"
         class="gf-form-input max-width-9"
         ng-model="ctrl.panel.nullPointMode"
         ng-options="f for f in ['connected', 'null', 'null as zero']"
@@ -125,9 +128,10 @@
 <div class="gf-form-group">
   <h5 class="section-heading">Hover tooltip</h5>
   <div class="gf-form">
-    <label class="gf-form-label width-9">Mode</label>
+    <label class="gf-form-label width-9" for="tooltip-mode-select-input">Mode</label>
     <div class="gf-form-select-wrapper max-width-8">
       <select
+        id="tooltip-mode-select-input"
         class="gf-form-input"
         ng-model="ctrl.panel.tooltip.shared"
         ng-options="f.value as f.text for f in [{text: 'All series', value: true}, {text: 'Single', value: false}]"
@@ -136,9 +140,10 @@
     </div>
   </div>
   <div class="gf-form">
-    <label class="gf-form-label width-9">Sort order</label>
+    <label class="gf-form-label width-9" for="tooltip-sort-select-input">Sort order</label>
     <div class="gf-form-select-wrapper max-width-8">
       <select
+        id="tooltip-sort-select-input"
         class="gf-form-input"
         ng-model="ctrl.panel.tooltip.sort"
         ng-options="f.value as f.text for f in [{text: 'None', value: 0}, {text: 'Increasing', value: 1}, {text: 'Decreasing', value: 2}]"
diff --git a/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx b/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx
index 03669ad9187..83e202cd16e 100644
--- a/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx
+++ b/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx
@@ -5,7 +5,7 @@ import { Select } from '@grafana/ui';
 
 export const ThresholdsStyleEditor: React.FC<
   FieldOverrideEditorProps<SelectableValue<{ mode: GraphTresholdsStyleMode }>, any>
-> = ({ item, value, onChange }) => {
+> = ({ item, value, onChange, id }) => {
   const onChangeCb = useCallback(
     (v: SelectableValue<GraphTresholdsStyleMode>) => {
       onChange({
@@ -14,5 +14,7 @@ export const ThresholdsStyleEditor: React.FC<
     },
     [onChange]
   );
-  return <Select menuShouldPortal value={value.mode} options={item.settings.options} onChange={onChangeCb} />;
+  return (
+    <Select inputId={id} menuShouldPortal value={value.mode} options={item.settings.options} onChange={onChangeCb} />
+  );
 };
diff --git a/public/app/plugins/panel/timeseries/config.ts b/public/app/plugins/panel/timeseries/config.ts
index ed8ea4a8da6..073784bf461 100644
--- a/public/app/plugins/panel/timeseries/config.ts
+++ b/public/app/plugins/panel/timeseries/config.ts
@@ -95,6 +95,7 @@ export function getGraphFieldConfig(cfg: GraphFieldConfig): SetFieldConfigOption
             min: 0,
             max: 10,
             step: 1,
+            ariaLabelForHandle: 'Line width',
           },
           showIf: (c) => c.drawStyle !== GraphDrawStyle.Points,
         })
@@ -107,6 +108,7 @@ export function getGraphFieldConfig(cfg: GraphFieldConfig): SetFieldConfigOption
             min: 0,
             max: 100,
             step: 1,
+            ariaLabelForHandle: 'Fill opacity',
           },
           showIf: (c) => c.drawStyle !== GraphDrawStyle.Points,
         })
@@ -173,6 +175,7 @@ export function getGraphFieldConfig(cfg: GraphFieldConfig): SetFieldConfigOption
             min: 1,
             max: 40,
             step: 1,
+            ariaLabelForHandle: 'Point size',
           },
           showIf: (c) => c.showPoints !== VisibilityMode.Never || c.drawStyle === GraphDrawStyle.Points,
         });