Remove mapping options

Author: jbflo

Diff for: ui/src/containers/SampleListViewContainer.jsx

@@ -93,31 +93,6 @@ export default function SampleListViewContainer() {
     displayTaskForm('AddSample');
   }
 
-  /**
-   * Mapping between a input and a filter option value
-   *
-   * @param {string} id - id of input in DOM
-   * @return {?} the value for the input
-   */
-  function getFilterOptionValue(id) {
-    let value = false;
-
-    const optionMap = {
-      inQueue: filterOptions.inQueue,
-      notInQueue: filterOptions.notInQueue,
-      collected: filterOptions.collected,
-      notCollected: filterOptions.notCollected,
-      limsSamples: filterOptions.limsSamples,
-      text: filterOptions.text,
-      cellFilter: filterOptions.cellFilter,
-      puckFilter: filterOptions.puckFilter,
-    };
-
-    value = optionMap[id];
-
-    return value;
-  }
-
   function getCellFilterOptions() {
     let options = [];
 
@@ -390,7 +365,14 @@ export default function SampleListViewContainer() {
       limsSamples: { limsSamples: e.target.checked },
       text: { text: e.target.value.trim() },
     };
-    dispatch(filterAction(optionMap[e.target.id]));
+
+    let filterValue = e.target.value.trim();
+    if (e.target.type === 'checkbox') {
+      filterValue = e.target.checked;
+    }
+    debugger;
+
+    dispatch(filterAction([e.target.id]));
     if (Number(e.target.value) > 2) {
       window.scroll({
         top: 1,
@@ -669,7 +651,7 @@ export default function SampleListViewContainer() {
             <Col sm="6">
               <Form.Select
                 id="cellFilter"
-                value={getFilterOptionValue('cellFilter')}
+                value={filterOptions.cellFilter}
                 onChange={sampleGridFilter}
               >
                 {getCellFilterOptions()}
@@ -688,7 +670,7 @@ export default function SampleListViewContainer() {
             <Col sm="6">
               <Form.Select
                 id="puckFilter"
-                value={getFilterOptionValue('puckFilter')}
+                value={filterOptions.puckFilter}
                 onChange={sampleGridFilter}
               >
                 {getPuckFilterOptions()}
@@ -701,7 +683,7 @@ export default function SampleListViewContainer() {
                 type="checkbox"
                 id="inQueue"
                 inline
-                checked={getFilterOptionValue('inQueue')}
+                checked={filterOptions.inQueue}
                 onChange={sampleGridFilter}
                 label="In Queue"
               />
@@ -711,7 +693,7 @@ export default function SampleListViewContainer() {
                 type="checkbox"
                 inline
                 id="notInQueue"
-                checked={getFilterOptionValue('notInQueue')}
+                checked={filterOptions.notInQueue}
                 onChange={sampleGridFilter}
                 label="Not in Queue"
               />
@@ -723,7 +705,7 @@ export default function SampleListViewContainer() {
                 type="checkbox"
                 inline
                 id="collected"
-                checked={getFilterOptionValue('collected')}
+                checked={filterOptions.collected}
                 onChange={sampleGridFilter}
                 label="Collected"
               />
@@ -733,7 +715,7 @@ export default function SampleListViewContainer() {
                 type="checkbox"
                 inline
                 id="notCollected"
-                checked={getFilterOptionValue('notCollected')}
+                checked={filterOptions.notCollected}
                 onChange={() => sampleGridFilter()}
                 label="Not Collected"
               />
@@ -745,7 +727,7 @@ export default function SampleListViewContainer() {
                 type="checkbox"
                 inline
                 id="limsSamples"
-                checked={getFilterOptionValue('limsSamples')}
+                checked={filterOptions.limsSamples}
                 onChange={sampleGridFilter}
                 label="LIMS Samples"
               />
@@ -860,7 +842,7 @@ export default function SampleListViewContainer() {
                         style={{ borderColor: '#CCC' }}
                         id="text"
                         type="text"
-                        value={getFilterOptionValue('text')}
+                        value={filterOptions.text}
                         onChange={sampleGridFilter}
                       />
                       {innerSearchIcon()}