VULN-2103 fix: Refresh exposed systems on CVE status update (#1399)

RedHatInsights · Dec 2, 2021 · fbaaaf9 · fbaaaf9
1 parent d3abf90
commit fbaaaf9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/src/Components/SmartComponents/CVEDetailsPage/CVEDetailsPage.js b/src/Components/SmartComponents/CVEDetailsPage/CVEDetailsPage.js
@@ -26,6 +26,7 @@ export const CVEPageContext = React.createContext({ isLoading: true });
 
 const CVEDetailsPage = ({ match }) => {
     const dispatch = useDispatch();
+    const inventoryRef = React.createRef();
 
     const [[canEditPairStatus, canEditStatusOrBusinessRisk, canExport, canReadVulnerabilityResults], isRbacLoading] = useRbac([
         PERMISSIONS.setPairStatus,
@@ -48,6 +49,11 @@ const CVEDetailsPage = ({ match }) => {
         dispatch(fetchCveDetails(cveName));
     }, [dispatch, cveName]);
 
+    const refreshInventory = () => (
+        dispatch(clearInventoryStore()),
+        inventoryRef.current.onRefreshData(({ page: 1 }))
+    );
+
     const showBusinessRiskModal = cves => {
         setBusinessRisk(
             () => () =>
@@ -60,9 +66,9 @@ const CVEDetailsPage = ({ match }) => {
             () => () =>
                 <CveStatusModal
                     cves={cves}
-                    updateRef={() => {
+                    updateRef={overwriteSystemsStatus => {
                         dispatch(fetchCveDetails(cveName));
-                        dispatch(clearInventoryStore());
+                        overwriteSystemsStatus && refreshInventory();
                     }}
                 />
         );
@@ -148,6 +154,8 @@ const CVEDetailsPage = ({ match }) => {
                                 hasSecurityRule={rules?.length > 0}
                                 canEditPairStatus={canEditPairStatus}
                                 canExport={canExport}
+                                inventoryRef={inventoryRef}
+                                refreshInventory={refreshInventory}
                             />
                         ) :
                             <NotAuthorized />

diff --git a/src/Components/SmartComponents/CVEDetailsPage/CveDetailsPage.test.js b/src/Components/SmartComponents/CVEDetailsPage/CveDetailsPage.test.js
@@ -104,7 +104,7 @@ describe('CVE details:', () => {
             const statusModal = wrapper.find('CveStatusModal');
             expect(statusModal).toBeTruthy();
             act(() => statusModal.props().updateRef());
-            expect(store.getActions()[5].type).toEqual('CLEAR_INVENTORY_STORE');
+            expect(store.getActions()[4].type).toEqual('FETCH_CVE_DETAILS');
         });
     });
 

diff --git a/src/Components/SmartComponents/Modals/CveStatusModal.js b/src/Components/SmartComponents/Modals/CveStatusModal.js
@@ -34,7 +34,7 @@ export const CveStatusModal = ({ cves, updateRef, intl }) => {
                 })
             ]
         ])
-            .then(updateRef)
+            .then(() => updateRef(!checkboxState))
             .catch(error => { throw error; }); // propagate error to BaseModal
     };
 

diff --git a/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js b/src/Components/SmartComponents/SystemsExposedTable/SystemsExposedTable.js
@@ -35,9 +35,7 @@ import * as APIHelper from '../../../Helpers/APIHelper';
 import ColumnManagementModal from '../Modals/ColumnManagementModal';
 
 const SystemsExposedTable = ({ intl, cveName, cveStatusDetails, filterRuleValues,
-    hasSecurityRule, canEditPairStatus, canExport }) => {
-
-    const inventoryRef = React.createRef();
+    hasSecurityRule, canEditPairStatus, canExport, inventoryRef, refreshInventory }) => {
     const dispatch = useDispatch();
     const [StatusModal, setStatusModal] = useState(() => () => null);
     const [urlParameters, setUrlParams] = useUrlParams(SYSTEMS_EXPOSED_ALLOWED_PARAMS);
@@ -84,18 +82,13 @@ const SystemsExposedTable = ({ intl, cveName, cveStatusDetails, filterRuleValues
         );
     };
 
-    const onRefreshInventory = () => (
-        dispatch(clearInventoryStore()),
-        inventoryRef.current.onRefreshData(({ page: 1 }))
-    );
-
     const showStatusModal = (cves, inventories) => {
         setStatusModal(
             () => () =>
                 <CvePairStatusModal
                     cveList={cves}
                     updateRef={() => {
-                        onRefreshInventory();
+                        refreshInventory();
                         dispatch(fetchCveDetails(cveName));
                     }}
                     inventoryList={inventories}
@@ -222,7 +215,9 @@ SystemsExposedTable.propTypes = {
     filterRuleValues: propTypes.array,
     hasSecurityRule: propTypes.bool,
     canEditPairStatus: propTypes.bool,
-    canExport: propTypes.bool
+    canExport: propTypes.bool,
+    inventoryRef: propTypes.object,
+    refreshInventory: propTypes.func
 };
 
 export default injectIntl(
-Original file line number
+Diff line change
@@ Expand Up @@
                     })
                 ]
             ])
-                .then(updateRef)
+                .then(() => updateRef(!checkboxState))
                 .catch(error => { throw error; }); // propagate error to BaseModal
         };
@@ Expand Down @@