From 7eb369ed5561db407b3b6f86c6864c5bcf117e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ostafin?= Date: Mon, 9 Sep 2024 09:20:46 +0200 Subject: [PATCH] IBX-8706: Fixed filters: language, created date (#1334) --- .../universal-discovery/_translation.selector.scss | 4 ++-- .../universal-discovery/hooks/useSearchByQueryFetch.js | 8 +++++++- .../services/universal.discovery.service.js | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_translation.selector.scss b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_translation.selector.scss index fc0826bc7b..866557f336 100644 --- a/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_translation.selector.scss +++ b/src/bundle/Resources/public/scss/ui/modules/universal-discovery/_translation.selector.scss @@ -1,6 +1,4 @@ .c-translation-selector { - @include container-box-shadow-right; - position: fixed; right: 0; top: 0; @@ -13,6 +11,8 @@ transition: all $ibexa-admin-transition-duration $ibexa-admin-transition; padding: calculateRem(16px); z-index: 5; + color: $ibexa-color-dark; + box-shadow: calculateRem(4px) calculateRem(22px) calculateRem(47px) 0 rgba($ibexa-color-info, 0.15); &--hidden { transform: scaleX(0); diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js b/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js index 264cc8b0cf..1c6a5bc933 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/hooks/useSearchByQueryFetch.js @@ -44,6 +44,8 @@ export const useSearchByQueryFetch = () => { filters = {}, fullTextCriterion = null, contentNameCriterion = null, + dateCriterion = null, + useAlwaysAvailable = true, ) => { const handleFetch = (response) => { dispatchLoadedLocationsAction({ type: 'CLEAR_LOCATIONS' }); @@ -75,6 +77,10 @@ export const useSearchByQueryFetch = () => { query.SubtreeCriterion = subtreePathString; } + if (dateCriterion) { + query.DateMetadataCriterion = dateCriterion; + } + const isImageCriterionDataEmpty = !imageCriterionData || Object.keys(imageCriterionData).length === 0; if (!isImageCriterionDataEmpty) { @@ -96,7 +102,7 @@ export const useSearchByQueryFetch = () => { dispatch({ type: SEARCH_START }); return findLocationsBySearchQuery( - { ...restInfo, query, aggregations, filters, sortClause, sortOrder, limit, offset, languageCode }, + { ...restInfo, query, aggregations, filters, sortClause, sortOrder, limit, offset, languageCode, useAlwaysAvailable }, handleFetch, ); }, diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/services/universal.discovery.service.js b/src/bundle/ui-dev/src/modules/universal-discovery/services/universal.discovery.service.js index 9187922458..aae35d1ec7 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/services/universal.discovery.service.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/services/universal.discovery.service.js @@ -187,10 +187,10 @@ export const findLocationsBySearchQuery = ( offset = 0, languageCode = null, instanceUrl = DEFAULT_INSTANCE_URL, + useAlwaysAvailable = true, }, callback, ) => { - const useAlwaysAvailable = true; const body = JSON.stringify({ ViewInput: { identifier: `udw-locations-by-search-query-${query.FullTextCriterion}`,