feat(RulesTable): RHICOMPL-1549 remediationAvailableFilter

Add a filter to the rules table for rules with remediations available. When remediationsEnabled, this filter will also be enabled. Signed-off-by: Andrew Kofink <akofink@redhat.com>
Hyperkid123 · Mar 25, 2021 · d29c69f · d29c69f
1 parent 30a83ef
commit d29c69f
Show file tree

Hide file tree

Showing 5 changed files with 206 additions and 11 deletions.
diff --git a/packages/inventory-compliance/src/Fixtures/Fixtures.js b/packages/inventory-compliance/src/Fixtures/Fixtures.js
diff --git a/packages/inventory-compliance/src/SystemRulesTable/SystemRulesTable.js b/packages/inventory-compliance/src/SystemRulesTable/SystemRulesTable.js
@@ -29,8 +29,11 @@ export const selectColumns = (columnTitles) => (
 );
 
 class SystemRulesTable extends React.Component {
+    remediationAvailableFilter = this.props.remediationAvailableFilter || this.props.remediationsEnabled;
+
     config = buildFilterConfig({
         selectedFilter: this.props.selectedFilter,
+        remediationAvailableFilter: this.remediationAvailableFilter,
         showPassFailFilter: (this.props.columns.filter((c) => (c.title === 'Passed')).length > 0)
     });
     filterConfigBuilder = new FilterConfigBuilder(this.config);
@@ -47,7 +50,8 @@ class SystemRulesTable extends React.Component {
         openIds: [],
         activeFilters: this.filterConfigBuilder.initialDefaultState({
             selected: this.props.selectedFilter ? [ 'selected' ] : undefined,
-            passed: this.props.hidePassed ? 'failed' : undefined
+            passed: this.props.hidePassed ? 'failed' : undefined,
+            remediationAvailable: this.remediationAvailableFilter ? 'true' : undefined
         })
     };
 
@@ -403,6 +407,7 @@ SystemRulesTable.propTypes = {
     tailoringEnabled: propTypes.bool,
     selectedRefIds: propTypes.array,
     selectedFilter: propTypes.bool,
+    remediationAvailableFilter: propTypes.bool,
     handleSelect: propTypes.func,
     columns: propTypes.arrayOf(
         propTypes.shape(
@@ -419,6 +424,7 @@ SystemRulesTable.defaultProps = {
     profileRules: [{ rules: [] }],
     hidePassed: false,
     selectedFilter: false,
+    remediationAvailableFilter: false,
     remediationsEnabled: true,
     tailoringEnabled: false,
     selectedRefIds: [],

diff --git a/packages/inventory-compliance/src/SystemRulesTable/SystemRulesTable.test.js b/packages/inventory-compliance/src/SystemRulesTable/SystemRulesTable.test.js
@@ -105,6 +105,23 @@ describe('SystemRulesTable component', () => {
         expect(instance.getRules().length).toEqual(1);
     });
 
+    it('should render filtered rows by remediationAvailable', async () => {
+        const wrapper = shallow(
+            <SystemRulesTable
+                profileRules={ profileRules }
+                remediationAvailableFilter
+                loading={ false }
+                system={ system }
+                itemsPerPage={ 100 }
+                columns={ columns }
+            />
+        );
+        const instance = wrapper.instance();
+        expect(instance.getRules().length).toEqual(52);
+        await instance.onFilterUpdate('remediationAvailable', [ 'true' ]);
+        expect(instance.getRules().length).toEqual(3);
+    });
+
     it('should render filtered rows by severity', async () => {
         const wrapper = shallow(
             <SystemRulesTable

diff --git a/...ges/inventory-compliance/src/SystemRulesTable/__snapshots__/SystemRulesTable.test.js.snap b/...ges/inventory-compliance/src/SystemRulesTable/__snapshots__/SystemRulesTable.test.js.snap
@@ -116,6 +116,22 @@ exports[`SystemRulesTable component should render 1`] = `
             "placeholder": "Filter by passed",
             "type": "radio",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }
@@ -1304,6 +1320,22 @@ exports[`SystemRulesTable component should render filtered and search mixed resu
             "placeholder": "Filter by passed",
             "type": "radio",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }
@@ -1677,6 +1709,22 @@ exports[`SystemRulesTable component should render search results by rule name 1`
             "placeholder": "Filter by passed",
             "type": "radio",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }
@@ -2104,6 +2152,22 @@ exports[`SystemRulesTable component should render search results on any page, re
             "placeholder": "Filter by passed",
             "type": "radio",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }
@@ -2522,6 +2586,22 @@ exports[`SystemRulesTable component should render sorted rows 1`] = `
             "placeholder": "Filter by passed",
             "type": "radio",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }
@@ -3618,6 +3698,22 @@ exports[`SystemRulesTable component should render sorted rows 2`] = `
             "placeholder": "Filter by passed",
             "type": "radio",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }
@@ -4014,7 +4110,12 @@ exports[`SystemRulesTable component should render sorted rows 2`] = `
               />,
             },
             Object {
-              "title": "No",
+              "title": <CheckCircleIcon
+                className="ins-u-passed"
+                color="currentColor"
+                noVerticalAlign={false}
+                size="sm"
+              />,
             },
           ],
           "isOpen": false,
@@ -4046,7 +4147,7 @@ exports[`SystemRulesTable component should render sorted rows 2`] = `
                     "rationale": "The atd service could be used by an unsophisticated insider to carry out activities outside of a normal login session, which could complicate accountability. Furthermore, the need to schedule tasks with at or batch is not common.",
                     "refId": "xccdf_org.ssgproject.content_rule_service_atd_disabled",
                     "references": Array [],
-                    "remediationAvailable": false,
+                    "remediationAvailable": true,
                     "rowKey": "xccdf_org.ssgproject.content_rule_service_atd_disabled-xccdf_org.ssgproject.content_profile_pci-dss",
                     "severity": "medium",
                     "title": "Disable At Service (atd)",
@@ -4088,7 +4189,12 @@ exports[`SystemRulesTable component should render sorted rows 2`] = `
               />,
             },
             Object {
-              "title": "No",
+              "title": <CheckCircleIcon
+                className="ins-u-passed"
+                color="currentColor"
+                noVerticalAlign={false}
+                size="sm"
+              />,
             },
           ],
           "isOpen": false,
@@ -4120,7 +4226,7 @@ exports[`SystemRulesTable component should render sorted rows 2`] = `
                     "rationale": "Mishandling crash data could expose sensitive information about vulnerabilities in software executing on the system, as well as sensitive information from within a process's address space or registers.",
                     "refId": "xccdf_org.ssgproject.content_rule_service_abrtd_disabled",
                     "references": Array [],
-                    "remediationAvailable": false,
+                    "remediationAvailable": true,
                     "rowKey": "xccdf_org.ssgproject.content_rule_service_abrtd_disabled-xccdf_org.ssgproject.content_profile_pci-dss",
                     "severity": "medium",
                     "title": "Disable Automatic Bug Reporting Tool (abrtd)",
@@ -4310,7 +4416,12 @@ exports[`SystemRulesTable component should render sorted rows 2`] = `
               />,
             },
             Object {
-              "title": "No",
+              "title": <CheckCircleIcon
+                className="ins-u-passed"
+                color="currentColor"
+                noVerticalAlign={false}
+                size="sm"
+              />,
             },
           ],
           "isOpen": false,
@@ -4342,7 +4453,7 @@ exports[`SystemRulesTable component should render sorted rows 2`] = `
                     "rationale": "The oddjobd service may provide necessary functionality in some environments, and can be disabled if it is not needed. Execution of tasks by privileged programs, on behalf of unprivileged ones, has traditionally been a source of privilege escalation security issues.",
                     "refId": "xccdf_org.ssgproject.content_rule_service_oddjobd_disabled",
                     "references": Array [],
-                    "remediationAvailable": false,
+                    "remediationAvailable": true,
                     "rowKey": "xccdf_org.ssgproject.content_rule_service_oddjobd_disabled-xccdf_org.ssgproject.content_profile_pci-dss",
                     "severity": "medium",
                     "title": "Disable Odd Job Daemon (oddjobd)",
@@ -5747,6 +5858,22 @@ exports[`SystemRulesTable component tailoring rules should be able to filter by
             "placeholder": "Filter by selected",
             "type": "checkbox",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }
