From e9fa0fa23bfa1fcaffa0411a81c0b62ba97c1f88 Mon Sep 17 00:00:00 2001
From: Herrera <eduardo.herrera@quartech.com>
Date: Wed, 12 Jun 2024 11:39:33 -0700
Subject: [PATCH] PSP-8183 : UI UX Clean Up - Filter Map - Moving Ownwership
 Flags to the Top

---
 .../AdvancedFilter/FilterContentForm.tsx      | 118 +++++++++---------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx
index d2c8566d1d..c73e9a2714 100644
--- a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/FilterContentForm.tsx
@@ -102,6 +102,65 @@ export const FilterContentForm: React.FC<React.PropsWithChildren<IFilterContentF
       <Form>
         <FormObserver onChange={onChange} />
         <LoadingBackdrop show={isLoading} parentScreen />
+        <Section header="Show Ownership" isCollapsable initiallyExpanded>
+          <SectionField label={null} contentWidth="12">
+            <Row>
+              <Col xs={1}>
+                <Check field="isCoreInventory" />
+              </Col>
+              <Col xs={1}>
+                <Image height={36} src={CoreInventoryPng} />
+              </Col>
+              <Col className="pl-5">
+                <StyledSpan className="mb-3">Core Inventory</StyledSpan>
+              </Col>
+            </Row>
+            <Row className="pt-4">
+              <Col xs={1}>
+                <Check field="isPropertyOfInterest" />
+              </Col>
+              <Col xs={1}>
+                <Image height={36} src={PropertyOfInterestPng} />
+              </Col>
+              <Col className="pl-5">
+                <StyledSpan className="mb-3">Property of Interest</StyledSpan>
+              </Col>
+            </Row>
+            <Row className="pt-4">
+              <Col xs={1}>
+                <Check field="isOtherInterest" />
+              </Col>
+              <Col xs={1}>
+                <Image height={36} src={OtherInterestPng} />
+              </Col>
+              <Col className="pl-5">
+                <StyledSpan className="mb-3">Other Interest</StyledSpan>
+              </Col>
+            </Row>
+            <Row className="pt-4">
+              <Col xs={1}>
+                <Check field="isDisposed" />
+              </Col>
+              <Col xs={1}>
+                <Image height={36} src={DisposedPng} />
+              </Col>
+              <Col className="pl-5">
+                <StyledSpan className="mb-3">Disposed</StyledSpan>
+              </Col>
+            </Row>
+            <Row className="pt-4">
+              <Col xs={1}>
+                <Check field="isRetired" />
+              </Col>
+              <Col xs={1}>
+                <Image height={36} src={RetiredPng} />
+              </Col>
+              <Col className="pl-5">
+                <StyledSpan className="mb-3">Retired</StyledSpan>
+              </Col>
+            </Row>
+          </SectionField>
+        </Section>
         <Section header="Project" isCollapsable initiallyExpanded>
           <SectionField label={null} contentWidth="12">
             <ProjectSelector field="projectPrediction" />
@@ -186,65 +245,6 @@ export const FilterContentForm: React.FC<React.PropsWithChildren<IFilterContentF
             />
           </SectionField>
         </Section>
-        <Section header="Show Ownership" isCollapsable initiallyExpanded>
-          <SectionField label={null} contentWidth="12">
-            <Row>
-              <Col xs={1}>
-                <Check field="isCoreInventory" />
-              </Col>
-              <Col xs={1}>
-                <Image height={36} src={CoreInventoryPng} />
-              </Col>
-              <Col className="pl-5">
-                <StyledSpan className="mb-3">Core Inventory</StyledSpan>
-              </Col>
-            </Row>
-            <Row className="pt-4">
-              <Col xs={1}>
-                <Check field="isPropertyOfInterest" />
-              </Col>
-              <Col xs={1}>
-                <Image height={36} src={PropertyOfInterestPng} />
-              </Col>
-              <Col className="pl-5">
-                <StyledSpan className="mb-3">Property of Interest</StyledSpan>
-              </Col>
-            </Row>
-            <Row className="pt-4">
-              <Col xs={1}>
-                <Check field="isOtherInterest" />
-              </Col>
-              <Col xs={1}>
-                <Image height={36} src={OtherInterestPng} />
-              </Col>
-              <Col className="pl-5">
-                <StyledSpan className="mb-3">Other Interest</StyledSpan>
-              </Col>
-            </Row>
-            <Row className="pt-4">
-              <Col xs={1}>
-                <Check field="isDisposed" />
-              </Col>
-              <Col xs={1}>
-                <Image height={36} src={DisposedPng} />
-              </Col>
-              <Col className="pl-5">
-                <StyledSpan className="mb-3">Disposed</StyledSpan>
-              </Col>
-            </Row>
-            <Row className="pt-4">
-              <Col xs={1}>
-                <Check field="isRetired" />
-              </Col>
-              <Col xs={1}>
-                <Image height={36} src={RetiredPng} />
-              </Col>
-              <Col className="pl-5">
-                <StyledSpan className="mb-3">Retired</StyledSpan>
-              </Col>
-            </Row>
-          </SectionField>
-        </Section>
       </Form>
     </Formik>
   );