From c0a1209695ea792c44771c4a73300df6c828b594 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Wed, 16 Sep 2020 11:28:12 -0700
Subject: [PATCH 1/4] Add clear mothod in advanced search, re #6542

---
 .../app/media/js/views/components/search/advanced-search.js   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arches/app/media/js/views/components/search/advanced-search.js b/arches/app/media/js/views/components/search/advanced-search.js
index c2c3785440a..7d3116eec1b 100644
--- a/arches/app/media/js/views/components/search/advanced-search.js
+++ b/arches/app/media/js/views/components/search/advanced-search.js
@@ -137,6 +137,10 @@ define([
                         }
                     }, this);
                 }
+            },
+
+            clear: function() {
+                this.filter.facets.removeAll();
             }
         }),
         template: { require: 'text!templates/views/components/search/advanced-search.htm' }

From c2933db24c968c28dcc47fcd21b0174aa57583c1 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Wed, 16 Sep 2020 11:50:00 -0700
Subject: [PATCH 2/4] Move the filter checking to search.js, re # 6542

---
 arches/app/media/js/views/search.js   | 10 ++++++++++
 arches/app/templates/views/search.htm |  7 +------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/arches/app/media/js/views/search.js b/arches/app/media/js/views/search.js
index c53d538abee..c1f1f6d7a49 100644
--- a/arches/app/media/js/views/search.js
+++ b/arches/app/media/js/views/search.js
@@ -67,6 +67,16 @@ define([
                 }
             }, this);
         };
+        this.filterApplied = ko.pureComputed(function(){
+            return (
+                this.query()['term-filter'] || 
+                this.query()['map-filter'] || 
+                this.query()['resource-type-filter'] ||
+                this.query()['time-filter'] ||
+                this.query()['provisional-filter'] ||
+                this.query()['advanced-search']
+            )
+        }, this);
         this.mouseoverInstanceId = ko.observable();
         this.mapLinkData = ko.observable(null);
         this.userIsReviewer = ko.observable(false);
diff --git a/arches/app/templates/views/search.htm b/arches/app/templates/views/search.htm
index 2e8624eb794..f66435fe36a 100644
--- a/arches/app/templates/views/search.htm
+++ b/arches/app/templates/views/search.htm
@@ -55,12 +55,7 @@
                 <!-- Title Block -->
                 <div class="search-count-container">
                     <h3 class="search-title" data-bind="text: '{% trans 'Results: ' %}' + total()"></h3>
-                    <!--ko if: 
-                        sharedStateObject.query()['term-filter'] || 
-                        sharedStateObject.query()['map-filter'] || 
-                        sharedStateObject.query()['resource-type-filter'] ||
-                        sharedStateObject.query()['time-filter']
-                    -->
+                    <!--ko if: sharedStateObject.filterApplied() -->
                     <button class="btn-sm btn btn-mint btn-labeled" style="padding: 2px 9px;" data-bind="click: function() {sharedStateObject.clearQuery();}">{% trans "Clear Filters" %}</button>
                     <!--/ko-->
                 </div>

From cb7a1b09cf54d3519ea02e2b2b3eda2b5c1427f8 Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Wed, 16 Sep 2020 14:33:58 -0700
Subject: [PATCH 3/4] Replace hard-coded filter list, re # 6542

---
 arches/app/media/js/views/search.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arches/app/media/js/views/search.js b/arches/app/media/js/views/search.js
index c1f1f6d7a49..7aa4c92af76 100644
--- a/arches/app/media/js/views/search.js
+++ b/arches/app/media/js/views/search.js
@@ -68,14 +68,14 @@ define([
             }, this);
         };
         this.filterApplied = ko.pureComputed(function(){
-            return (
-                this.query()['term-filter'] || 
-                this.query()['map-filter'] || 
-                this.query()['resource-type-filter'] ||
-                this.query()['time-filter'] ||
-                this.query()['provisional-filter'] ||
-                this.query()['advanced-search']
-            )
+            var notFilters = ['paging-filter', 'related-resources-filter', 'saved-searches', 'search-export', 'search-result-details', 'search-results'];
+            var trueFilters = Object.keys(this.filters).filter(function(f){
+                return notFilters.indexOf(f) === -1;
+            })
+            var res = trueFilters.filter(function(f){
+                return this.query()[f];
+            }, this)
+            return res.length > 0;
         }, this);
         this.mouseoverInstanceId = ko.observable();
         this.mapLinkData = ko.observable(null);

From 1034cca153501d9e8bf5392562eed842c2f2365c Mon Sep 17 00:00:00 2001
From: njkim <nkim@fargeo.com>
Date: Wed, 16 Sep 2020 16:35:44 -0700
Subject: [PATCH 4/4] Fix formatting, re#6542

---
 arches/app/media/js/views/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arches/app/media/js/views/search.js b/arches/app/media/js/views/search.js
index 7aa4c92af76..5ab864f418f 100644
--- a/arches/app/media/js/views/search.js
+++ b/arches/app/media/js/views/search.js
@@ -71,10 +71,10 @@ define([
             var notFilters = ['paging-filter', 'related-resources-filter', 'saved-searches', 'search-export', 'search-result-details', 'search-results'];
             var trueFilters = Object.keys(this.filters).filter(function(f){
                 return notFilters.indexOf(f) === -1;
-            })
+            });
             var res = trueFilters.filter(function(f){
                 return this.query()[f];
-            }, this)
+            }, this);
             return res.length > 0;
         }, this);
         this.mouseoverInstanceId = ko.observable();