diff --git a/package-lock.json b/package-lock.json index b1ba90d38..911355fe3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@data-driven-forms/react-form-renderer": "^3.16.5", "@patternfly/react-core": "^4.267.6", "@patternfly/react-icons": "^4.93.3", - "@patternfly/react-table": "^4.112.6", + "@patternfly/react-table": "^4.112.39", "@redhat-cloud-services/frontend-components": "3.9.27", "@redhat-cloud-services/frontend-components-notifications": "^3.2.12", "@redhat-cloud-services/frontend-components-remediations": "^3.2.8", @@ -3801,13 +3801,13 @@ "dev": true }, "node_modules/@patternfly/react-core": { - "version": "4.267.6", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.267.6.tgz", - "integrity": "sha512-4sb0OeGHLSLfFzrs5Tn3IXHuu6VLb+6v/FG4vcMccnGq7j/Bocns40g5mPkxC9KVbWHq7lT34wfKzS5kyIBHKQ==", + "version": "4.276.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.6.tgz", + "integrity": "sha512-G0K+378jf9jw9g+hCAoKnsAe/UGTRspqPeuAYypF2FgNr+dC7dUpc7/VkNhZBVqSJzUWVEK8NyXcqkfi0IemIg==", "dependencies": { - "@patternfly/react-icons": "^4.93.3", - "@patternfly/react-styles": "^4.92.3", - "@patternfly/react-tokens": "^4.94.3", + "@patternfly/react-icons": "^4.93.6", + "@patternfly/react-styles": "^4.92.6", + "@patternfly/react-tokens": "^4.94.6", "focus-trap": "6.9.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", @@ -3819,28 +3819,28 @@ } }, "node_modules/@patternfly/react-icons": { - "version": "4.93.3", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.3.tgz", - "integrity": "sha512-OIEeTc4Noi9XOIRF3OB3sz9dRnxr1h4eNIzIeZwRd8xXWCQxYcrllxPV98F3+RpL4ZCH2QWb/2gG4mHrVyX+0A==", + "version": "4.93.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.6.tgz", + "integrity": "sha512-ZrXegc/81oiuTIeWvoHb3nG/eZODbB4rYmekBEsrbiysyO7m/sUFoi/RLvgFINrRoh6YCJqL5fj06Jg6d7jX1g==", "peerDependencies": { "react": "^16.8 || ^17 || ^18", "react-dom": "^16.8 || ^17 || ^18" } }, "node_modules/@patternfly/react-styles": { - "version": "4.92.3", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.92.3.tgz", - "integrity": "sha512-jC8F71trFWVYM7YVTP/3MBLwLZDCY3tgHeAmSKdcw6R607LK4rtCzfw5lt2IHNmAjQ0ggqDlJGWsJAfGMe4iPA==" + "version": "4.92.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.92.6.tgz", + "integrity": "sha512-b8uQdEReMyeoMzjpMri845QxqtupY/tIFFYfVeKoB2neno8gkcW1RvDdDe62LF88q45OktCwAe/8A99ker10Iw==" }, "node_modules/@patternfly/react-table": { - "version": "4.112.6", - "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.112.6.tgz", - "integrity": "sha512-PNyBF64bCX3QtctzUKl13ycsXCY6SIWlXYJbdxnpRtXNfQ+9y0G70s+RDO6jw3osLtcxA06NfyMz0vuaqevPaA==", - "dependencies": { - "@patternfly/react-core": "^4.267.6", - "@patternfly/react-icons": "^4.93.3", - "@patternfly/react-styles": "^4.92.3", - "@patternfly/react-tokens": "^4.94.3", + "version": "4.112.39", + "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.112.39.tgz", + "integrity": "sha512-U+hOMgYlbghGH4M5MX+qt0GkVi/ocrGnxDnm11YiS3CtEGsd6Rr0NeqMmk0uoR46Od4Pr5tKuXxZhPP32sCL/w==", + "dependencies": { + "@patternfly/react-core": "^4.276.6", + "@patternfly/react-icons": "^4.93.6", + "@patternfly/react-styles": "^4.92.6", + "@patternfly/react-tokens": "^4.94.6", "lodash": "^4.17.19", "tslib": "^2.0.0" }, @@ -3850,9 +3850,9 @@ } }, "node_modules/@patternfly/react-tokens": { - "version": "4.94.3", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.3.tgz", - "integrity": "sha512-Rq8RMJ/iu/nTDidEb/xQWUMXFW+W4MuoLBonTAFv/Bx8G3gFMHU2JGtv9R5SvAYU6Eux9EkjCG7h3xiLqwH3jg==" + "version": "4.94.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.6.tgz", + "integrity": "sha512-tm7C6nat+uKMr1hrapis7hS3rN9cr41tpcCKhx6cod6FLU8KwF2Yt5KUxakhIOCEcE/M/EhXhAw/qejp8w0r7Q==" }, "node_modules/@pmmmwh/react-refresh-webpack-plugin": { "version": "0.5.8", @@ -32562,13 +32562,13 @@ "dev": true }, "@patternfly/react-core": { - "version": "4.267.6", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.267.6.tgz", - "integrity": "sha512-4sb0OeGHLSLfFzrs5Tn3IXHuu6VLb+6v/FG4vcMccnGq7j/Bocns40g5mPkxC9KVbWHq7lT34wfKzS5kyIBHKQ==", + "version": "4.276.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.6.tgz", + "integrity": "sha512-G0K+378jf9jw9g+hCAoKnsAe/UGTRspqPeuAYypF2FgNr+dC7dUpc7/VkNhZBVqSJzUWVEK8NyXcqkfi0IemIg==", "requires": { - "@patternfly/react-icons": "^4.93.3", - "@patternfly/react-styles": "^4.92.3", - "@patternfly/react-tokens": "^4.94.3", + "@patternfly/react-icons": "^4.93.6", + "@patternfly/react-styles": "^4.92.6", + "@patternfly/react-tokens": "^4.94.6", "focus-trap": "6.9.2", "react-dropzone": "9.0.0", "tippy.js": "5.1.2", @@ -32576,33 +32576,33 @@ } }, "@patternfly/react-icons": { - "version": "4.93.3", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.3.tgz", - "integrity": "sha512-OIEeTc4Noi9XOIRF3OB3sz9dRnxr1h4eNIzIeZwRd8xXWCQxYcrllxPV98F3+RpL4ZCH2QWb/2gG4mHrVyX+0A==", + "version": "4.93.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.6.tgz", + "integrity": "sha512-ZrXegc/81oiuTIeWvoHb3nG/eZODbB4rYmekBEsrbiysyO7m/sUFoi/RLvgFINrRoh6YCJqL5fj06Jg6d7jX1g==", "requires": {} }, "@patternfly/react-styles": { - "version": "4.92.3", - "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.92.3.tgz", - "integrity": "sha512-jC8F71trFWVYM7YVTP/3MBLwLZDCY3tgHeAmSKdcw6R607LK4rtCzfw5lt2IHNmAjQ0ggqDlJGWsJAfGMe4iPA==" + "version": "4.92.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-styles/-/react-styles-4.92.6.tgz", + "integrity": "sha512-b8uQdEReMyeoMzjpMri845QxqtupY/tIFFYfVeKoB2neno8gkcW1RvDdDe62LF88q45OktCwAe/8A99ker10Iw==" }, "@patternfly/react-table": { - "version": "4.112.6", - "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.112.6.tgz", - "integrity": "sha512-PNyBF64bCX3QtctzUKl13ycsXCY6SIWlXYJbdxnpRtXNfQ+9y0G70s+RDO6jw3osLtcxA06NfyMz0vuaqevPaA==", - "requires": { - "@patternfly/react-core": "^4.267.6", - "@patternfly/react-icons": "^4.93.3", - "@patternfly/react-styles": "^4.92.3", - "@patternfly/react-tokens": "^4.94.3", + "version": "4.112.39", + "resolved": "https://registry.npmjs.org/@patternfly/react-table/-/react-table-4.112.39.tgz", + "integrity": "sha512-U+hOMgYlbghGH4M5MX+qt0GkVi/ocrGnxDnm11YiS3CtEGsd6Rr0NeqMmk0uoR46Od4Pr5tKuXxZhPP32sCL/w==", + "requires": { + "@patternfly/react-core": "^4.276.6", + "@patternfly/react-icons": "^4.93.6", + "@patternfly/react-styles": "^4.92.6", + "@patternfly/react-tokens": "^4.94.6", "lodash": "^4.17.19", "tslib": "^2.0.0" } }, "@patternfly/react-tokens": { - "version": "4.94.3", - "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.3.tgz", - "integrity": "sha512-Rq8RMJ/iu/nTDidEb/xQWUMXFW+W4MuoLBonTAFv/Bx8G3gFMHU2JGtv9R5SvAYU6Eux9EkjCG7h3xiLqwH3jg==" + "version": "4.94.6", + "resolved": "https://registry.npmjs.org/@patternfly/react-tokens/-/react-tokens-4.94.6.tgz", + "integrity": "sha512-tm7C6nat+uKMr1hrapis7hS3rN9cr41tpcCKhx6cod6FLU8KwF2Yt5KUxakhIOCEcE/M/EhXhAw/qejp8w0r7Q==" }, "@pmmmwh/react-refresh-webpack-plugin": { "version": "0.5.8", diff --git a/package.json b/package.json index ae1058584..bda327c46 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@data-driven-forms/react-form-renderer": "^3.16.5", "@patternfly/react-core": "^4.267.6", "@patternfly/react-icons": "^4.93.3", - "@patternfly/react-table": "^4.112.6", + "@patternfly/react-table": "^4.112.39", "@redhat-cloud-services/frontend-components": "3.9.27", "@redhat-cloud-services/frontend-components-notifications": "^3.2.12", "@redhat-cloud-services/frontend-components-remediations": "^3.2.8", diff --git a/src/App.scss b/src/App.scss index f568b435f..04b0f0a37 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,3 +1,8 @@ +// Importing Global Variables +@import "~@redhat-cloud-services/frontend-components-utilities/styles/_all"; +@import "~@redhat-cloud-services/frontend-components/index.css"; +@import "~@redhat-cloud-services/frontend-components-notifications/index.css"; + table.patchCompactInventory { .ins-composed-col { font-size: var(--pf-c-table--m-compact--FontSize); diff --git a/src/PresentationalComponents/StatusReports/AdvisoriesStatusReport.js b/src/PresentationalComponents/StatusReports/AdvisoriesStatusReport.js index b406d63ce..38b9c9864 100644 --- a/src/PresentationalComponents/StatusReports/AdvisoriesStatusReport.js +++ b/src/PresentationalComponents/StatusReports/AdvisoriesStatusReport.js @@ -82,14 +82,14 @@ const StatusCard = ({ advisory: { attributes, id } }) => ); const AdvisoriesStatusBar = () => { - const [advisories, setAdvisories] = React.useState({}); + const [advisories, setAdvisories] = React.useState([]); React.useEffect(async () => { setAdvisories( await fetchApplicableAdvisoriesApi({ limit: 4, sort: '-advisory_type_name,-applicable_systems' }) ); }, []); - return advisories.data && advisories.data.length && ( + return advisories.data && advisories.data.length && (
diff --git a/src/SmartComponents/Advisories/Advisories.js b/src/SmartComponents/Advisories/Advisories.js index e677e45be..8009022bc 100644 --- a/src/SmartComponents/Advisories/Advisories.js +++ b/src/SmartComponents/Advisories/Advisories.js @@ -125,7 +125,7 @@ const Advisories = ({ history }) => { return ( <React.Fragment> <Header title={intl.formatMessage(messages.titlesPatchAdvisories)} headerOUIA={'advisories'} /> - <AdvisoriesStatusReport/> + {metadata?.has_systems === true && <AdvisoriesStatusReport/>} <Main> <TableView columns={advisoriesColumns} diff --git a/src/SmartComponents/Advisories/Advisories.test.js b/src/SmartComponents/Advisories/Advisories.test.js index 508ff3059..e93ae6546 100644 --- a/src/SmartComponents/Advisories/Advisories.test.js +++ b/src/SmartComponents/Advisories/Advisories.test.js @@ -29,8 +29,7 @@ jest.mock('../../Utilities/api', () => ({ exportAdvisoriesCSV: jest.fn(() => Promise.resolve({ success: true }).catch((err) => console.log(err))), fetchSystems: jest.fn(() => Promise.resolve({ data: { id: 'testId' } }).catch((err) => console.log(err))), fetchViewAdvisoriesSystems: jest.fn(() => Promise.resolve({ success: true }).catch((err) => console.log(err))), - fetchIDs: jest.fn(() => Promise.resolve({ ids: [] }).catch((err) => console.log(err))), - fetchApplicableAdvisoriesApi: jest.fn(() => Promise.resolve({ success: true }).catch((err) => console.log(err))) + fetchIDs: jest.fn(() => Promise.resolve({ ids: [] }).catch((err) => console.log(err))) })); jest.mock('../../Utilities/constants', () => ({ diff --git a/src/Utilities.scss b/src/Utilities.scss new file mode 100644 index 000000000..45aaae589 --- /dev/null +++ b/src/Utilities.scss @@ -0,0 +1,3 @@ +// Sass Imports + +@import "~@redhat-cloud-services/frontend-components-utilities/styles/_all";