From 94038006aa19ef20a984fe7755e6b011ef1482ad Mon Sep 17 00:00:00 2001
From: "Keith J. Grant" <barkeep@keithjgrant.com>
Date: Fri, 9 Apr 2021 14:17:56 -0700
Subject: [PATCH] fix a11y bugs in RoutedTabs, UserList

---
 awx/ui_next/.eslintrc                                  | 1 +
 awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx   | 6 +++---
 awx/ui_next/src/screens/User/UserList/UserListItem.jsx | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/awx/ui_next/.eslintrc b/awx/ui_next/.eslintrc
index a648085d46..90c96ae87b 100644
--- a/awx/ui_next/.eslintrc
+++ b/awx/ui_next/.eslintrc
@@ -60,6 +60,7 @@
           "mode",
           "aria-labelledby",
           "aria-hidden",
+          "aria-controls",
           "sortKey",
           "ouiaId",
           "credentialTypeNamespace",
diff --git a/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx b/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx
index d4d5336c11..11744603aa 100644
--- a/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx
+++ b/awx/ui_next/src/components/RoutedTabs/RoutedTabs.jsx
@@ -3,8 +3,7 @@ import { shape, string, number, arrayOf, node, oneOfType } from 'prop-types';
 import { Tab, Tabs, TabTitleText } from '@patternfly/react-core';
 import { useHistory, useLocation } from 'react-router-dom';
 
-function RoutedTabs(props) {
-  const { tabsArray } = props;
+function RoutedTabs({ tabsArray }) {
   const history = useHistory();
   const location = useLocation();
 
@@ -36,8 +35,9 @@ function RoutedTabs(props) {
           aria-label={typeof tab.name === 'string' ? tab.name : null}
           eventKey={tab.id}
           key={tab.id}
-          link={tab.link}
+          href={tab.link}
           title={<TabTitleText>{tab.name}</TabTitleText>}
+          aria-controls=""
         />
       ))}
     </Tabs>
diff --git a/awx/ui_next/src/screens/User/UserList/UserListItem.jsx b/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
index 672e381c47..731d0eac2b 100644
--- a/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
+++ b/awx/ui_next/src/screens/User/UserList/UserListItem.jsx
@@ -43,7 +43,7 @@ function UserListItem({
         }}
       />
       <Td id={labelId} dataLabel={i18n._(t`Username`)}>
-        <Link to={`${detailUrl}`} id={labelId}>
+        <Link to={`${detailUrl}`}>
           <b>{user.username}</b>
         </Link>
         {ldapUser && (