diff --git a/package-lock.json b/package-lock.json index ed6b315e9..b55e5667c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@redhat-cloud-services/frontend-components-notifications": "^3.2.12", "@redhat-cloud-services/frontend-components-remediations": "^3.2.8", "@redhat-cloud-services/frontend-components-translations": "^3.2.5", - "@redhat-cloud-services/frontend-components-utilities": "^3.3.11", + "@redhat-cloud-services/frontend-components-utilities": "^3.3.12", "@redhat-cloud-services/host-inventory-client": "^1.0.111", "@scalprum/react-core": "^0.1.9", "@unleash/proxy-client-react": "^1.0.4", @@ -4559,9 +4559,9 @@ } }, "node_modules/@redhat-cloud-services/frontend-components-utilities": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.3.11.tgz", - "integrity": "sha512-0YiD0q3plgTte0m5V9UBUI+y5uabz2eDCem69FLUZU0oatauWWN6fIXwY3lrd7i3mh2GT021uFiYgKR16zGADQ==", + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.3.12.tgz", + "integrity": "sha512-kq1xQDbkBG5d71MdSz4ebSyJN3fsyl+D7JkASyFY55cqVO/9M/kISN8102jt1J/KLYITq0ZhTa38YQLZ2V2xIw==", "dependencies": { "@redhat-cloud-services/types": "^0.0.17", "@sentry/browser": "^5.30.0", @@ -4575,7 +4575,7 @@ "@patternfly/react-core": "^4.239.0", "@patternfly/react-table": "^4.108.0", "@redhat-cloud-services/rbac-client": "^1.0.100", - "cypress": ">=10.0.0 < 12.0.0", + "cypress": ">=10.0.0 < 13.0.0", "react": "^16.14.0 || ^17.0.0", "react-dom": "^16.14.0 || ^17.0.0", "react-redux": ">=7.0.0", @@ -33124,9 +33124,9 @@ } }, "@redhat-cloud-services/frontend-components-utilities": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.3.11.tgz", - "integrity": "sha512-0YiD0q3plgTte0m5V9UBUI+y5uabz2eDCem69FLUZU0oatauWWN6fIXwY3lrd7i3mh2GT021uFiYgKR16zGADQ==", + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.3.12.tgz", + "integrity": "sha512-kq1xQDbkBG5d71MdSz4ebSyJN3fsyl+D7JkASyFY55cqVO/9M/kISN8102jt1J/KLYITq0ZhTa38YQLZ2V2xIw==", "requires": { "@redhat-cloud-services/types": "^0.0.17", "@sentry/browser": "^5.30.0", diff --git a/package.json b/package.json index 611d58e42..ddeb696ae 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@redhat-cloud-services/frontend-components-notifications": "^3.2.12", "@redhat-cloud-services/frontend-components-remediations": "^3.2.8", "@redhat-cloud-services/frontend-components-translations": "^3.2.5", - "@redhat-cloud-services/frontend-components-utilities": "^3.3.11", + "@redhat-cloud-services/frontend-components-utilities": "^3.3.12", "@redhat-cloud-services/host-inventory-client": "^1.0.111", "@scalprum/react-core": "^0.1.9", "@unleash/proxy-client-react": "^1.0.4", 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";