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' } diff --git a/arches/app/media/js/views/search.js b/arches/app/media/js/views/search.js index c53d538abee..5ab864f418f 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(){ + 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 index 2e8624eb794..f66435fe36a 100644 --- a/arches/app/templates/views/search.htm +++ b/arches/app/templates/views/search.htm @@ -55,12 +55,7 @@

- +