diff --git a/awx/ui_next/package-lock.json b/awx/ui_next/package-lock.json index d22fc3dbf3..9e9d09304a 100644 --- a/awx/ui_next/package-lock.json +++ b/awx/ui_next/package-lock.json @@ -3013,38 +3013,45 @@ "dev": true }, "@patternfly/patternfly": { - "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==" + "version": "4.59.1", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.59.1.tgz", + "integrity": "sha512-zk3aqg62JXMTzzJMJsyVgt5fXlcxUUkRKkaxUv/hwpjhGiyLexZ1l3Gupb9ziYl74p38KzbbfcfdnlFCwJZfgg==" }, "@patternfly/react-core": { - "version": "4.32.1", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.32.1.tgz", - "integrity": "sha512-4FrKJvMfjHjWtmvGu1QVxo/nCdUgePlkdNzMs91r0wdL16CpfoQVtZcfZe4343fRAQ2ObeYfZ2GuiwvS1sw8Og==", + "version": "4.75.2", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.75.2.tgz", + "integrity": "sha512-hoCeTahVgl5I0jA74/so2bZL1eabSD2Uwt8uYgz+W+ShYAC4rJreLOVn43I15J5VPpwIvxrbubccpBqCGL2+wA==", "requires": { - "@patternfly/react-icons": "^4.5.0", - "@patternfly/react-styles": "^4.5.0", - "@patternfly/react-tokens": "^4.6.0", + "@patternfly/react-icons": "^4.7.16", + "@patternfly/react-styles": "^4.7.12", + "@patternfly/react-tokens": "^4.9.16", "focus-trap": "4.0.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", - "tslib": "^1.11.1" + "tslib": "1.13.0" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + } } }, "@patternfly/react-icons": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.5.0.tgz", - "integrity": "sha512-wXAENYa6nST4D8DBkiCrZXf4aRTmVQNA4cyImMJ3aQWAzwJ7Xc1zIBBuYSX5EP0JOuf9DzWVCrzvgfQz1Fcx8g==" + "version": "4.7.16", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.7.16.tgz", + "integrity": "sha512-g1RsaGy/FRsHINdHpHR9RNhC72qs5W/0wIUQVB0HPtCrXdr1UfJCh03RRIhixfGPQDYgw9Ou3j3rARljhwUPUw==" }, "@patternfly/react-styles": { - "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==" + "version": "4.7.12", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.7.12.tgz", + "integrity": "sha512-+IfOc0E440Q61IYQZbux7pwcLf7JWQd1rOs2DDWnoVaw82zr/BZMtGh9T2kcklcH7TUHavSyF6tlCgU40IQ/4g==" }, "@patternfly/react-tokens": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.6.0.tgz", - "integrity": "sha512-zpA4AlYqJNJm5aqsarBVjod1gjP9muJ5oWI2ZwGUFiw4YNRn8eY7QKQ1VvNZxqwI+WSXl98jTqJiKuJGF3DEvw==" + "version": "4.9.16", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.9.16.tgz", + "integrity": "sha512-gqwhMDYHB2R01PlmT+CwaIQiXvc8s7ZywpLpO63rWjy+37cgtgBMApIxZx2tALTuJDYTmu9F/SUce5CUQIgwkQ==" }, "@svgr/babel-plugin-add-jsx-attribute": { "version": "4.2.0", @@ -8272,11 +8279,18 @@ } }, "file-selector": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.12.tgz", - "integrity": "sha512-Kx7RTzxyQipHuiqyZGf+Nz4vY9R1XGxuQl/hLoJwq+J4avk/9wxxgZyHKtbyIPJmbD4A66DWGYfyykWNpcYutQ==", + "version": "0.1.18", + "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.18.tgz", + "integrity": "sha512-MUY65bNFSE+VraxNpxAz04vDlPuh5qENA0WtfgDWoDnKV7ZN2InI8AbSp0F/3aHoJJVKmZ+cqachhVoBNGifWA==", "requires": { - "tslib": "^1.9.0" + "tslib": "^2.0.1" + }, + "dependencies": { + "tslib": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", + "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" + } } }, "filesize": { diff --git a/awx/ui_next/package.json b/awx/ui_next/package.json index 33cf26d0f8..a76a5a5c25 100644 --- a/awx/ui_next/package.json +++ b/awx/ui_next/package.json @@ -7,9 +7,9 @@ }, "dependencies": { "@lingui/react": "^2.9.1", - "@patternfly/patternfly": "^4.23.3", - "@patternfly/react-core": "^4.32.1", - "@patternfly/react-icons": "^4.5.0", + "@patternfly/patternfly": "4.59.1", + "@patternfly/react-core": "4.75.2", + "@patternfly/react-icons": "4.7.16", "ansi-to-html": "^0.6.11", "axios": "^0.18.1", "codemirror": "^5.47.0", diff --git a/awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx b/awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx index 9122a97272..6e91ef8611 100644 --- a/awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx +++ b/awx/ui_next/src/components/AppContainer/NavExpandableGroup.jsx @@ -7,12 +7,10 @@ class NavExpandableGroup extends Component { constructor(props) { super(props); const { routes } = this.props; - this.state = { isExpanded: true }; // Extract a list of paths from the route params and store them for later. This creates // an array of url paths associated with any NavItem component rendered by this component. this.navItemPaths = routes.map(({ path }) => path); - this.handleExpand = this.handleExpand.bind(this); this.isActiveGroup = this.isActiveGroup.bind(this); this.isActivePath = this.isActivePath.bind(this); } @@ -26,13 +24,8 @@ class NavExpandableGroup extends Component { return Boolean(matchPath(history.location.pathname, { path })); } - handleExpand(e, isExpanded) { - this.setState({ isExpanded }); - } - render() { const { groupId, groupTitle, routes } = this.props; - const { isExpanded } = this.state; if (routes.length === 1) { const [{ path }] = routes; @@ -46,10 +39,8 @@ class NavExpandableGroup extends Component { return ( {routes.map(({ path, title }) => ( ', () => { ]} /> ); - await act(() => - newToolbar.find('Search').prop('onShowAdvancedSearch')(true) - ); + act(() => newToolbar.find('Search').prop('onShowAdvancedSearch')(true)); newToolbar.update(); expect(newToolbar.find('KebabToggle').length).toBe(1); - await act(() => newToolbar.find('KebabToggle').prop('onToggle')(true)); + act(() => newToolbar.find('KebabToggle').prop('onToggle')(true)); newToolbar.update(); expect(newToolbar.find('div[aria-label="add container"]').length).toBe(1); expect(newToolbar.find('div[aria-label="add instance group"]').length).toBe( diff --git a/awx/ui_next/src/components/MultiSelect/TagMultiSelect.test.jsx b/awx/ui_next/src/components/MultiSelect/TagMultiSelect.test.jsx index a4c0a2308c..9fdb358434 100644 --- a/awx/ui_next/src/components/MultiSelect/TagMultiSelect.test.jsx +++ b/awx/ui_next/src/components/MultiSelect/TagMultiSelect.test.jsx @@ -8,17 +8,17 @@ describe('', () => { ); wrapper.find('input').simulate('focus'); - const options = wrapper.find('SelectOption'); + const options = wrapper.find('Chip'); expect(options).toHaveLength(2); - expect(options.at(0).prop('value')).toEqual('foo'); - expect(options.at(1).prop('value')).toEqual('bar'); + expect(options.at(0).text()).toEqual('foo'); + expect(options.at(1).text()).toEqual('bar'); }); it('should not treat empty string as an option', () => { const wrapper = mount(); - wrapper.find('input').simulate('focus'); + wrapper.find('SelectToggle').simulate('click'); expect(wrapper.find('Select').prop('isOpen')).toEqual(true); - expect(wrapper.find('SelectOption')).toHaveLength(0); + expect(wrapper.find('Chip')).toHaveLength(0); }); it('should trigger onChange', () => { diff --git a/awx/ui_next/src/components/NotificationList/__snapshots__/NotificationListItem.test.jsx.snap b/awx/ui_next/src/components/NotificationList/__snapshots__/NotificationListItem.test.jsx.snap index 798a9da7e6..7303fdbd7d 100644 --- a/awx/ui_next/src/components/NotificationList/__snapshots__/NotificationListItem.test.jsx.snap +++ b/awx/ui_next/src/components/NotificationList/__snapshots__/NotificationListItem.test.jsx.snap @@ -26,7 +26,9 @@ exports[` initially renders succe >
  • initially renders succe >