1- import { Tabs , TabPane } from 'Tabs' ;
21import Loader from 'Loader' ;
32import FilterableDataTable from 'FilterableDataTable' ;
43import React , { useEffect , useState } from 'react' ;
54
6- import { formatColumnUnresolved , unresolvedFilters }
7- from './unresolvedViolations.js' ;
8- import { formatColumnResolved , resolvedFilters }
9- from './resolvedViolations.js' ;
5+ import { formatColumn , violationFilters } from './violations.js' ;
106
117import ProtocolModal from './protocolModal.js' ;
128
@@ -20,10 +16,6 @@ import ProtocolModal from './protocolModal.js';
2016function MRIViolationsIndex ( props ) {
2117 const [ fieldOptions , setFieldOptions ] = useState ( { } ) ;
2218 const [ violationModal , setViolationModal ] = useState ( false ) ;
23- const tabs = [
24- { id : 'notresolved' , label : 'Not Resolved' } ,
25- { id : 'resolved' , label : 'Resolved' } ,
26- ] ;
2719
2820 const mapper = columnMapper ( fieldOptions ) ;
2921
@@ -35,33 +27,18 @@ function MRIViolationsIndex(props) {
3527
3628 return < div >
3729 { violationsModal }
38- < Tabs tabs = { tabs } defaultTab = "notresolved" updateURL = { true } >
39- < TabPane TabId = { tabs [ 0 ] . id } >
40- < ViolationsTable
41- URL = { props . unresolvedURL }
42- name = "notresolved"
43- mapper = { mapper }
44- formatter = { formatColumnUnresolved (
45- mapper ,
46- setViolationModal ,
47- props . ModuleURL + '/resolve'
48- ) }
49- fields = { unresolvedFilters ( fieldOptions ) }
50- setFieldOptions = { setFieldOptions }
51- noDynamicTable = { true }
52- />
53- </ TabPane >
54- < TabPane TabId = { tabs [ 1 ] . id } >
55- < ViolationsTable
56- URL = { props . resolvedURL }
57- name = "resolved"
58- formatter = { formatColumnResolved ( mapper , setViolationModal ) }
59- fields = { resolvedFilters ( fieldOptions ) }
60- mapper = { mapper }
61- noDynamicTable = { true }
62- />
63- </ TabPane >
64- </ Tabs >
30+ < ViolationsTable
31+ URL = { props . dataURL }
32+ name = "violations"
33+ mapper = { mapper }
34+ formatter = { formatColumn (
35+ mapper ,
36+ setViolationModal ,
37+ props . ModuleURL + '/resolve'
38+ ) }
39+ fields = { violationFilters ( fieldOptions ) }
40+ setFieldOptions = { setFieldOptions }
41+ />
6542 </ div > ;
6643}
6744
@@ -106,7 +83,6 @@ function ViolationsTable(props) {
10683 fields = { props . fields }
10784 getFormattedCell = { props . formatter }
10885 getMappedCell = { props . mapper }
109- noDynamicTable = { props . noDynamicTable }
11086 /> ;
11187}
11288
@@ -142,11 +118,8 @@ window.addEventListener('load', () => {
142118 root . render (
143119 < MRIViolationsIndex
144120 ModuleURL = { `${ loris . BaseURL } /mri_violations/` }
145- unresolvedURL = { `${ loris . BaseURL } /mri_violations/?format=json` }
146- resolvedURL = {
147- `${ loris . BaseURL } /mri_violations/resolved_violations?format=json`
148- }
149- />
121+ dataURL = { `${ loris . BaseURL } /mri_violations/?format=json` }
122+ /> ,
150123 ) ;
151124} ) ;
152125
0 commit comments