From 4426e32168c2cb7f070ddf717d52e1dfc28f8c88 Mon Sep 17 00:00:00 2001 From: Galen Date: Thu, 18 Apr 2024 23:35:38 -0700 Subject: [PATCH] refactors signature for append_dsl() and post_search_hook() to include request pos arg, re #10804 --- arches/app/search/components/advanced_search.py | 2 +- arches/app/search/components/map_filter.py | 2 +- arches/app/search/components/paging_filter.py | 4 ++-- arches/app/search/components/provisional_filter.py | 2 +- arches/app/search/components/resource_type_filter.py | 2 +- arches/app/search/components/search_results.py | 4 ++-- arches/app/search/components/sort_results.py | 2 +- arches/app/search/components/term_filter.py | 2 +- arches/app/search/components/time_filter.py | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arches/app/search/components/advanced_search.py b/arches/app/search/components/advanced_search.py index 8ca94e2f288..3cc48b3b10c 100644 --- a/arches/app/search/components/advanced_search.py +++ b/arches/app/search/components/advanced_search.py @@ -20,7 +20,7 @@ class AdvancedSearch(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): querysting_params = self.request.GET.get(details["componentname"], "") advanced_filters = JSONDeserializer().deserialize(querysting_params) datatype_factory = DataTypeFactory() diff --git a/arches/app/search/components/map_filter.py b/arches/app/search/components/map_filter.py index 97b9234ce49..5ab28aed619 100644 --- a/arches/app/search/components/map_filter.py +++ b/arches/app/search/components/map_filter.py @@ -24,7 +24,7 @@ class MapFilter(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): search_query = Bool() querysting_params = self.request.GET.get(details["componentname"], "") spatial_filter = JSONDeserializer().deserialize(querysting_params) diff --git a/arches/app/search/components/paging_filter.py b/arches/app/search/components/paging_filter.py index 7877e467a5f..458147708f3 100644 --- a/arches/app/search/components/paging_filter.py +++ b/arches/app/search/components/paging_filter.py @@ -17,7 +17,7 @@ class PagingFilter(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): export = self.request.GET.get("export", None) mobile_download = self.request.GET.get("mobiledownload", None) page = 1 if self.request.GET.get(details["componentname"]) == "" else int(self.request.GET.get(details["componentname"], 1)) @@ -32,7 +32,7 @@ def append_dsl(self, search_results_object, permitted_nodegroups, include_provis search_results_object["query"].start = limit * int(page - 1) search_results_object["query"].limit = limit - def post_search_hook(self, search_results_object, results, permitted_nodegroups): + def post_search_hook(search_results_object, response_object, permitted_nodegroups, request): total = ( results["hits"]["total"]["value"] if results["hits"]["total"]["value"] <= settings.SEARCH_RESULT_LIMIT diff --git a/arches/app/search/components/provisional_filter.py b/arches/app/search/components/provisional_filter.py index f7533fefaa3..8a4b7587002 100644 --- a/arches/app/search/components/provisional_filter.py +++ b/arches/app/search/components/provisional_filter.py @@ -16,7 +16,7 @@ class ProvisionalFilter(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): search_query = Bool() if include_provisional is not True: diff --git a/arches/app/search/components/resource_type_filter.py b/arches/app/search/components/resource_type_filter.py index 7378facfcc4..1d688d17118 100644 --- a/arches/app/search/components/resource_type_filter.py +++ b/arches/app/search/components/resource_type_filter.py @@ -26,7 +26,7 @@ def get_permitted_graphids(permitted_nodegroups): class ResourceTypeFilter(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): search_query = Bool() querystring_params = self.request.GET.get(details["componentname"], "") graph_ids = [] diff --git a/arches/app/search/components/search_results.py b/arches/app/search/components/search_results.py index c4958bac28c..2123547f97f 100644 --- a/arches/app/search/components/search_results.py +++ b/arches/app/search/components/search_results.py @@ -20,7 +20,7 @@ class SearchResultsFilter(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): nested_agg = NestedAgg(path="points", name="geo_aggs") nested_agg_filter = FiltersAgg(name="inner") geo_agg_filter = Bool() @@ -53,7 +53,7 @@ def append_dsl(self, search_results_object, permitted_nodegroups, include_provis nested_agg.add_aggregation(nested_agg_filter) search_results_object["query"].add_aggregation(nested_agg) - def post_search_hook(self, search_results_object, results, permitted_nodegroups): + def post_search_hook(search_results_object, response_object, permitted_nodegroups, request): user_is_reviewer = user_is_resource_reviewer(self.request.user) # only reuturn points and geometries a user is allowed to view diff --git a/arches/app/search/components/sort_results.py b/arches/app/search/components/sort_results.py index 00dd505623b..07681d9d1d6 100644 --- a/arches/app/search/components/sort_results.py +++ b/arches/app/search/components/sort_results.py @@ -17,7 +17,7 @@ class SortResults(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): sort_param = self.request.GET.get(details["componentname"], None) if sort_param is not None and sort_param is not "": diff --git a/arches/app/search/components/term_filter.py b/arches/app/search/components/term_filter.py index 1c160968870..f5ebad04d5e 100644 --- a/arches/app/search/components/term_filter.py +++ b/arches/app/search/components/term_filter.py @@ -20,7 +20,7 @@ class TermFilter(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): search_query = Bool() querysting_params = self.request.GET.get(details["componentname"], "") language = self.request.GET.get("language", "*") diff --git a/arches/app/search/components/time_filter.py b/arches/app/search/components/time_filter.py index dd11d1c7ae4..52d53af45f4 100644 --- a/arches/app/search/components/time_filter.py +++ b/arches/app/search/components/time_filter.py @@ -22,7 +22,7 @@ class TimeFilter(BaseSearchFilter): - def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional): + def append_dsl(self, search_results_object, permitted_nodegroups, include_provisional, request): search_query = Bool() querysting_params = self.request.GET.get(details["componentname"], "") temporal_filter = JSONDeserializer().deserialize(querysting_params)