diff --git a/app/assets/stylesheets/patternfly_colors_overrides.scss b/app/assets/stylesheets/patternfly_colors_overrides.scss index 5404306e8c5..602ae4e7d36 100644 --- a/app/assets/stylesheets/patternfly_colors_overrides.scss +++ b/app/assets/stylesheets/patternfly_colors_overrides.scss @@ -10,8 +10,13 @@ color: var(--pf-v5-global--palette--black-500); } .pf-v5-c-text-input-group__text-input { - // color: var(--pf-v5-global--palette--black-500); color: var(--pf-v5-global--palette--black-1000); + &::placeholder { + color: var(--pf-v5-global--palette--black-500); + } + ::placeholder { + color: var(--pf-v5-global--palette--black-500); + } } } } diff --git a/package.json b/package.json index a0949d240d5..e64762e9724 100644 --- a/package.json +++ b/package.json @@ -21,13 +21,6 @@ }, "dependencies": { "@module-federation/utilities": "^1.7.0", - "@patternfly/patternfly": "^5.1.0", - "@patternfly/react-charts": "^7.3.0", - "@patternfly/react-core": "^5.1.1", - "@patternfly/react-icons": "^5.1.1", - "@patternfly/react-styles": "^5.1.1", - "@patternfly/react-table": "^5.1.1", - "@patternfly/react-tokens": "^5.1.1", "@theforeman/vendor": "^13.1.0", "graphql-tag": "^2.11.0", "intl": "~1.2.5", @@ -64,7 +57,7 @@ "style-loader": "^1.3.0", "stylelint": "^9.3.0", "stylelint-config-standard": "^18.0.0", - "tabbable": "^6.2.0", + "tabbable": "~5.2.0", "victory-core": "~36.8.6", "victory-pie": "~36.8.6", "webpack": "^5.75.0", diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/Audits/index.js b/webpack/assets/javascripts/react_app/components/HostDetails/Audits/index.js index a5aec7fb702..0d0896c9c2e 100644 --- a/webpack/assets/javascripts/react_app/components/HostDetails/Audits/index.js +++ b/webpack/assets/javascripts/react_app/components/HostDetails/Audits/index.js @@ -10,13 +10,7 @@ import { GridItem, Title, } from '@patternfly/react-core'; -import { - Table /* data-codemods */, - TableText, - Tr, - Tbody, - Td, -} from '@patternfly/react-table'; +import { Table, TableText, Tr, Tbody, Td } from '@patternfly/react-table'; import URI from 'urijs'; import { push } from 'connected-react-router'; diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/DetailsCard/index.js b/webpack/assets/javascripts/react_app/components/HostDetails/DetailsCard/index.js index d6e77c26d64..df9aa570c21 100644 --- a/webpack/assets/javascripts/react_app/components/HostDetails/DetailsCard/index.js +++ b/webpack/assets/javascripts/react_app/components/HostDetails/DetailsCard/index.js @@ -58,8 +58,6 @@ const DetailsCard = ({ /> ), - hasNoOffset: false, - className: undefined, }} > {__('Details')} diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Details/Cards/TemplatesCard/index.js b/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Details/Cards/TemplatesCard/index.js index 5c85fc355f4..b8883e4a741 100644 --- a/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Details/Cards/TemplatesCard/index.js +++ b/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Details/Cards/TemplatesCard/index.js @@ -2,12 +2,7 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; import { Button } from '@patternfly/react-core'; import { PencilAltIcon } from '@patternfly/react-icons'; -import { - Table /* data-codemods */, - Tr, - Tbody, - Td, -} from '@patternfly/react-table'; +import { Table, Tr, Tbody, Td } from '@patternfly/react-table'; import { translate as __ } from '../../../../../../common/I18n'; import { foremanUrl } from '../../../../../../common/helpers'; import { useAPI } from '../../../../../../common/hooks/API/APIHooks'; diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Parameters/ParametersTable.js b/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Parameters/ParametersTable.js index 714ad26294e..b2c2140a847 100644 --- a/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Parameters/ParametersTable.js +++ b/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/Parameters/ParametersTable.js @@ -1,12 +1,6 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; -import { - Table /* data-codemods */, - Thead, - Tbody, - Tr, - Th, -} from '@patternfly/react-table'; +import { Table, Thead, Tbody, Tr, Th } from '@patternfly/react-table'; import { Toolbar, ToolbarContent, @@ -135,7 +129,7 @@ export const ParametersTable = ({ {columnNames.type} {columnNames.value} {columnNames.source} - + diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/ReportsTab/ReportsTable.js b/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/ReportsTab/ReportsTable.js index c0096f36a74..288a87f96b5 100644 --- a/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/ReportsTab/ReportsTable.js +++ b/webpack/assets/javascripts/react_app/components/HostDetails/Tabs/ReportsTab/ReportsTable.js @@ -1,13 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { - Table /* data-codemods */, - Thead, - Tbody, - Tr, - Th, - Td, -} from '@patternfly/react-table'; +import { Table, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table'; import { Spinner } from '@patternfly/react-core'; import { SearchIcon, ExclamationCircleIcon } from '@patternfly/react-icons'; import { STATUS } from '../../../../constants'; diff --git a/webpack/assets/javascripts/react_app/components/HostDetails/Templates/CardItem/CardTemplate/index.js b/webpack/assets/javascripts/react_app/components/HostDetails/Templates/CardItem/CardTemplate/index.js index 647e55fa75a..cc7a7f3540f 100644 --- a/webpack/assets/javascripts/react_app/components/HostDetails/Templates/CardItem/CardTemplate/index.js +++ b/webpack/assets/javascripts/react_app/components/HostDetails/Templates/CardItem/CardTemplate/index.js @@ -80,8 +80,6 @@ const CardTemplate = ({ /> ), - hasNoOffset: false, - className: undefined, }, })} onExpand={expandable && onExpandCallback} diff --git a/webpack/assets/javascripts/react_app/components/HostsIndex/index.js b/webpack/assets/javascripts/react_app/components/HostsIndex/index.js index 8387d3050ed..d9136bb6c0e 100644 --- a/webpack/assets/javascripts/react_app/components/HostsIndex/index.js +++ b/webpack/assets/javascripts/react_app/components/HostsIndex/index.js @@ -281,6 +281,7 @@ const HostsIndex = () => { window.location.href = foremanUrl(`/hosts/${id}/clone`); }, isDisabled: !canEdit, + autoFocus: true, }, { title: __('Delete'), @@ -419,7 +420,10 @@ const HostsIndex = () => { ))} {rowActions.length ? ( - + ) : null} diff --git a/webpack/assets/javascripts/react_app/components/Layout/components/TaxonomySwitcher/TaxonomyDropdown.js b/webpack/assets/javascripts/react_app/components/Layout/components/TaxonomySwitcher/TaxonomyDropdown.js index 6aba11a5747..4990665913a 100644 --- a/webpack/assets/javascripts/react_app/components/Layout/components/TaxonomySwitcher/TaxonomyDropdown.js +++ b/webpack/assets/javascripts/react_app/components/Layout/components/TaxonomySwitcher/TaxonomyDropdown.js @@ -44,7 +44,7 @@ const TaxonomyDropdown = ({ taxonomyType, currentTaxonomy, taxonomies }) => { const onSelect = () => { setIsOpen(!isOpen); }; - const onSearchInputChange = (value, event) => { + const onSearchInputChange = event => { setSearchValue(event.target.value); }; diff --git a/webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/Table/Table.js b/webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/Table/Table.js index 27cdcf2a037..782bec93a25 100644 --- a/webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/Table/Table.js +++ b/webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/Table/Table.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; import { - Table as PFTable /* data-codemods */, + Table as PFTable, Thead, Tr, Th, @@ -94,11 +94,11 @@ export const Table = ({ isDeleteable && { title: __('Delete'), onClick: () => onDeleteClick({ id, name }), - isAriaDisabled: !canDelete, + isDisabled: !canDelete, }, ...extendActions.map(action => ({ ...action, - isAriaDisabled: action.isDisabled, + isDisabled: action.isDisabled, })), ].filter(Boolean); }; diff --git a/webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/TableIndexPage.scss b/webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/TableIndexPage.scss index 9d95f703900..de2e8420bd7 100644 --- a/webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/TableIndexPage.scss +++ b/webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/TableIndexPage.scss @@ -39,7 +39,7 @@ width: min-content; } } - .pf-c-table tr.pf-m-hoverable { + .pf-v5-c-table tr.pf-m-clickable { cursor: default; } } diff --git a/webpack/assets/javascripts/react_app/components/SearchBar/AutoCompleteMenu.js b/webpack/assets/javascripts/react_app/components/SearchBar/AutoCompleteMenu.js index 7f1bdb1afec..cbcf11511fa 100644 --- a/webpack/assets/javascripts/react_app/components/SearchBar/AutoCompleteMenu.js +++ b/webpack/assets/javascripts/react_app/components/SearchBar/AutoCompleteMenu.js @@ -48,7 +48,7 @@ export const AutoCompleteMenu = ({ results, error }) => { .map(category => ( {!!itemIndex && } - + {getMenuItemsByCategory(category)}