removed tabs from mri violation module

remove noDynamicDataTable fix the filter not working for resolution status update test plan
aces · Feb 28, 2023 · 51e4662 · 51e4662
1 parent f245787
commit 51e4662
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 553 deletions.
diff --git a/modules/mri_violations/jsx/mriViolationsIndex.js b/modules/mri_violations/jsx/mriViolationsIndex.js
@@ -1,12 +1,8 @@
-import {Tabs, TabPane} from 'Tabs';
 import Loader from 'Loader';
 import FilterableDataTable from 'FilterableDataTable';
 import React, {useEffect, useState} from 'react';
 
-import {formatColumnUnresolved, unresolvedFilters}
-    from './unresolvedViolations.js';
-import {formatColumnResolved, resolvedFilters}
-    from './resolvedViolations.js';
+import {formatColumn, violationFilters} from './violations.js';
 
 import ProtocolModal from './protocolModal.js';
 
@@ -20,10 +16,6 @@ import ProtocolModal from './protocolModal.js';
 function MRIViolationsIndex(props) {
   const [fieldOptions, setFieldOptions] = useState({});
   const [violationModal, setViolationModal] = useState(false);
-  const tabs = [
-    {id: 'notresolved', label: 'Not Resolved'},
-    {id: 'resolved', label: 'Resolved'},
-  ];
 
   const mapper = columnMapper(fieldOptions);
 
@@ -35,33 +27,18 @@ function MRIViolationsIndex(props) {
 
   return <div>
       {violationsModal}
-      <Tabs tabs={tabs} defaultTab="notresolved" updateURL={true}>
-        <TabPane TabId={tabs[0].id}>
-          <ViolationsTable
-            URL={props.unresolvedURL}
-            name="notresolved"
-            mapper={mapper}
-            formatter={formatColumnUnresolved(
-              mapper,
-              setViolationModal,
-              props.ModuleURL + '/resolve'
-            )}
-            fields={unresolvedFilters(fieldOptions)}
-            setFieldOptions={setFieldOptions}
-            noDynamicTable={true}
-          />
-        </TabPane>
-        <TabPane TabId={tabs[1].id}>
-          <ViolationsTable
-            URL={props.resolvedURL}
-            name="resolved"
-            formatter={formatColumnResolved(mapper, setViolationModal)}
-            fields={resolvedFilters(fieldOptions)}
-            mapper={mapper}
-            noDynamicTable={true}
-          />
-        </TabPane>
-    </Tabs>
+      <ViolationsTable
+        URL={props.dataURL}
+        name="violations"
+        mapper={mapper}
+        formatter={formatColumn(
+          mapper,
+          setViolationModal,
+          props.ModuleURL + '/resolve'
+        )}
+        fields={violationFilters(fieldOptions)}
+        setFieldOptions={setFieldOptions}
+      />
   </div>;
 }
 
@@ -106,7 +83,6 @@ function ViolationsTable(props) {
           fields={props.fields}
           getFormattedCell={props.formatter}
           getMappedCell={props.mapper}
-          noDynamicTable={props.noDynamicTable}
         />;
 }
 
@@ -142,11 +118,8 @@ window.addEventListener('load', () => {
   root.render(
     <MRIViolationsIndex
       ModuleURL={`${loris.BaseURL}/mri_violations/`}
-      unresolvedURL={`${loris.BaseURL}/mri_violations/?format=json`}
-      resolvedURL={
-        `${loris.BaseURL}/mri_violations/resolved_violations?format=json`
-      }
-    />
+      dataURL={`${loris.BaseURL}/mri_violations/?format=json`}
+    />,
   );
 });
 
diff --git a/modules/mri_violations/jsx/resolvedViolations.js b/modules/mri_violations/jsx/resolvedViolations.js