From 662d215350b588ea381f36dcf9d7b7c58f77bb5f Mon Sep 17 00:00:00 2001 From: Mike Griniezakis Date: Fri, 17 Jan 2025 10:27:48 +0200 Subject: [PATCH 1/2] Remove search condition that tiles must exist #11424 --- arches/app/search/components/advanced_search.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/arches/app/search/components/advanced_search.py b/arches/app/search/components/advanced_search.py index 91db43f5f72..d66ed4e0c9c 100644 --- a/arches/app/search/components/advanced_search.py +++ b/arches/app/search/components/advanced_search.py @@ -1,15 +1,15 @@ +from arches.app.datatypes.datatypes import DataTypeFactory from arches.app.models.models import ( - Node, - DDataType, - GraphModel, CardModel, CardXNodeXWidget, + DDataType, + GraphModel, + Node, ) from arches.app.models.system_settings import settings -from arches.app.datatypes.datatypes import DataTypeFactory -from arches.app.utils.betterJSONSerializer import JSONDeserializer -from arches.app.search.elasticsearch_dsl_builder import Bool, Nested from arches.app.search.components.base import BaseSearchFilter +from arches.app.search.elasticsearch_dsl_builder import Bool +from arches.app.utils.betterJSONSerializer import JSONDeserializer details = { "searchcomponentid": "", @@ -61,11 +61,9 @@ def append_dsl(self, search_query_object, **kwargs): datatype.append_search_filters( val, node, tile_query, self.request ) - nested_query = Nested(path="tiles", query=tile_query) if advanced_filter["op"] == "or" and index != 0: grouped_query = Bool() grouped_queries.append(grouped_query) - grouped_query.must(nested_query) grouped_query.must(null_query) for grouped_query in grouped_queries: advanced_query.should(grouped_query) From 2a50d47e152b9be20c9f6c09bdc9354c90d44ddb Mon Sep 17 00:00:00 2001 From: Mike Griniezakis Date: Fri, 17 Jan 2025 10:29:32 +0200 Subject: [PATCH 2/2] update changelog --- releases/7.6.5.md | 1 + 1 file changed, 1 insertion(+) diff --git a/releases/7.6.5.md b/releases/7.6.5.md index e1c17e10513..17e7a1c8e8c 100644 --- a/releases/7.6.5.md +++ b/releases/7.6.5.md @@ -4,6 +4,7 @@ - Fix Activity Stream id value [#11727](https://github.com/archesproject/arches/issues/11727) - Prevent Arches templates from overriding App templates [#11731]https://github.com/archesproject/arches/pull/11731 +- Fix the complement of "Has Any Value" and "Has No Value" in advanced search [#11424](https://github.com/archesproject/arches/issues/11424) ### Dependency changes: