Skip to content

Commit

Permalink
refactor adv_search append_dsl into generate_dsl, re #11477
Browse files Browse the repository at this point in the history
  • Loading branch information
whatisgalen committed Sep 20, 2024
1 parent e8166aa commit f85abec
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions arches/app/search/components/advanced_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@


class AdvancedSearch(BaseSearchFilter):
def append_dsl(self, search_query_object, **kwargs):

def generate_dsl(self, **kwargs):
querysting_params = self.request.GET.get(self.componentname, "")
advanced_filters = JSONDeserializer().deserialize(querysting_params)
datatype_factory = DataTypeFactory()
Expand Down Expand Up @@ -70,7 +71,11 @@ def append_dsl(self, search_query_object, **kwargs):
for grouped_query in grouped_queries:
advanced_query.should(grouped_query)
search_query.must(advanced_query)
search_query_object["query"].add_query(search_query)
return search_query

def append_dsl(self, search_query_object, **kwargs):
dsl = self.generate_dsl()
search_query_object["query"].add_query(dsl)

def view_data(self):
ret = {}
Expand Down

0 comments on commit f85abec

Please sign in to comment.