From c4fc9c7f45f7ecd614273dfc0c793b25bd81a48f Mon Sep 17 00:00:00 2001 From: mkholjur Date: Wed, 11 Jan 2023 22:54:28 +0100 Subject: [PATCH 1/2] chore: do not wait advisories to display most impactfull statistics --- src/App.scss | 5 ----- .../StatusReports/AdvisoriesStatusReport.js | 4 ++-- src/SmartComponents/Advisories/Advisories.js | 2 +- src/SmartComponents/Advisories/Advisories.test.js | 3 ++- src/Utilities.scss | 3 --- 5 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 src/Utilities.scss 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"; From 8540effaf3412179c74c6424d7b4b5f96b60e6a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 17:02:20 +0000 Subject: [PATCH 2/2] chore(deps): bump @redhat-cloud-services/frontend-components Bumps [@redhat-cloud-services/frontend-components](https://github.com/RedHatInsights/frontend-components) from 3.9.27 to 3.9.29. - [Release notes](https://github.com/RedHatInsights/frontend-components/releases) - [Commits](https://github.com/RedHatInsights/frontend-components/commits) --- updated-dependencies: - dependency-name: "@redhat-cloud-services/frontend-components" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed6b315e9..f4593b5e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@patternfly/react-core": "^4.267.6", "@patternfly/react-icons": "^4.93.3", "@patternfly/react-table": "^4.112.6", - "@redhat-cloud-services/frontend-components": "3.9.27", + "@redhat-cloud-services/frontend-components": "3.9.29", "@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", @@ -3999,9 +3999,9 @@ "dev": true }, "node_modules/@redhat-cloud-services/frontend-components": { - "version": "3.9.27", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components/-/frontend-components-3.9.27.tgz", - "integrity": "sha512-3d2cnFiWbMsBQM92tXujoXvH45YKMROB1/IVQjgNG1c1hZZTJJwEjsqG/zKAuXVrjMmF1VQ0znHRsxJsCXAncQ==", + "version": "3.9.29", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components/-/frontend-components-3.9.29.tgz", + "integrity": "sha512-Jb7OC+b26aA5UhK3aPZmOmOIt504KZVCLBT+e5bNseGvmQZkldGVukpet5+F1Ueq47nCxOpgm5sRuEz/TidYUg==", "dependencies": { "@redhat-cloud-services/frontend-components-utilities": "^3.2.25", "@redhat-cloud-services/types": "^0.0.17", @@ -32684,9 +32684,9 @@ "dev": true }, "@redhat-cloud-services/frontend-components": { - "version": "3.9.27", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components/-/frontend-components-3.9.27.tgz", - "integrity": "sha512-3d2cnFiWbMsBQM92tXujoXvH45YKMROB1/IVQjgNG1c1hZZTJJwEjsqG/zKAuXVrjMmF1VQ0znHRsxJsCXAncQ==", + "version": "3.9.29", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components/-/frontend-components-3.9.29.tgz", + "integrity": "sha512-Jb7OC+b26aA5UhK3aPZmOmOIt504KZVCLBT+e5bNseGvmQZkldGVukpet5+F1Ueq47nCxOpgm5sRuEz/TidYUg==", "requires": { "@redhat-cloud-services/frontend-components-utilities": "^3.2.25", "@redhat-cloud-services/types": "^0.0.17", diff --git a/package.json b/package.json index 611d58e42..0a0c4f377 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@patternfly/react-core": "^4.267.6", "@patternfly/react-icons": "^4.93.3", "@patternfly/react-table": "^4.112.6", - "@redhat-cloud-services/frontend-components": "3.9.27", + "@redhat-cloud-services/frontend-components": "3.9.29", "@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",