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 71236824089b3f8c7643b1ded37f0014e1435fcc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 17:07:06 +0000 Subject: [PATCH 2/2] chore(deps-dev): bump @redhat-cloud-services/frontend-components-config Bumps [@redhat-cloud-services/frontend-components-config](https://github.com/RedHatInsights/frontend-components) from 4.6.34 to 4.7.0. - [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-config" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index ed6b315e9..2d51a8075 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,7 +49,7 @@ "@cypress/react": "^6.2.0", "@formatjs/cli": "^3.0.5", "@patternfly/patternfly": "^4.222.4", - "@redhat-cloud-services/frontend-components-config": "^4.6.34", + "@redhat-cloud-services/frontend-components-config": "^4.7.0", "@rollup/plugin-commonjs": "^17.1.0", "@rollup/plugin-image": "^2.0.6", "@rollup/plugin-json": "^4.1.0", @@ -4024,13 +4024,13 @@ } }, "node_modules/@redhat-cloud-services/frontend-components-config": { - "version": "4.6.34", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-config/-/frontend-components-config-4.6.34.tgz", - "integrity": "sha512-cMRes0BZTUYkPaZVd1ix5q3Uvg7WPHvNXpVJ105mbJXl8f+bEJt+dKWbqD7MC/McEda89AyXIpF4+7oTpZvqqA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-config/-/frontend-components-config-4.7.0.tgz", + "integrity": "sha512-fC0TaCbvDLXAdm/RVks3wz3A8i0/5+Wkbi6bynaT3KnjM0T+lQkckG4xGLePKFpwcU45hcGWyrNK5y6pYS0Suw==", "dev": true, "dependencies": { "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8", - "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.24", + "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.28", "assert": "^2.0.0", "axios": "^0.27.2", "babel-loader": "^8.2.5", @@ -4073,9 +4073,9 @@ } }, "node_modules/@redhat-cloud-services/frontend-components-config-utilities": { - "version": "1.5.25", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-config-utilities/-/frontend-components-config-utilities-1.5.25.tgz", - "integrity": "sha512-bjviVgey6HpzbGqLNgS233qMClC38nwP1IQEMtkSyjD7Bxe1GOuPG5EHrbwkVCj22g4g7lh87UF6/fFuV8+Q+Q==", + "version": "1.5.28", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-config-utilities/-/frontend-components-config-utilities-1.5.28.tgz", + "integrity": "sha512-5gvXdcdpBKaOKFwgYJTdf4epEx95IM3TmON4HMe2TylE2mFecB6Da0vmSXtJhIAaA2HUJl8DEjFBlKQiYhlzDw==", "dev": true, "dependencies": { "node-fetch": "2.6.7" @@ -32712,13 +32712,13 @@ } }, "@redhat-cloud-services/frontend-components-config": { - "version": "4.6.34", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-config/-/frontend-components-config-4.6.34.tgz", - "integrity": "sha512-cMRes0BZTUYkPaZVd1ix5q3Uvg7WPHvNXpVJ105mbJXl8f+bEJt+dKWbqD7MC/McEda89AyXIpF4+7oTpZvqqA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-config/-/frontend-components-config-4.7.0.tgz", + "integrity": "sha512-fC0TaCbvDLXAdm/RVks3wz3A8i0/5+Wkbi6bynaT3KnjM0T+lQkckG4xGLePKFpwcU45hcGWyrNK5y6pYS0Suw==", "dev": true, "requires": { "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8", - "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.24", + "@redhat-cloud-services/frontend-components-config-utilities": "^1.5.28", "assert": "^2.0.0", "axios": "^0.27.2", "babel-loader": "^8.2.5", @@ -33041,9 +33041,9 @@ } }, "@redhat-cloud-services/frontend-components-config-utilities": { - "version": "1.5.25", - "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-config-utilities/-/frontend-components-config-utilities-1.5.25.tgz", - "integrity": "sha512-bjviVgey6HpzbGqLNgS233qMClC38nwP1IQEMtkSyjD7Bxe1GOuPG5EHrbwkVCj22g4g7lh87UF6/fFuV8+Q+Q==", + "version": "1.5.28", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-config-utilities/-/frontend-components-config-utilities-1.5.28.tgz", + "integrity": "sha512-5gvXdcdpBKaOKFwgYJTdf4epEx95IM3TmON4HMe2TylE2mFecB6Da0vmSXtJhIAaA2HUJl8DEjFBlKQiYhlzDw==", "dev": true, "requires": { "node-fetch": "2.6.7" diff --git a/package.json b/package.json index 611d58e42..9c6151ddc 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@cypress/react": "^6.2.0", "@formatjs/cli": "^3.0.5", "@patternfly/patternfly": "^4.222.4", - "@redhat-cloud-services/frontend-components-config": "^4.6.34", + "@redhat-cloud-services/frontend-components-config": "^4.7.0", "@rollup/plugin-commonjs": "^17.1.0", "@rollup/plugin-image": "^2.0.6", "@rollup/plugin-json": "^4.1.0",