@@ -6072,6 +6199,22 @@ exports[`SystemRulesTable component tailoring rules should be able to filter by
             "placeholder": "Filter by selected",
             "type": "checkbox",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }
@@ -7030,6 +7173,22 @@ exports[`SystemRulesTable component tailoring rules should be able to show all s
             "placeholder": "Filter by selected",
             "type": "checkbox",
           },
+          Object {
+            "filterValues": Object {
+              "items": Array [
+                Object {
+                  "label": "Remediation available",
+                  "value": "true",
+                },
+              ],
+              "onChange": [Function],
+              "value": Array [],
+            },
+            "id": "remediationavailable",
+            "label": "Remediation available",
+            "placeholder": "Filter by remediation available",
+            "type": "checkbox",
+          },
         ],
       }
     }

diff --git a/packages/inventory-compliance/src/Utilities/FilterBuilderConfigBuilder.js b/packages/inventory-compliance/src/Utilities/FilterBuilderConfigBuilder.js
@@ -76,7 +76,16 @@ export const POLICIES_FILTER_CONFIG = (policies) => ({
     ))
 });
 
-const buildFilterConfig = ({ showPassFailFilter, policies, selectedFilter }) => {
+export const REMEDIATION_AVAILABLE_FILTER_CONFIG = {
+    type: conditionalFilterType.checkbox,
+    label: 'Remediation available',
+    items: [
+        { label: 'Remediation available', value: 'true' }
+    ],
+    filter: (rules, value) => rules.filter(rule => rule.remediationAvailable)
+};
+
+const buildFilterConfig = ({ showPassFailFilter, policies, selectedFilter, remediationAvailableFilter }) => {
     const config = [ ...BASE_FILTER_CONFIGURATION ];
 
     if (showPassFailFilter) {
@@ -91,6 +100,10 @@ const buildFilterConfig = ({ showPassFailFilter, policies, selectedFilter }) =>
         config.push(POLICIES_FILTER_CONFIG(policies));
     }
 
+    if (remediationAvailableFilter) {
+        config.push(REMEDIATION_AVAILABLE_FILTER_CONFIG);
+    }
+
     return config;
 };