From 2d2d7b14a9d2b8628429e9320b95c3a103207064 Mon Sep 17 00:00:00 2001 From: Alex Corey Date: Tue, 20 Apr 2021 11:58:45 -0400 Subject: [PATCH] fixes object rendered on dom in aria-label --- .../JobList/JobListCancelButton.jsx | 24 +- .../NotificationListItem.test.jsx.snap | 44 + .../ToolbarDeleteButton.test.jsx.snap | 44 + .../DeleteRoleConfirmationModal.test.jsx.snap | 88 ++ .../ResourceAccessListItem.test.jsx.snap | 88 ++ awx/ui_next/src/locales/en/messages.po | 860 ++++++++++-------- awx/ui_next/src/locales/es/messages.po | 854 +++++++++-------- awx/ui_next/src/locales/fr/messages.po | 792 +++++++++------- awx/ui_next/src/locales/ja/messages.po | 786 +++++++++------- awx/ui_next/src/locales/nl/messages.po | 854 +++++++++-------- awx/ui_next/src/locales/zh/messages.po | 790 +++++++++------- awx/ui_next/src/locales/zu/messages.po | 854 +++++++++-------- 12 files changed, 3528 insertions(+), 2550 deletions(-) diff --git a/awx/ui_next/src/components/JobList/JobListCancelButton.jsx b/awx/ui_next/src/components/JobList/JobListCancelButton.jsx index 4341e9613c..9b6d15c661 100644 --- a/awx/ui_next/src/components/JobList/JobListCancelButton.jsx +++ b/awx/ui_next/src/components/JobList/JobListCancelButton.jsx @@ -58,15 +58,29 @@ function JobListCancelButton({ i18n, jobsToCancel, onCancel }) { one="You do not have permission to cancel the following job:" other="You do not have permission to cancel the following jobs:" /> + {cannotCancelPermissions.map((job, i) => + i === cannotCancelPermissions.length - 1 ? ( + {job} + ) : ( + {job}, + ) + )} )} {cannotCancelNotRunning.length > 0 && (
+ {cannotCancelNotRunning.map((job, i) => + i === cannotCancelNotRunning.length - 1 ? ( + {job} + ) : ( + {job}, + ) + )}
)} @@ -99,6 +113,7 @@ function JobListCancelButton({ i18n, jobsToCancel, onCancel }) { key="cancel-job" isDisabled={isDisabled} component="button" + aria-labelledby="jobs-list-cancel-button" onClick={toggleModal} > {cancelJobText} @@ -107,9 +122,10 @@ function JobListCancelButton({ i18n, jobsToCancel, onCancel }) {