Merge pull request #273 from KPMP/KPMP-5571_CombineFilters

KPMP-5571: Minor tweaks from QA
KPMP · Nov 1, 2024 · 67b29e5 · 67b29e5
2 parents 944ca0f + 0527b29
commit 67b29e5
Showing 1 changed file with 26 additions and 25 deletions.
diff --git a/src/components/SpatialViewer/Facets/AllFacets.js b/src/components/SpatialViewer/Facets/AllFacets.js
@@ -15,53 +15,54 @@ class AllFacets extends Component {
         return (
             <Container id="spatial-filter" className="mt-3 rounded border shadow-sm spatial-filter-panel container-max">
                 <Row className='mb-2'><Col><Facet field="releaseversion" filterType="any" label="" show="1" view={MultiCheckboxFacet}/></Col></Row>
-                <UncontrolledAccordion defaultOpen={['1', '2', '3', '4']} stayOpen>
+                <UncontrolledAccordion defaultOpen={['1']} stayOpen>
                 <AccordionItem>
-                    <AccordionHeader targetId='1'>
-                            Experimental Strategy
+                        <AccordionHeader targetId='1'>
+                            Participant ID
                         </AccordionHeader>
                         <AccordionBody accordionId="1">
-                            <Row className="mb-2">
+                            <Row className='mb-2'>
                                 <Col>
-                                    <Facet field="datatype" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>
+                                    <Facet inputProps={{placeholder: "placeholder"}}
+                                        isFilterable={true} field="redcapid"
+                                        label=""
+                                        filterType="any"
+                                        view={(props) => <MultiCheckboxFacet {...props}
+                                                                                searchPlaceholder={"Search..."}/>}/>
                                 </Col>
                             </Row>
                         </AccordionBody>
                     </AccordionItem>
-                    <AccordionItem>
-                        <AccordionHeader targetId="2">
-                            Image Type
+                <AccordionItem>
+                    <AccordionHeader targetId='2'>
+                            Experimental Strategy
                         </AccordionHeader>
                         <AccordionBody accordionId="2">
                             <Row className="mb-2">
                                 <Col>
-                                    <Facet field="imagetype" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>
+                                    <Facet field="datatype" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>
                                 </Col>
                             </Row>
                         </AccordionBody>
                     </AccordionItem>
                     <AccordionItem>
-                        <AccordionHeader targetId='1'>
-                            Participant ID
+                        <AccordionHeader targetId="3">
+                            Image Type
                         </AccordionHeader>
-                        <AccordionBody accordionId="1">
-                            <Row className='mb-2'>
+                        <AccordionBody accordionId="3">
+                            <Row className="mb-2">
                                 <Col>
-                                    <Facet inputProps={{placeholder: "placeholder"}}
-                                        isFilterable={true} field="redcapid"
-                                        label=""
-                                        filterType="any"
-                                        view={(props) => <MultiCheckboxFacet {...props}
-                                                                                searchPlaceholder={"Search..."}/>}/>
+                                    <Facet field="imagetype" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>
                                 </Col>
                             </Row>
                         </AccordionBody>
                     </AccordionItem>
+
                     <AccordionItem>
-                        <AccordionHeader targetId="2">
+                        <AccordionHeader targetId="4">
                             Sex
                         </AccordionHeader>
-                        <AccordionBody accordionId="2">
+                        <AccordionBody accordionId="4">
                             <Row className="mb-2">
                                 <Col>
                                     <Facet field="sex" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>
@@ -70,10 +71,10 @@ class AllFacets extends Component {
                         </AccordionBody>
                     </AccordionItem>
                     <AccordionItem>
-                        <AccordionHeader targetId="3">
+                        <AccordionHeader targetId="5">
                             Age
                         </AccordionHeader>
-                        <AccordionBody accordionId="3">
+                        <AccordionBody accordionId="5">
                             <Row className="mb-2">
                                 <Col>
                                     <Facet field="age" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>
@@ -82,10 +83,10 @@ class AllFacets extends Component {
                         </AccordionBody>
                     </AccordionItem>
                     <AccordionItem>
-                        <AccordionHeader targetId="4">
+                        <AccordionHeader targetId="6">
                             Enrollment Category
                         </AccordionHeader>
-                        <AccordionBody accordionId="4">
+                        <AccordionBody accordionId="6">
                             <Row className="mb-2">
                                 <Col>
                                     <Facet field="tissuetype" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>