From beaa8f7e702389d0ae2807231f03ae7d0fbf20d3 Mon Sep 17 00:00:00 2001 From: Galen Date: Tue, 13 Aug 2024 16:31:03 -0700 Subject: [PATCH] rm redundant getFilter from base-search-view; add unwrap arg in getFilter re #10804 --- .../media/js/views/components/search/base-search-view.js | 4 ---- arches/app/media/js/views/search.js | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arches/app/media/js/views/components/search/base-search-view.js b/arches/app/media/js/views/components/search/base-search-view.js index a6c4c0e91e8..ee5d1e2bdb8 100644 --- a/arches/app/media/js/views/components/search/base-search-view.js +++ b/arches/app/media/js/views/components/search/base-search-view.js @@ -88,10 +88,6 @@ define([ }); }, - getFilter: function(filterName) { - return ko.unwrap(this.searchFilterVms[filterName]); - }, - clearQuery: function(){ Object.values(this.searchFilterVms).forEach(function(value){ if (value()){ diff --git a/arches/app/media/js/views/search.js b/arches/app/media/js/views/search.js index 4795bf2674b..3b310c23398 100644 --- a/arches/app/media/js/views/search.js +++ b/arches/app/media/js/views/search.js @@ -47,8 +47,10 @@ define([ this.searchFilterConfigs = Object.values(SearchComponents); this.defaultSearchViewConfig = this.searchFilterConfigs.find(filter => filter.type == "search-view"); this.searchViewComponentName = ko.observable(false); - this.getFilter = function(filterName) { - return ko.unwrap(this.searchFilterVms[filterName]); + this.getFilter = function(filterName, unwrap=true) { + if (unwrap) + return ko.unwrap(this.searchFilterVms[filterName]); + return this.searchFilterVms[filterName]; }; this.getFilterByType = function(type, unwrap=true) { const filter = this.searchFilterConfigs.find(component => component.type == type);