From 5a615c5e938f420305c77cc5052da8a63a0a2c0f Mon Sep 17 00:00:00 2001 From: mkholjur Date: Mon, 20 Feb 2023 12:56:18 +0100 Subject: [PATCH 1/2] Revert "chore: do not wait advisories to display most impactfull statistics (#946)" This reverts commit c9dac6d3919658d9e99625d016d012a314c3535d. --- 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, 12 insertions(+), 5 deletions(-) create mode 100644 src/Utilities.scss 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"; From 4c06082e064d7b24880c1a05f70a39400beaad9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Mar 2023 17:58:24 +0000 Subject: [PATCH 2/2] chore(deps): bump @redhat-cloud-services/frontend-components-utilities Bumps [@redhat-cloud-services/frontend-components-utilities](https://github.com/RedHatInsights/frontend-components) from 3.3.11 to 3.3.13. - [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-utilities" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index b1ba90d38..1fcda4c8b 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.13", "@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.13", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.3.13.tgz", + "integrity": "sha512-3SdXwzXP1XMLN+hvlGZwX5Va3VwKW9xzRx9lgKGx2XU2nU3GF233hTeId5Cs58NZqBpf8NpRFYaBWnPBaXCWlQ==", "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.13", + "resolved": "https://registry.npmjs.org/@redhat-cloud-services/frontend-components-utilities/-/frontend-components-utilities-3.3.13.tgz", + "integrity": "sha512-3SdXwzXP1XMLN+hvlGZwX5Va3VwKW9xzRx9lgKGx2XU2nU3GF233hTeId5Cs58NZqBpf8NpRFYaBWnPBaXCWlQ==", "requires": { "@redhat-cloud-services/types": "^0.0.17", "@sentry/browser": "^5.30.0", diff --git a/package.json b/package.json index ae1058584..38a047b12 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.13", "@redhat-cloud-services/host-inventory-client": "^1.0.111", "@scalprum/react-core": "^0.1.9", "@unleash/proxy-client-react": "^1.0.4",