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 0e7bdef6180..8ba012a3d57 100644 --- a/arches/app/media/js/views/components/search/advanced-search.js +++ b/arches/app/media/js/views/components/search/advanced-search.js @@ -179,7 +179,7 @@ define([ options.loading(false); }); - this.filters[componentName](this); + this.searchComponentVms[componentName](this); }, updateQuery: function() { diff --git a/arches/app/media/js/views/components/search/base-filter.js b/arches/app/media/js/views/components/search/base-filter.js index 0b41be3cc78..0255e49112c 100644 --- a/arches/app/media/js/views/components/search/base-filter.js +++ b/arches/app/media/js/views/components/search/base-filter.js @@ -18,7 +18,7 @@ define([ this.requiredFilters = this.getRequiredFilters(this.componentName); this.requiredFiltersLoaded = ko.computed(function() { let res = true; - Object.entries(this.filters).forEach(function([componentName, filter]) { + Object.entries(this.searchComponentVms).forEach(function([componentName, filter]) { res = res && filter !== null; }); return res; @@ -27,7 +27,7 @@ define([ getFilter: function(filterName) { - return ko.unwrap(this.filters[filterName]); + return ko.unwrap(this.searchComponentVms[filterName]); } }); }); diff --git a/arches/app/media/js/views/components/search/base-search-logic.js b/arches/app/media/js/views/components/search/base-search-logic.js index 44b58264c53..a9603b21004 100644 --- a/arches/app/media/js/views/components/search/base-search-logic.js +++ b/arches/app/media/js/views/components/search/base-search-logic.js @@ -20,7 +20,7 @@ define([ this.requiredFilters = this.getRequiredFilters(this.componentName); this.requiredFiltersLoaded = ko.computed(function() { let res = true; - Object.entries(this.filters).forEach(function([componentName, filter]) { + Object.entries(this.searchComponentVms).forEach(function([componentName, filter]) { res = res && filter !== null; }); return res; @@ -99,11 +99,11 @@ define([ }, getFilter: function(filterName) { - return ko.unwrap(this.filters[filterName]); + return ko.unwrap(this.searchComponentVms[filterName]); }, clearQuery: function(){ - Object.values(this.filters).forEach(function(value){ + Object.values(this.searchComponentVms).forEach(function(value){ if (value()){ if (value().clear){ value().clear(); diff --git a/arches/app/media/js/views/components/search/map-filter.js b/arches/app/media/js/views/components/search/map-filter.js index 1e6f986f632..386c714264c 100644 --- a/arches/app/media/js/views/components/search/map-filter.js +++ b/arches/app/media/js/views/components/search/map-filter.js @@ -338,7 +338,7 @@ define([ updateSearchResultPointLayer(); }; - this.filters[componentName](this); + this.searchComponentVms[componentName](this); this.map.subscribe(function(){ this.setupDraw(); this.restoreState(); diff --git a/arches/app/media/js/views/components/search/paging-filter.js b/arches/app/media/js/views/components/search/paging-filter.js index a3363211f4a..9163dd5084f 100644 --- a/arches/app/media/js/views/components/search/paging-filter.js +++ b/arches/app/media/js/views/components/search/paging-filter.js @@ -46,7 +46,7 @@ define([ this.updateResults(); }, this); - this.filters[componentName](this); + this.searchComponentVms[componentName](this); this.restoreState(); this.pageInitialized = true; }, diff --git a/arches/app/media/js/views/components/search/provisional-filter.js b/arches/app/media/js/views/components/search/provisional-filter.js index be656d9991f..598ea49a7c3 100644 --- a/arches/app/media/js/views/components/search/provisional-filter.js +++ b/arches/app/media/js/views/components/search/provisional-filter.js @@ -29,7 +29,7 @@ define([ this.updateQuery(); }, this); - this.filters[componentName](this); + this.searchComponentVms[componentName](this); }, updateQuery: function() { diff --git a/arches/app/media/js/views/components/search/related-resources-filter.js b/arches/app/media/js/views/components/search/related-resources-filter.js index 05151f77da4..ec2aa30ac62 100644 --- a/arches/app/media/js/views/components/search/related-resources-filter.js +++ b/arches/app/media/js/views/components/search/related-resources-filter.js @@ -22,9 +22,9 @@ define([ // because we need to pass the entire rsearch results filter into the // related resources filter var setSearchResults = function(){ - options.searchResultsVm = self.getFilter('search-results'); + options.searchResultsVm = self.getFilterByType('search-results'); options.searchResultsVm.relatedResourcesManager = self; - options.filters[componentName](self); + options.searchComponentVms[componentName](self); self.ready(true); }; diff --git a/arches/app/media/js/views/components/search/resource-type-filter.js b/arches/app/media/js/views/components/search/resource-type-filter.js index 541fadec01a..ceda3a03125 100644 --- a/arches/app/media/js/views/components/search/resource-type-filter.js +++ b/arches/app/media/js/views/components/search/resource-type-filter.js @@ -37,7 +37,7 @@ define([ this.updateQuery(); }, this); - this.filters[componentName](this); + this.searchComponentVms[componentName](this); if (this.requiredFiltersLoaded() === false) { this.requiredFiltersLoaded.subscribe(function() { diff --git a/arches/app/media/js/views/components/search/saved-searches.js b/arches/app/media/js/views/components/search/saved-searches.js index 1bb75a27cae..b88e14c9534 100644 --- a/arches/app/media/js/views/components/search/saved-searches.js +++ b/arches/app/media/js/views/components/search/saved-searches.js @@ -8,7 +8,7 @@ define([ const componentName = 'saved-searches'; const viewModel = function(params) { var self = this; - self.filters = params.filters; + self.searchComponentVms = params.searchComponentVms; self.urls = arches.urls; @@ -29,7 +29,7 @@ define([ searchUrl: search.SEARCH_URL[arches.activeLanguage].value }); }); - self.filters[componentName](self); + self.searchComponentVms[componentName](self); }); self.options = { diff --git a/arches/app/media/js/views/components/search/search-result-details.js b/arches/app/media/js/views/components/search/search-result-details.js index 6bd1f7bb00f..69d57419d18 100644 --- a/arches/app/media/js/views/components/search/search-result-details.js +++ b/arches/app/media/js/views/components/search/search-result-details.js @@ -28,7 +28,7 @@ define([ var setSearchResults = function(){ options.searchResultsVm = self.getFilterByType('search-results'); options.searchResultsVm.details = self; - options.filters[componentName](self); + options.searchComponentVms[componentName](self); }; if (this.requiredFiltersLoaded() === false) { diff --git a/arches/app/media/js/views/components/search/search-results.js b/arches/app/media/js/views/components/search/search-results.js index d556045d481..66c377a016c 100644 --- a/arches/app/media/js/views/components/search/search-results.js +++ b/arches/app/media/js/views/components/search/search-results.js @@ -53,7 +53,7 @@ define([ this.updateResults(); }, this); - this.filters[componentName](this); + this.searchComponentVms[componentName](this); this.restoreState(); if (this.requiredFiltersLoaded() === false) { this.requiredFiltersLoaded.subscribe(function () { diff --git a/arches/app/media/js/views/components/search/sort-results.js b/arches/app/media/js/views/components/search/sort-results.js index 6b374cf9b4a..df88796b80b 100644 --- a/arches/app/media/js/views/components/search/sort-results.js +++ b/arches/app/media/js/views/components/search/sort-results.js @@ -14,7 +14,7 @@ define([ BaseFilter.prototype.initialize.call(this, options); this.filter = ko.observable(''); - this.filters[componentName](this); + this.searchComponentVms[componentName](this); this.filter.subscribe(function(){ this.updateQuery(); diff --git a/arches/app/media/js/views/components/search/standard-search-logic.js b/arches/app/media/js/views/components/search/standard-search-logic.js index dd1b363afa2..a05a2eb77b6 100644 --- a/arches/app/media/js/views/components/search/standard-search-logic.js +++ b/arches/app/media/js/views/components/search/standard-search-logic.js @@ -50,7 +50,7 @@ define([ this.selectedPopup(componentname); } }; - this.filters[componentName](this); + this.searchComponentVms[componentName](this); }, }); diff --git a/arches/app/media/js/views/components/search/term-filter.js b/arches/app/media/js/views/components/search/term-filter.js index 9b86eb692e5..423e56c0ff4 100644 --- a/arches/app/media/js/views/components/search/term-filter.js +++ b/arches/app/media/js/views/components/search/term-filter.js @@ -42,7 +42,7 @@ define([ return tag.value.type === currentTag.type; }, this); if(!found){ - _.each(this.filters, function(filter){ + _.each(this.searchComponentVms, function(filter){ if(!!filter() && filter().name === tag.value.type){ filter().clear(); } @@ -52,7 +52,7 @@ define([ }, this); }, this, "arrayChange"); - this.filters[componentName](this); + this.searchComponentVms[componentName](this); this.restoreState(); }, diff --git a/arches/app/media/js/views/components/search/time-filter.js b/arches/app/media/js/views/components/search/time-filter.js index 6b52fa4c3e5..0952d4708fd 100644 --- a/arches/app/media/js/views/components/search/time-filter.js +++ b/arches/app/media/js/views/components/search/time-filter.js @@ -113,7 +113,7 @@ define([ this.filterChanged.subscribe(function() { this.updateQuery(); }, this); - this.filters[componentName](this); + this.searchComponentVms[componentName](this); }, updateQuery: function() { diff --git a/arches/app/media/js/views/search.js b/arches/app/media/js/views/search.js index d662410262e..d6650c23aa1 100644 --- a/arches/app/media/js/views/search.js +++ b/arches/app/media/js/views/search.js @@ -43,7 +43,7 @@ define([ }; var CommonSearchViewModel = function() { - this.filters = {}; + this.searchComponentVms = {}; this.filtersList = Object.values(SearchComponents); this.defaultSearchLogicComponent = this.filtersList.find(component => component.type == "search-logic" && component.config.default == true); // approach: let the backend decide this.searchLogicComponentName = ko.observable(false); @@ -71,10 +71,10 @@ define([ const filter = this.filtersList.find(component => component.type == type); if (!filter) return null; - return ko.unwrap(this.filters[filter.componentname]); + return ko.unwrap(this.searchComponentVms[filter.componentname]); }; Object.values(SearchComponents).forEach(function(component) { - this.filters[component.componentname] = ko.observable(null); + this.searchComponentVms[component.componentname] = ko.observable(null); }, this); this.query = ko.observable(getQueryObject()); if (this.query()["search-logic"] !== undefined) {