fix(RHICOMPL-1005): Address issues with more spaces in filter labels

Hyperkid123 · Oct 7, 2020 · 9ec2bbe · 9ec2bbe
1 parent dbbb71d
commit 9ec2bbe
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 10 deletions.
diff --git a/packages/inventory-compliance/src/Utilities/FilterBuilder.test.js b/packages/inventory-compliance/src/Utilities/FilterBuilder.test.js
@@ -19,7 +19,7 @@ const FILTER_CONFIGURATION = [
     },
     {
         type: conditionalFilterType.checkbox,
-        label: 'Compliance score',
+        label: 'Systems meeting compliance',
         filterString: (value) => {
             const scoreRange = value.split('-');
             return `compliance_score >= ${scoreRange[0]} and compliance_score <= ${scoreRange[1]}`;
@@ -59,16 +59,16 @@ describe('buildFilterString', () => {
             expect(filterBuilder.buildFilterString(testExampleState)).toMatchSnapshot();
         });
 
-        it('returns a filter for complianceStates', () => {
+        it('returns a filter for compliant', () => {
             const testExampleState = {
                 compliant: [ true ]
             };
             expect(filterBuilder.buildFilterString(testExampleState)).toMatchSnapshot();
         });
 
-        it('returns a filter for complianceStates', () => {
+        it('returns a filter for scores', () => {
             const testExampleState = {
-                compliancescore: [ '0-49', '50-69' ]
+                systemsmeetingcompliance: [ '0-49', '50-69' ]
             };
             expect(filterBuilder.buildFilterString(testExampleState)).toMatchSnapshot();
         });

diff --git a/packages/inventory-compliance/src/Utilities/FilterConfigBuilder.js b/packages/inventory-compliance/src/Utilities/FilterConfigBuilder.js
@@ -3,7 +3,7 @@ import FilterBuilder from './FilterBuilder';
 import ChipBuilder from './ChipBuilder';
 
 export const stringToId = (string) => (
-    string.replace(' ', '').toLowerCase()
+    string.split(' ').join('').toLowerCase()
 );
 
 class FilterConfigBuilder {
@@ -103,7 +103,7 @@ class FilterConfigBuilder {
     initialDefaultState = (defaultStates = {}) => {
         let initialState = {};
         this.config.forEach((filter) => {
-            const filterStateName = filter.label.replace(' ', '').toLowerCase();
+            const filterStateName = stringToId(filter.label);
             initialState[filterStateName] =
                 defaultStates[filterStateName] || this.defaultValueForFilter(filter);
         });

diff --git a/packages/inventory-compliance/src/Utilities/FilterConfigBuilder.test.js b/packages/inventory-compliance/src/Utilities/FilterConfigBuilder.test.js
@@ -1,8 +1,19 @@
 import buildFilterConfig from './FilterBuilderConfigBuilder';
 import FilterConfigBuilder from './FilterConfigBuilder';
+import { conditionalFilterType } from '@redhat-cloud-services/frontend-components';
 
 describe('FilterConfigBuilder', () => {
-    const config = buildFilterConfig({ selectedFilter: true, showPassFailFilter: true, policies: [] });
+    const config = [
+        {
+            type: conditionalFilterType.checkbox,
+            label: 'Filter with multiple spaces',
+            items: [
+                { label: 'Show ', value: 'show' }
+            ],
+            filter: () => ([])
+        },
+        ...buildFilterConfig({ selectedFilter: true, showPassFailFilter: true, policies: [] })
+    ];
     let builder;
 
     beforeEach(() => {
@@ -19,6 +30,11 @@ describe('FilterConfigBuilder', () => {
 
         expect(builtConfig).toMatchSnapshot();
     });
+    describe('initialDefaultState', () => {
+        it('to return a matching category label', () => {
+            expect(builder.initialDefaultState()).toMatchSnapshot();
+        });
+    });
 
     describe('categoryLabelForValue', () => {
         it('to return a matching category label', () => {

diff --git a/packages/inventory-compliance/src/Utilities/__snapshots__/FilterBuilder.test.js.snap b/packages/inventory-compliance/src/Utilities/__snapshots__/FilterBuilder.test.js.snap
@@ -2,8 +2,8 @@
 
 exports[`buildFilterString filter building returns a base filter for name when searching 1`] = `"name ~ Name"`;
 
-exports[`buildFilterString filter building returns a filter for complianceStates 1`] = `"compliant = true"`;
+exports[`buildFilterString filter building returns a filter for compliant 1`] = `"compliant = true"`;
 
-exports[`buildFilterString filter building returns a filter for complianceStates 2`] = `"compliance_score >= 0 and compliance_score <= 49 or compliance_score >= 50 and compliance_score <= 69"`;
+exports[`buildFilterString filter building returns a filter for scores 1`] = `"compliance_score >= 0 and compliance_score <= 49 or compliance_score >= 50 and compliance_score <= 69"`;
 
-exports[`buildFilterString returns a filterstring 1`] = `"name ~ Name and compliant = true and compliance_score >= 0 and compliance_score <= 49 or compliance_score >= 50 and compliance_score <= 69"`;
+exports[`buildFilterString returns a filterstring 1`] = `"name ~ Name and compliant = true"`;
diff --git a/packages/inventory-compliance/src/Utilities/__snapshots__/FilterConfigBuilder.test.js.snap b/packages/inventory-compliance/src/Utilities/__snapshots__/FilterConfigBuilder.test.js.snap
@@ -6,6 +6,16 @@ exports[`FilterConfigBuilder categoryLabelForValue to return a matching category
 
 exports[`FilterConfigBuilder categoryLabelForValue to return a matching category label 3`] = `"Search term"`;
 
+exports[`FilterConfigBuilder initialDefaultState to return a matching category label 1`] = `
+Object {
+  "filterwithmultiplespaces": Array [],
+  "name": "",
+  "passed": undefined,
+  "selected": Array [],
+  "severity": Array [],
+}
+`;
+
 exports[`FilterConfigBuilder labelForValue to return a matching label 1`] = `"true"`;
 
 exports[`FilterConfigBuilder labelForValue to return a matching label 2`] = `"0-49"`;
@@ -17,6 +27,21 @@ Object {
   "compliancescore": Array [],
   "compliant": Array [],
   "items": Array [
+    Object {
+      "filterValues": Object {
+        "items": Array [
+          Object {
+            "label": "Show ",
+            "value": "show",
+          },
+        ],
+        "onChange": [Function],
+        "value": undefined,
+      },
+      "id": "filterwithmultiplespaces",
+      "label": "Filter with multiple spaces",
+      "type": "checkbox",
+    },
     Object {
       "filterValues": Object {
         "onChange": [Function],