diff --git a/package-lock.json b/package-lock.json index 268a249b5..e20e72725 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "@cypress/code-coverage": "^3.10.0", "@cypress/react": "^6.2.0", "@formatjs/cli": "^3.0.5", - "@patternfly/patternfly": "^4.222.4", + "@patternfly/patternfly": "^4.224.2", "@redhat-cloud-services/frontend-components-config": "^4.7.0", "@rollup/plugin-commonjs": "^17.1.0", "@rollup/plugin-image": "^2.0.6", @@ -3796,9 +3796,9 @@ } }, "node_modules/@patternfly/patternfly": { - "version": "4.222.4", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.222.4.tgz", - "integrity": "sha512-+0fk4dzxEbWn+hgaOnR0BjfeUdEeVVrqfH7+GFeFc+RKjEMjIR/BZbWWN8YQDezmDv6A32gHmEKaY3Uwbt06Lw==", + "version": "4.224.2", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.224.2.tgz", + "integrity": "sha512-HGNV26uyHSIECuhjPg/WGn0mXbAotcs6ODfhAOkfYjIgGylddgiwElxUe1rpEHV5mQJJ2rMn4OdeJIIpzRX61g==", "dev": true }, "node_modules/@patternfly/react-core": { @@ -32572,9 +32572,9 @@ } }, "@patternfly/patternfly": { - "version": "4.222.4", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.222.4.tgz", - "integrity": "sha512-+0fk4dzxEbWn+hgaOnR0BjfeUdEeVVrqfH7+GFeFc+RKjEMjIR/BZbWWN8YQDezmDv6A32gHmEKaY3Uwbt06Lw==", + "version": "4.224.2", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.224.2.tgz", + "integrity": "sha512-HGNV26uyHSIECuhjPg/WGn0mXbAotcs6ODfhAOkfYjIgGylddgiwElxUe1rpEHV5mQJJ2rMn4OdeJIIpzRX61g==", "dev": true }, "@patternfly/react-core": { diff --git a/package.json b/package.json index d62f4df23..08a94b624 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@cypress/code-coverage": "^3.10.0", "@cypress/react": "^6.2.0", "@formatjs/cli": "^3.0.5", - "@patternfly/patternfly": "^4.222.4", + "@patternfly/patternfly": "^4.224.2", "@redhat-cloud-services/frontend-components-config": "^4.7.0", "@rollup/plugin-commonjs": "^17.1.0", "@rollup/plugin-image": "^2.0.6", diff --git a/src/App.scss b/src/App.scss index 04b0f0a37..f568b435f 100644 --- a/src/App.scss +++ b/src/App.scss @@ -1,8 +1,3 @@ -// 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 38b9c9864..b406d63ce 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 8009022bc..e677e45be 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'} /> - {metadata?.has_systems === true && <AdvisoriesStatusReport/>} + <AdvisoriesStatusReport/> <Main> <TableView columns={advisoriesColumns} diff --git a/src/SmartComponents/Advisories/Advisories.test.js b/src/SmartComponents/Advisories/Advisories.test.js index e93ae6546..508ff3059 100644 --- a/src/SmartComponents/Advisories/Advisories.test.js +++ b/src/SmartComponents/Advisories/Advisories.test.js @@ -29,7 +29,8 @@ 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))) + fetchIDs: jest.fn(() => Promise.resolve({ ids: [] }).catch((err) => console.log(err))), + fetchApplicableAdvisoriesApi: jest.fn(() => Promise.resolve({ success: true }).catch((err) => console.log(err))) })); jest.mock('../../Utilities/constants', () => ({ diff --git a/src/Utilities.scss b/src/Utilities.scss deleted file mode 100644 index 45aaae589..000000000 --- a/src/Utilities.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Sass Imports - -@import "~@redhat-cloud-services/frontend-components-utilities/styles/_all";