diff --git a/awx/ui_next/src/components/About/About.test.jsx b/awx/ui_next/src/components/About/About.test.jsx index caed85e454..2ab383e194 100644 --- a/awx/ui_next/src/components/About/About.test.jsx +++ b/awx/ui_next/src/components/About/About.test.jsx @@ -14,6 +14,7 @@ describe('', () => { test('close button calls onClose handler', () => { aboutWrapper = mountWithContexts(); + console.log(aboutWrapper.debug()) closeButton = aboutWrapper.find('AboutModalBoxCloseButton Button'); closeButton.simulate('click'); expect(onClose).toBeCalled(); diff --git a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx index f084f7e719..e813e1f70b 100644 --- a/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx +++ b/awx/ui_next/src/components/AssociateModal/AssociateModal.jsx @@ -76,6 +76,7 @@ function AssociateModal({ { ); expect(wrapper).toHaveLength(1); - expect(wrapper.find('BackgroundImage')).toHaveLength(1); + expect(wrapper.find('.pf-c-background-image')).toHaveLength(1); expect(wrapper.find('#test')).toHaveLength(1); }); }); diff --git a/awx/ui_next/src/components/ChipGroup/ChipGroup.jsx b/awx/ui_next/src/components/ChipGroup/ChipGroup.jsx index 972efbe5a7..c16ee052fe 100644 --- a/awx/ui_next/src/components/ChipGroup/ChipGroup.jsx +++ b/awx/ui_next/src/components/ChipGroup/ChipGroup.jsx @@ -4,7 +4,7 @@ import { t } from '@lingui/macro'; import { ChipGroup as PFChipGroup } from '@patternfly/react-core'; import { number, shape } from 'prop-types'; -function ChipGroup({ i18n, numChips, totalChips, ...props }) { +function ChipGroup({ i18n, numChips, totalChips, i18nHash, ...props }) { return ( initially renders succe } } > - initially renders succe className="pf-c-data-list__item" id="9000" > -
- @@ -211,7 +211,7 @@ exports[` initially renders succe
- + initially renders succe className="pf-c-data-list__item-action sc-bwzfXH llKtln" rowid="items-list-item-9000" > - initially renders succe labelOff="Start" onChange={[Function]} > - - + + - - - + + + + initially renders succe labelOff="Success" onChange={[Function]} > - - + + - - - + + + + initially renders succe labelOff="Failure" onChange={[Function]} > - - + + - - + Failure + + + + - + - + `; diff --git a/awx/ui_next/src/components/PaginatedDataList/__snapshots__/ToolbarDeleteButton.test.jsx.snap b/awx/ui_next/src/components/PaginatedDataList/__snapshots__/ToolbarDeleteButton.test.jsx.snap index 4894060b1a..5614d42a94 100644 --- a/awx/ui_next/src/components/PaginatedDataList/__snapshots__/ToolbarDeleteButton.test.jsx.snap +++ b/awx/ui_next/src/components/PaginatedDataList/__snapshots__/ToolbarDeleteButton.test.jsx.snap @@ -49,11 +49,11 @@ exports[` should render button 1`] = ` id="" role="tooltip" > - Select a row to delete - + } delay={ @@ -103,44 +103,20 @@ exports[` should render button 1`] = ` onClick={[Function]} variant="danger" > - - - - + Delete + should render button 1`] = ` id="" role="tooltip" > -
should render button 1`] = ` > Select a row to delete
- + diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap index 64130d46bd..7c06eb6a3a 100644 --- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap +++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/DeleteRoleConfirmationModal.test.jsx.snap @@ -17,7 +17,7 @@ exports[` should render initially 1`] = ` } username="jane" > - should render initially 1`] = ` title="Remove Team Access" variant="danger" > - - Delete - , - - Cancel - , - ] - } - appendTo={ - -
-
-
- -
-
-
- - } - ariaDescribedById="" - className="" - header={ - - - - Remove Team Access - - - } - hideTitle={false} - isFooterLeftAligned={true} - isLarge={false} - isOpen={true} - isSmall={true} - onClose={[Function]} - showClose={true} - title="Remove Team Access" + - -
-
- -
-
- + Delete + , + + Cancel + , + ] } + i18n={"/i18n/"} + isOpen={true} + onClose={[Function]} + title="Remove Team Access" + variant="danger" > - should render initially 1`] = ` , ] } - ariaDescribedById="" + appendTo={ + +
+
+
+ +
+
+
+ + } + aria-describedby="" + aria-label="Alert modal" + aria-labelledby="alert-modal-header-label" className="" + hasNoBodyWrapper={false} header={ - Remove Team Access - + } - hideTitle={false} - id="pf-modal-0" - isFooterLeftAligned={true} - isLarge={false} isOpen={true} - isSmall={true} onClose={[Function]} showClose={true} title="Remove Team Access" + variant="small" > - -
- +
- +
+
+ + } + > + + Delete + , + + Cancel + , + ] + } + aria-describedby="" + aria-label="Alert modal" + aria-labelledby="alert-modal-header-label" + boxId="pf-modal-part-0" + className="" + descriptorId="pf-modal-part-2" + hasNoBodyWrapper={false} + header={ + + + + Remove Team Access + + + } + isOpen={true} + labelId="pf-modal-part-1" + onClose={[Function]} + showClose={true} + title="Remove Team Access" + variant="small" + > + +
+ +
+ + - -
- Are you sure you want to remove Member access from The Team? Doing so affects all members of the team. -
-
- If you only want to remove access for this particular user, please remove them from the team. -
- - -
+ + + - -
+ + +
+ - - - - - - - - + +
- +
- + - - - - - - - + + + + + + + `; diff --git a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap index bfe1711fe8..a13833da3d 100644 --- a/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap +++ b/awx/ui_next/src/components/ResourceAccessList/__snapshots__/ResourceAccessListItem.test.jsx.snap @@ -32,7 +32,7 @@ exports[` initially renders succesfully 1`] = ` i18n={"/i18n/"} onRoleDelete={[Function]} > - initially renders succesfully 1`] = ` className="pf-c-data-list__item" id="2" > - @@ -53,8 +53,8 @@ exports[` initially renders succesfully 1`] = ` dataListCells={ Array [ - - + initially renders succesfully 1`] = ` > jane - - + + @@ -92,12 +92,17 @@ exports[` initially renders succesfully 1`] = ` numChips={5} totalChips={1} > - Member - + } /> @@ -112,8 +117,8 @@ exports[` initially renders succesfully 1`] = ` dataListCells={ Array [ - - + initially renders succesfully 1`] = ` > jane - - + + @@ -151,12 +156,17 @@ exports[` initially renders succesfully 1`] = ` numChips={5} totalChips={1} > - Member - + } /> @@ -189,13 +199,13 @@ exports[` initially renders succesfully 1`] = ` forwardedRef={null} rowid="access-list-item" > - - - + initially renders succesfully 1`] = ` > jane - - + + @@ -233,12 +243,17 @@ exports[` initially renders succesfully 1`] = ` numChips={5} totalChips={1} > - Member - + } /> @@ -287,11 +302,11 @@ exports[` initially renders succesfully 1`] = `
- +
-
initially renders succesfully 1`] = `
- +
- + @@ -421,7 +436,7 @@ exports[` initially renders succesfully 1`] = ` className="sc-bwzfXH kVCDmm" stacked={true} > - @@ -479,7 +494,7 @@ exports[` initially renders succesfully 1`] = ` data-cy={null} fullWidth={false} > - initially renders succesfully 1`] = ` > Name - + @@ -542,7 +557,7 @@ exports[` initially renders succesfully 1`] = ` data-cy={null} fullWidth={false} > - initially renders succesfully 1`] = ` > jane brown - + - + @@ -644,7 +659,7 @@ exports[` initially renders succesfully 1`] = ` className="sc-bwzfXH kVCDmm" stacked={true} > - @@ -661,12 +676,17 @@ exports[` initially renders succesfully 1`] = ` numChips={5} totalChips={1} > - Member - + } > @@ -714,7 +734,7 @@ exports[` initially renders succesfully 1`] = ` data-cy={null} fullWidth={false} > - initially renders succesfully 1`] = ` > Team Roles - + @@ -777,7 +797,7 @@ exports[` initially renders succesfully 1`] = ` data-cy={null} fullWidth={false} > - initially renders succesfully 1`] = ` totalChips={1} > -
    - - - -
  • Member - - - - - -
    • + + + + +     +
- - - - + + + + - + - + @@ -990,12 +948,12 @@ exports[` initially renders succesfully 1`] = ` - + - + - + `; diff --git a/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx b/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx index d2d846c15f..8811480f14 100644 --- a/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx +++ b/awx/ui_next/src/screens/Job/JobOutput/HostEventModal.jsx @@ -143,6 +143,7 @@ function HostEventModal({ onClose, hostEvent = {}, isOpen = false, i18n }) { isOpen={isOpen} onClose={onClose} title={i18n._(t`Host Details`)} + aria-label={i18n._(t`Host details modal`)} > onToggleModalOpen(false)} variant="small" diff --git a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx index 9eaa4b0126..ed11bf59c2 100644 --- a/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx +++ b/awx/ui_next/src/screens/Template/WorkflowJobTemplateVisualizer/Modals/LinkModals/LinkModal.jsx @@ -21,6 +21,7 @@ function LinkModal({ header, i18n, onConfirm }) { header={header} isOpen title={i18n._(t`Workflow Link`)} + aria-label={i18n._(t`Workflow link modal`)} onClose={() => dispatch({ type: 'CANCEL_LINK_MODAL' })} actions={[