From 2ce2c026100cee6aae441decfcd48d2b82ee9e59 Mon Sep 17 00:00:00 2001
From: Matt Bevilacqua <thewatermethod@gmail.com>
Date: Mon, 4 Nov 2024 10:15:16 -0500
Subject: [PATCH 1/2] Fix assorted markup issues (nesting, empty tags)

---
 frontend/src/components/AvatarGroup.js        | 23 +++++++++++++++++++
 .../FileUploader/DeleteFileModal.js           |  2 +-
 .../src/components/FileUploader/FileTable.js  |  5 ++--
 frontend/src/components/HeaderUserMenu.js     | 21 +++++++++--------
 frontend/src/pages/AccountManagement/index.js |  7 ++----
 .../pages/__tests__/sessionSummary.js         |  4 ++--
 6 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 frontend/src/components/AvatarGroup.js

diff --git a/frontend/src/components/AvatarGroup.js b/frontend/src/components/AvatarGroup.js
new file mode 100644
index 0000000000..b5bea934c5
--- /dev/null
+++ b/frontend/src/components/AvatarGroup.js
@@ -0,0 +1,23 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Avatar from './Avatar';
+
+const AvatarGroup = ({ userName, className }) => (
+  <h2 className={`margin-0 display-flex flex-align-center border-bottom border-gray-10 ${className}`}>
+    <Avatar name={userName} />
+    <span className="margin-left-2 font-sans-xs">
+      {userName}
+    </span>
+  </h2>
+);
+
+AvatarGroup.propTypes = {
+  userName: PropTypes.string.isRequired,
+  className: PropTypes.string,
+};
+
+AvatarGroup.defaultProps = {
+  className: 'padding-2',
+};
+
+export default AvatarGroup;
diff --git a/frontend/src/components/FileUploader/DeleteFileModal.js b/frontend/src/components/FileUploader/DeleteFileModal.js
index b48427ba5b..961dfe501a 100644
--- a/frontend/src/components/FileUploader/DeleteFileModal.js
+++ b/frontend/src/components/FileUploader/DeleteFileModal.js
@@ -18,7 +18,7 @@ const DeleteFileModal = ({
         modalId="DeleteFileModal"
         title="Delete File"
         okButtonText="Delete"
-        okButtonAriaLabel="This button will permanently delete the file."
+        okButtonAriaLabel="Confirm delete"
       >
         <p>
           Are you sure you want to delete
diff --git a/frontend/src/components/FileUploader/FileTable.js b/frontend/src/components/FileUploader/FileTable.js
index 6b7ceae980..99fcf24af8 100644
--- a/frontend/src/components/FileUploader/FileTable.js
+++ b/frontend/src/components/FileUploader/FileTable.js
@@ -63,8 +63,9 @@ const FileTable = ({ onFileRemoved, files }) => {
             <th width="20%">
               Status
             </th>
-            <th width="10%" aria-label="remove file" />
-
+            <th width="10%">
+              <span className="usa-sr-only">Remove file</span>
+            </th>
           </tr>
         </thead>
         <tbody>
diff --git a/frontend/src/components/HeaderUserMenu.js b/frontend/src/components/HeaderUserMenu.js
index 4f34561255..6f8f4745cc 100644
--- a/frontend/src/components/HeaderUserMenu.js
+++ b/frontend/src/components/HeaderUserMenu.js
@@ -5,6 +5,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
 import { useLocation } from 'react-router-dom';
 import Avatar from './Avatar';
+import AvatarGroup from './AvatarGroup';
 import DropdownMenu from './DropdownMenu';
 import './HeaderUserMenu.scss';
 import NavLink from './NavLink';
@@ -19,8 +20,10 @@ function UserMenuNav({ items }) {
   return (
     <div>
       <ul className="user-menu-nav">
-        {items.map(({ key, element, liClass }) => (
-          <li key={key} className={liClass}>
+        {items.map(({
+          key, element, liClass, presentation,
+        }) => (
+          <li key={key} className={liClass} role={presentation ? 'presentation' : 'listitem'}>
             {element}
           </li>
         ))}
@@ -33,6 +36,7 @@ UserMenuNav.propTypes = {
   items: PropTypes.arrayOf(PropTypes.shape({
     key: PropTypes.number,
     element: PropTypes.element,
+    presentation: PropTypes.bool,
   })).isRequired,
 };
 
@@ -105,12 +109,13 @@ function HeaderUserMenu({ areThereUnreadNotifications, setAreThereUnreadNotifica
     fn = onItemClick,
   }) => {
     if (showIfAdmin && !userIsAdmin) return false;
-    if (divider) return { key, element: <hr /> };
-    if (space) return { key, element: <div className="height-6" /> };
+    if (divider) return { key, presentation: true, element: <hr /> };
+    if (space) return { key, presentation: true, element: <div aria-hidden="true" className="height-6" /> };
 
     if (external) {
       return {
         key,
+        presentation: false,
         element: (
           <Link key={key} className="usa-nav__link" href={to} target="_blank" rel="noopener noreferrer">
             <span>{label}</span>
@@ -123,6 +128,7 @@ function HeaderUserMenu({ areThereUnreadNotifications, setAreThereUnreadNotifica
 
     return {
       key,
+      presentation: false,
       element: (
         <>
           <NavLink key={key} to={to} fn={fn}>
@@ -195,12 +201,7 @@ function HeaderUserMenu({ areThereUnreadNotifications, setAreThereUnreadNotifica
       className="no-print"
     >
       <div className="user-menu-dropdown" data-testid="user-menu-dropdown">
-        <h4 className="margin-0 display-flex flex-align-center padding-2 border-bottom border-gray-10">
-          <Avatar name={user.name} />
-          <span className="margin-left-2">
-            {user.name}
-          </span>
-        </h4>
+        <AvatarGroup userName={user.name} />
         {isImpersonating && (
           <div className="display-flex flex-justify-center margin-top-2">
             <Button type="button" onClick={stopImpersonating}>
diff --git a/frontend/src/pages/AccountManagement/index.js b/frontend/src/pages/AccountManagement/index.js
index 939797157b..7becf5821f 100644
--- a/frontend/src/pages/AccountManagement/index.js
+++ b/frontend/src/pages/AccountManagement/index.js
@@ -15,7 +15,6 @@ import {
 
 import { useForm, FormProvider, useFormContext } from 'react-hook-form';
 import { useParams } from 'react-router';
-import Avatar from '../../components/Avatar';
 import UserContext from '../../UserContext';
 import {
   subscribe,
@@ -29,6 +28,7 @@ import EmailVerifier from './EmailVerifier';
 import Groups from './components/Groups';
 import WidgetCard from '../../components/WidgetCard';
 import WidgetHeader from '../../components/WidgetHeader';
+import AvatarGroup from '../../components/AvatarGroup';
 
 const emailPreferenceErrorMessage = 'Please select a frequency preference';
 
@@ -381,10 +381,7 @@ function AccountManagement({ updateUser }) {
       <WidgetCard header={<WidgetHeader>Profile</WidgetHeader>}>
         {/* Avatar w/ name */}
         <div className="margin-bottom-3">
-          <h4 className="margin-0 display-flex flex-align-center padding-bottom-3 border-bottom border-gray-20">
-            <Avatar name={user.name} />
-            <span className="margin-left-2">{user.name}</span>
-          </h4>
+          <AvatarGroup userName={user.name} className="padding-bottom-3" />
         </div>
 
         {/* Last login */}
diff --git a/frontend/src/pages/SessionForm/pages/__tests__/sessionSummary.js b/frontend/src/pages/SessionForm/pages/__tests__/sessionSummary.js
index 9cedd0d9a8..2c174f5195 100644
--- a/frontend/src/pages/SessionForm/pages/__tests__/sessionSummary.js
+++ b/frontend/src/pages/SessionForm/pages/__tests__/sessionSummary.js
@@ -243,7 +243,7 @@ describe('sessionSummary', () => {
       fetchMock.delete(deleteUrl, 200);
 
       const confirmDelete = await screen.findByRole('button', {
-        name: /This button will permanently delete the file/i,
+        name: /confirm delete/i,
       });
 
       act(() => {
@@ -335,7 +335,7 @@ describe('sessionSummary', () => {
       fetchMock.delete(deleteUrl, 500);
 
       const confirmDelete = await screen.findByRole('button', {
-        name: /This button will permanently delete the file/i,
+        name: /confirm delete/i,
       });
 
       act(() => {

From 076b2ee92a82859b1b79fdba2ff765c07183f675 Mon Sep 17 00:00:00 2001
From: Matt Bevilacqua <thewatermethod@gmail.com>
Date: Mon, 4 Nov 2024 10:33:55 -0500
Subject: [PATCH 2/2] Conditionally display title in drawer content

---
 frontend/src/components/FeedArticle.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/FeedArticle.js b/frontend/src/components/FeedArticle.js
index d4a464a5c7..54608547df 100644
--- a/frontend/src/components/FeedArticle.js
+++ b/frontend/src/components/FeedArticle.js
@@ -48,7 +48,7 @@ const FeedArticle = ({
   return (
     <article className={`${className} position-relative margin-bottom-3 padding-bottom-3 ${unread ? 'ttahub-feed-article--unread' : ''}`}>
       <div className="ttahub-feed-article-content position-relative maxw-tablet">
-        <h4 className="ttahub-feed-article-title usa-prose margin-0 padding-0">{title}</h4>
+        {title && (<h4 className="ttahub-feed-article-title usa-prose margin-0 padding-0">{title}</h4>)}
         {parse(content)}
       </div>
     </article>