From 872e245e4d05c65297f12e7aef6f077ae798e57c Mon Sep 17 00:00:00 2001
From: DavidQuartz <quartzdavid@gmail.com>
Date: Wed, 20 Apr 2022 09:55:59 +0000
Subject: [PATCH 1/2] Moved to top

---
 .../js/components/FiltersForm/FiltersForm.jsx | 20 +++++++++----------
 .../themes/geonode/less/_filter-form.less     | 11 +++-------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/geonode_mapstore_client/client/js/components/FiltersForm/FiltersForm.jsx b/geonode_mapstore_client/client/js/components/FiltersForm/FiltersForm.jsx
index e225878725..5d994a28ea 100644
--- a/geonode_mapstore_client/client/js/components/FiltersForm/FiltersForm.jsx
+++ b/geonode_mapstore_client/client/js/components/FiltersForm/FiltersForm.jsx
@@ -57,7 +57,15 @@ function FilterForm({
         <div className="gn-filter-form" style={styleContainerForm} >
             <div className="gn-filter-form-header">
                 <div className="gn-filter-form-title">
-                    <FaIcon name="filter"/> <strong><Message msgId="gnhome.filters"/></strong>
+                    <div><FaIcon name="filter" /> <strong><Message msgId="gnhome.filters" /></strong></div>
+                    <Button
+                        size="sm"
+                        variant="default"
+                        onClick={onClear}
+                        disabled={isEmpty(query)}
+                    >
+                        <Message msgId="gnhome.clearFilters"/>
+                    </Button>
                 </div>
                 <Button
                     variant="default"
@@ -99,16 +107,6 @@ function FilterForm({
                     </form>
                 </div>
             </div>
-            <div className="gn-filter-form-footer">
-                <Button
-                    size="sm"
-                    variant="default"
-                    onClick={onClear}
-                    disabled={isEmpty(query)}
-                >
-                    <Message msgId="gnhome.clearFilters"/>
-                </Button>
-            </div>
         </div>
     );
 }
diff --git a/geonode_mapstore_client/client/themes/geonode/less/_filter-form.less b/geonode_mapstore_client/client/themes/geonode/less/_filter-form.less
index a08f96e246..b964ca187c 100644
--- a/geonode_mapstore_client/client/themes/geonode/less/_filter-form.less
+++ b/geonode_mapstore_client/client/themes/geonode/less/_filter-form.less
@@ -57,16 +57,11 @@
         }
     }
     .gn-filter-form-title {
-        flex: 1;
-        padding: 0 0.5rem;
-    }
-    .gn-filter-form-footer {
         display: flex;
-        flex-direction: row-reverse;
         align-items: center;
-        position: sticky;
-        bottom: 0;
-        padding: 0.5rem;
+        justify-content: space-between;
+        flex: 1;
+        padding: 0 0.5rem;
     }
     .gn-filter-form-divider {
         width: calc(100% - 0.5rem);

From 11faa99bfc44c8bb2328ac619153e856da7b72eb Mon Sep 17 00:00:00 2001
From: DavidQuartz <quartzdavid@gmail.com>
Date: Wed, 20 Apr 2022 10:07:24 +0000
Subject: [PATCH 2/2] fixed tests

---
 .../js/components/FiltersForm/__tests__/FiltersForm-test.jsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geonode_mapstore_client/client/js/components/FiltersForm/__tests__/FiltersForm-test.jsx b/geonode_mapstore_client/client/js/components/FiltersForm/__tests__/FiltersForm-test.jsx
index cbf83b079a..f4026e4657 100644
--- a/geonode_mapstore_client/client/js/components/FiltersForm/__tests__/FiltersForm-test.jsx
+++ b/geonode_mapstore_client/client/js/components/FiltersForm/__tests__/FiltersForm-test.jsx
@@ -39,7 +39,7 @@ describe('FiltersForm component', () => {
         ReactDOM.render( <FiltersForm show onClear={onClear} query={{ q: 'A' }} submitOnChangeField={false} />, document.getElementById("container"));
         const filterFormNode = document.querySelector('.gn-filter-form');
         expect(filterFormNode).toBeTruthy();
-        const footerButtons = filterFormNode.querySelectorAll('.gn-filter-form-footer > button');
+        const footerButtons = filterFormNode.querySelectorAll('.gn-filter-form-title > button');
         expect(footerButtons.length).toBe(1);
         const clearButton = footerButtons[0];
         Simulate.click(clearButton);
@@ -65,7 +65,7 @@ describe('FiltersForm component', () => {
         ReactDOM.render( <FiltersForm show  submitOnChangeField />, document.getElementById("container"));
         const filterFormNode = document.querySelector('.gn-filter-form');
         expect(filterFormNode).toBeTruthy();
-        const footerButtons = filterFormNode.querySelectorAll('.gn-filter-form-footer > button');
+        const footerButtons = filterFormNode.querySelectorAll('.gn-filter-form-title > button');
         expect(footerButtons.length).toBe(1);
 
     });