1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 13:55:31 +03:00

Merge pull request #7671 from jlmitch5/pfUpdate0920

update pf to 09 2020 release

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-07-23 20:57:07 +00:00 committed by GitHub
commit 68c62d74f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 134 additions and 161 deletions

View File

@ -3238,45 +3238,38 @@
"dev": true
},
"@patternfly/patternfly": {
"version": "4.10.31",
"resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.10.31.tgz",
"integrity": "sha512-UxdZ/apWRowXYZ5qPz5LPfXwyB4YGpomrCJPX7c36+Zg8jFpYyVqgVYainL8Yf/GrChtC2LKyoHg7UUTtMtp4A=="
"version": "4.23.3",
"resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.23.3.tgz",
"integrity": "sha512-q8C98ihcRYBY+FB+KY3bQ9y1Pn/NjBff4hwKsxatrs/MSO/++CuEncg4q7WHjIq2zadA4/7W+Vg3CXuiOP0geg=="
},
"@patternfly/react-core": {
"version": "4.18.14",
"resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.18.14.tgz",
"integrity": "sha512-aFOBX02ud78eCu7rtbUTr+Rj/J7BertxDssSWFb+uDQrUN268dSH9/tvHcDd3//YZrsCoBbky9ngRa4Jt1fryg==",
"version": "4.32.1",
"resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.32.1.tgz",
"integrity": "sha512-4FrKJvMfjHjWtmvGu1QVxo/nCdUgePlkdNzMs91r0wdL16CpfoQVtZcfZe4343fRAQ2ObeYfZ2GuiwvS1sw8Og==",
"requires": {
"@patternfly/react-icons": "^4.3.6",
"@patternfly/react-styles": "^4.3.6",
"@patternfly/react-tokens": "^4.4.5",
"@patternfly/react-icons": "^4.5.0",
"@patternfly/react-styles": "^4.5.0",
"@patternfly/react-tokens": "^4.6.0",
"focus-trap": "4.0.2",
"react-dropzone": "9.0.0",
"tippy.js": "5.1.2",
"tslib": "^1.11.1"
},
"dependencies": {
"@patternfly/react-icons": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.4.0.tgz",
"integrity": "sha512-UKQI5luZ6Bd3SLljl4WNFVhtteUiM2lbKz5qjgBZn3zLOW2Zigv6M1zkgII6rMW9Rxql/UEDZkvNmilf84HW+g=="
}
}
},
"@patternfly/react-icons": {
"version": "4.3.5",
"resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.3.5.tgz",
"integrity": "sha512-+GublxpFXR+y/5zygf9q00/LvIvso8jr0mxZGhVxsKmi2dUu7xAvN+T+5vjS9fiMbXf7WXsSPXST/UTiBIVTdQ=="
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.5.0.tgz",
"integrity": "sha512-wXAENYa6nST4D8DBkiCrZXf4aRTmVQNA4cyImMJ3aQWAzwJ7Xc1zIBBuYSX5EP0JOuf9DzWVCrzvgfQz1Fcx8g=="
},
"@patternfly/react-styles": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.4.0.tgz",
"integrity": "sha512-0guVqVVvLgDMKAqLM9Vb3T9sjSPBGm9DzTURuZrIz/gx9gKuckSA42OS1aTTtZLXz6ryYoOn7uQJiIhaJu1F0Q=="
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.5.0.tgz",
"integrity": "sha512-6w8mvxx/cC+yUzBKlWY8YRnavlWCTLWly1si0skleYPF1t69f3P+jeXNy39kH6+o2vXJR5MeecLrnuMV0XtKvg=="
},
"@patternfly/react-tokens": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.5.0.tgz",
"integrity": "sha512-cfxWduAIIFuRnuTuTkColGCoGPmdXy2ousabpGd+Yi3vbwWcWYIRlrLuetK1VMmddnt2PW9PnaLDW6bH3+oagQ=="
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.6.0.tgz",
"integrity": "sha512-zpA4AlYqJNJm5aqsarBVjod1gjP9muJ5oWI2ZwGUFiw4YNRn8eY7QKQ1VvNZxqwI+WSXl98jTqJiKuJGF3DEvw=="
},
"@svgr/babel-plugin-add-jsx-attribute": {
"version": "4.2.0",

View File

@ -7,9 +7,9 @@
},
"dependencies": {
"@lingui/react": "^2.9.1",
"@patternfly/patternfly": "^4.10.31",
"@patternfly/react-core": "4.18.14",
"@patternfly/react-icons": "^4.3.5",
"@patternfly/patternfly": "^4.23.3",
"@patternfly/react-core": "^4.32.1",
"@patternfly/react-icons": "^4.5.0",
"ansi-to-html": "^0.6.11",
"axios": "^0.18.1",
"codemirror": "^5.47.0",

View File

@ -8,62 +8,13 @@ exports[`<ToolbarDeleteButton /> should render button 1`] = `
pluralizedItemName="Items"
>
<Tooltip
appendTo={[Function]}
aria="describedby"
boundary="window"
className=""
content="Select a row to delete"
distance={15}
enableFlip={true}
entryDelay={500}
exitDelay={500}
flipBehavior={
Array [
"top",
"right",
"bottom",
"left",
"top",
"right",
"bottom",
]
}
id=""
isAppLauncher={false}
isContentLeftAligned={false}
isVisible={false}
maxWidth="18.75rem"
position="top"
tippyProps={Object {}}
trigger="mouseenter focus"
zIndex={9999}
>
<PopoverBase
<Popper
appendTo={[Function]}
aria="describedby"
arrow={true}
boundary="window"
content={
<div
className=""
id=""
role="tooltip"
>
<TooltipContent
isLeftAligned={false}
>
Select a row to delete
</TooltipContent>
</div>
}
delay={
Array [
500,
500,
]
}
distance={15}
flip={true}
enableFlip={true}
flipBehavior={
Array [
"top",
@ -76,83 +27,90 @@ exports[`<ToolbarDeleteButton /> should render button 1`] = `
]
}
isVisible={false}
lazy={true}
maxWidth="18.75rem"
onCreate={[Function]}
onBlur={[Function]}
onDocumentClick={false}
onDocumentKeyDown={[Function]}
onFocus={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onTriggerEnter={[Function]}
placement="top"
popperOptions={
Object {
"modifiers": Object {
"hide": Object {
"enabled": true,
},
"preventOverflow": Object {
"enabled": true,
},
},
}
}
theme="pf-tooltip"
trigger="mouseenter focus"
zIndex={9999}
>
<div>
<Button
aria-label="Delete"
isDisabled={true}
onClick={[Function]}
variant="danger"
>
<button
aria-disabled={null}
aria-label="Delete"
className="pf-c-button pf-m-danger"
data-ouia-component-id={null}
data-ouia-component-type="PF4/Button"
data-ouia-safe={true}
disabled={true}
onClick={[Function]}
tabIndex={null}
type="button"
>
Delete
</button>
</Button>
</div>
<Portal
containerInfo={
<div>
<div
class=""
id=""
role="tooltip"
>
<div
class="pf-c-tooltip__content"
>
Select a row to delete
</div>
</div>
</div>
}
>
popper={
<div
className=""
id=""
className="pf-c-tooltip"
id="pf-tooltip-1"
role="tooltip"
style={
Object {
"maxWidth": null,
"opacity": 0,
"transition": "opacity 300ms cubic-bezier(.54, 1.5, .38, 1.11)",
}
}
>
<TooltipArrow />
<TooltipContent
isLeftAligned={false}
>
<div
className="pf-c-tooltip__content"
>
Select a row to delete
</div>
Select a row to delete
</TooltipContent>
</div>
</Portal>
</PopoverBase>
}
popperMatchesTriggerWidth={false}
positionModifiers={
Object {
"bottom": "pf-m-bottom",
"left": "pf-m-left",
"right": "pf-m-right",
"top": "pf-m-top",
}
}
trigger={
<div
aria-describedby="pf-tooltip-1"
>
<Button
aria-label="Delete"
isDisabled={true}
onClick={[Function]}
variant="danger"
>
Delete
</Button>
</div>
}
zIndex={9999}
>
<FindRefWrapper
onFoundRef={[Function]}
>
<div
aria-describedby="pf-tooltip-1"
>
<Button
aria-label="Delete"
isDisabled={true}
onClick={[Function]}
variant="danger"
>
<button
aria-disabled={true}
aria-label="Delete"
className="pf-c-button pf-m-danger pf-m-disabled"
data-ouia-component-id={0}
data-ouia-component-type="PF4/Button"
data-ouia-safe={true}
disabled={true}
onClick={[Function]}
tabIndex={null}
type="button"
>
Delete
</button>
</Button>
</div>
</FindRefWrapper>
</Popper>
</Tooltip>
</ToolbarDeleteButton>
`;

View File

@ -103,12 +103,17 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
aria-labelledby="pf-modal-part-0 alert-modal-header-label pf-modal-part-1"
aria-modal="true"
class="pf-c-modal-box pf-m-sm"
data-ouia-component-id="0"
data-ouia-component-type="PF4/ModalContent"
data-ouia-safe="true"
id="pf-modal-part-0"
role="dialog"
>
<button
aria-disabled="false"
aria-label="Close"
class="pf-c-button pf-m-plain"
data-ouia-component-id="1"
data-ouia-component-type="PF4/Button"
data-ouia-safe="true"
type="button"
@ -170,8 +175,10 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
class="pf-c-modal-box__footer"
>
<button
aria-disabled="false"
aria-label="Confirm delete"
class="pf-c-button pf-m-danger"
data-ouia-component-id="2"
data-ouia-component-type="PF4/Button"
data-ouia-safe="true"
type="button"
@ -179,7 +186,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
Delete
</button>
<button
aria-disabled="false"
class="pf-c-button pf-m-secondary"
data-ouia-component-id="3"
data-ouia-component-type="PF4/Button"
data-ouia-safe="true"
type="button"
@ -214,6 +223,7 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
}
isOpen={true}
onClose={[Function]}
ouiaSafe={true}
showClose={true}
title="Remove Team Access"
variant="small"
@ -233,12 +243,17 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
aria-labelledby="pf-modal-part-0 alert-modal-header-label pf-modal-part-1"
aria-modal="true"
class="pf-c-modal-box pf-m-sm"
data-ouia-component-id="0"
data-ouia-component-type="PF4/ModalContent"
data-ouia-safe="true"
id="pf-modal-part-0"
role="dialog"
>
<button
aria-disabled="false"
aria-label="Close"
class="pf-c-button pf-m-plain"
data-ouia-component-id="1"
data-ouia-component-type="PF4/Button"
data-ouia-safe="true"
type="button"
@ -300,8 +315,10 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
class="pf-c-modal-box__footer"
>
<button
aria-disabled="false"
aria-label="Confirm delete"
class="pf-c-button pf-m-danger"
data-ouia-component-id="2"
data-ouia-component-type="PF4/Button"
data-ouia-safe="true"
type="button"
@ -309,7 +326,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
Delete
</button>
<button
aria-disabled="false"
class="pf-c-button pf-m-secondary"
data-ouia-component-id="3"
data-ouia-component-type="PF4/Button"
data-ouia-safe="true"
type="button"
@ -365,6 +384,7 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
isOpen={true}
labelId="pf-modal-part-1"
onClose={[Function]}
ouiaSafe={true}
showClose={true}
title="Remove Team Access"
variant="small"
@ -391,6 +411,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
aria-label="Alert modal"
aria-labelledby="pf-modal-part-0 alert-modal-header-label pf-modal-part-1"
className=""
data-ouia-component-id={0}
data-ouia-component-type="PF4/ModalContent"
data-ouia-safe={true}
id="pf-modal-part-0"
style={Object {}}
variant="small"
@ -401,6 +424,9 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
aria-labelledby="pf-modal-part-0 alert-modal-header-label pf-modal-part-1"
aria-modal="true"
className="pf-c-modal-box pf-m-sm"
data-ouia-component-id={0}
data-ouia-component-type="PF4/ModalContent"
data-ouia-safe={true}
id="pf-modal-part-0"
role="dialog"
style={Object {}}
@ -415,15 +441,14 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
variant="plain"
>
<button
aria-disabled={null}
aria-disabled={false}
aria-label="Close"
className="pf-c-button pf-m-plain"
data-ouia-component-id={null}
data-ouia-component-id={1}
data-ouia-component-type="PF4/Button"
data-ouia-safe={true}
disabled={false}
onClick={[Function]}
tabIndex={null}
type="button"
>
<TimesIcon
@ -586,15 +611,14 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
variant="danger"
>
<button
aria-disabled={null}
aria-disabled={false}
aria-label="Confirm delete"
className="pf-c-button pf-m-danger"
data-ouia-component-id={null}
data-ouia-component-id={2}
data-ouia-component-type="PF4/Button"
data-ouia-safe={true}
disabled={false}
onClick={[Function]}
tabIndex={null}
type="button"
>
Delete
@ -606,15 +630,14 @@ exports[`<DeleteRoleConfirmationModal /> should render initially 1`] = `
variant="secondary"
>
<button
aria-disabled={null}
aria-disabled={false}
aria-label={null}
className="pf-c-button pf-m-secondary"
data-ouia-component-id={null}
data-ouia-component-id={3}
data-ouia-component-type="PF4/Button"
data-ouia-safe={true}
disabled={false}
onClick={[Function]}
tabIndex={null}
type="button"
>
Cancel

View File

@ -862,7 +862,7 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
>
<div
className="pf-c-chip"
data-ouia-component-id={1}
data-ouia-component-id={2}
data-ouia-component-type="PF4/Chip"
data-ouia-safe={true}
>
@ -880,17 +880,16 @@ exports[`<ResourceAccessListItem /> initially renders succesfully 1`] = `
variant="plain"
>
<button
aria-disabled={null}
aria-disabled={false}
aria-label="close"
aria-labelledby="remove_pf-random-id-1 pf-random-id-1"
className="pf-c-button pf-m-plain"
data-ouia-component-id={null}
data-ouia-component-id={3}
data-ouia-component-type="PF4/Button"
data-ouia-safe={true}
disabled={false}
id="remove_pf-random-id-1"
onClick={[Function]}
tabIndex={null}
type="button"
>
<TimesIcon

View File

@ -45,7 +45,7 @@ describe('<HostStatusBar />', () => {
test('empty host counts should display tooltip and one bar segment', () => {
wrapper = mountWithContexts(<HostStatusBar />);
expect(wrapper.find('BarSegment').length).toBe(1);
expect(wrapper.find('TooltipContent').text()).toEqual(
expect(wrapper.find('Tooltip').prop('content')).toEqual(
'Host status information for this job is unavailable.'
);
});