From 5db03cf91a07f1bdb806a80e64a8dec413e89660 Mon Sep 17 00:00:00 2001
From: Peter Holmberg <peterholmberg@users.noreply.github.com>
Date: Tue, 21 Dec 2021 16:06:23 +0100
Subject: [PATCH] Alerting: Fix remaining a11y issues (#43420)

* add aria labels

* reverting

* chore: revert yarn.lock

Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
---
 .../unified/components/AlertManagerPicker.tsx       |  1 +
 .../unified/components/receivers/ReceiversTable.tsx |  1 +
 .../unified/components/rules/ActionIcon.tsx         | 13 ++++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/public/app/features/alerting/unified/components/AlertManagerPicker.tsx b/public/app/features/alerting/unified/components/AlertManagerPicker.tsx
index a2e4ef2e06d..01f91871397 100644
--- a/public/app/features/alerting/unified/components/AlertManagerPicker.tsx
+++ b/public/app/features/alerting/unified/components/AlertManagerPicker.tsx
@@ -46,6 +46,7 @@ export const AlertManagerPicker: FC<Props> = ({ onChange, current, disabled = fa
       data-testid="alertmanager-picker"
     >
       <Select
+        aria-label={disabled ? 'Alertmanager' : 'Choose Alertmanager'}
         menuShouldPortal
         width={29}
         className="ds-picker select-container"
diff --git a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
index 8a3cf27f7cf..ba453192eb8 100644
--- a/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
+++ b/public/app/features/alerting/unified/components/receivers/ReceiversTable.tsx
@@ -97,6 +97,7 @@ export const ReceiversTable: FC<Props> = ({ config, alertManagerName }) => {
                 {!isVanillaAM && (
                   <>
                     <ActionIcon
+                      aria-label="Edit"
                       data-testid="edit"
                       to={makeAMLink(
                         `/alerting/notifications/receivers/${encodeURIComponent(receiver.name)}/edit`,
diff --git a/public/app/features/alerting/unified/components/rules/ActionIcon.tsx b/public/app/features/alerting/unified/components/rules/ActionIcon.tsx
index dee4d21887a..163db4391e7 100644
--- a/public/app/features/alerting/unified/components/rules/ActionIcon.tsx
+++ b/public/app/features/alerting/unified/components/rules/ActionIcon.tsx
@@ -27,17 +27,24 @@ export const ActionIcon: FC<Props> = ({
   tooltipPlacement = 'top',
   ...rest
 }) => {
+  const ariaLabel = typeof tooltip === 'string' ? tooltip : undefined;
   const iconEl = (
-    <Icon role="button" className={cx(useStyles(getStyle), className)} onClick={onClick} name={icon} {...rest} />
+    <Icon
+      role="button"
+      className={cx(useStyles(getStyle), className)}
+      onClick={onClick}
+      name={icon}
+      {...rest}
+      aria-label={ariaLabel}
+    />
   );
 
-  const ariaLabel = typeof tooltip === 'string' ? tooltip : undefined;
   return (
     <Tooltip content={tooltip} placement={tooltipPlacement}>
       {(() => {
         if (to) {
           return (
-            <Link aria-label={ariaLabel} to={to} target={target}>
+            <Link to={to} target={target}>
               {iconEl}
             </Link>
           );