rename get_searchview_component -> get_searchview_instance, re #10804

archesproject · Aug 12, 2024 · 80c1da1 · 80c1da1
1 parent 3a0d74a
commit 80c1da1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/arches/app/search/components/base.py b/arches/app/search/components/base.py
@@ -119,7 +119,7 @@ def get_searchview_component_name(self):
 
         return searchview_component_name
 
-    def get_searchview_component_instance(self):
+    def get_searchview_instance(self):
         searchview_component_name = self.get_searchview_component_name()
         return self.get_filter(searchview_component_name)
 

diff --git a/arches/app/views/search.py b/arches/app/views/search.py
@@ -76,10 +76,8 @@ def get(self, request):
         )
         geocoding_providers = models.Geocoder.objects.all()
         search_component_factory = SearchFilterFactory(request)
-        searchview_component_instance = (
-            search_component_factory.get_searchview_component_instance()
-        )
-        search_components = searchview_component_instance.get_searchview_filters()
+        searchview_instance = search_component_factory.get_searchview_instance()
+        search_components = searchview_instance.get_searchview_filters()
 
         datatypes = models.DDataType.objects.all()
         widgets = models.Widget.objects.all()
@@ -344,9 +342,7 @@ def get_dsl_from_search_string(request):
 def search_results(request, returnDsl=False):
     se = SearchEngineFactory().create()
     search_filter_factory = SearchFilterFactory(request)
-    searchview_component_instance = (
-        search_filter_factory.get_searchview_component_instance()
-    )
+    searchview_component_instance = search_filter_factory.get_searchview_instance()
     if not searchview_component_instance:
         unavailable_core_name = search_filter_factory.get_searchview_component_name()
         ret = {

diff --git a/tests/views/search_tests.py b/tests/views/search_tests.py
@@ -785,7 +785,7 @@ def test_searchview_searchview_component_from_admin(self):
         request.user = User.objects.get(username="admin")
         search_component_factory = SearchFilterFactory(request)
         searchview_component_instance = (
-            search_component_factory.get_searchview_component_instance()
+            search_component_factory.get_searchview_instance()
         )
         self.assertTrue(searchview_component_instance is not None)
 
@@ -799,7 +799,7 @@ def test_searchview_searchview_component_from_anonymous(self):
         request.user = User.objects.get(username="anonymous")
         search_component_factory = SearchFilterFactory(request)
         searchview_component_instance = (
-            search_component_factory.get_searchview_component_instance()
+            search_component_factory.get_searchview_instance()
         )
         self.assertTrue(searchview_component_instance is not None)