Merge 1034cca into dcdfd95

archesproject · Sep 16, 2020 · 0de9c03 · 0de9c03
2 parents dcdfd95 + 1034cca
commit 0de9c03
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git 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' }

diff --git 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(){
+            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);
         this.userIsReviewer = ko.observable(false);

diff --git 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>