refactor this.filters --> this.searchComponentVms for explicit clarit…

…y, re #10804

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() {

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]);
         }
     });
 });

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();

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();

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;
         },

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() {

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);
             };
 

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() {

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 = {

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) {

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 () {

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();

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);
         },
 
     });

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();
         },
 

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() {

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) {