IBX-8392: [Image picker] Sorting by name and date does not work (#1275)

ibexa · Jun 25, 2024 · d20ae73 · d20ae73
1 parent fe389e1
commit d20ae73
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/components/search/search.js b/src/bundle/ui-dev/src/modules/universal-discovery/components/search/search.js
@@ -49,7 +49,6 @@ const Search = ({ itemsPerPage }) => {
     const [selectedLanguage, setSelectedLanguage] = useState(firstLanguageCode);
     const prevSearchText = useRef(null);
     const [isLoading, data, searchByQuery] = useSearchByQueryFetch();
-
     const search = () => {
         const shouldResetOffset = prevSearchText.current !== searchText && offset !== 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
@@ -24,6 +24,7 @@ export const useSearchByQueryFetch = () => {
     const restInfo = useContext(RestInfoContext);
     const [, dispatchLoadedLocationsAction] = useContext(LoadedLocationsMapContext);
     const [{ isLoading, data }, dispatch] = useReducer(searchByQueryReducer, { isLoading: false, data: {} });
+
     const searchByQuery = useCallback(
         (
             searchText,
@@ -33,6 +34,8 @@ export const useSearchByQueryFetch = () => {
             limit,
             offset,
             languageCode,
+            sortClause = null,
+            sortOrder = null,
             imageCriterionData = null,
             aggregations = {},
             filters = {},
@@ -81,7 +84,10 @@ export const useSearchByQueryFetch = () => {
             }
 
             dispatch({ type: SEARCH_START });
-            return findLocationsBySearchQuery({ ...restInfo, query, aggregations, filters, limit, offset, languageCode }, handleFetch);
+            return findLocationsBySearchQuery(
+                { ...restInfo, query, aggregations, filters, sortClause, sortOrder, limit, offset, languageCode },
+                handleFetch,
+            );
         },
         [restInfo, dispatch],
     );

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
@@ -181,6 +181,8 @@ export const findLocationsBySearchQuery = (
         query,
         aggregations,
         filters,
+        sortClause = 'DatePublished',
+        sortOrder = 'ascending',
         limit = QUERY_LIMIT,
         offset = 0,
         languageCode = null,
@@ -197,7 +199,12 @@ export const findLocationsBySearchQuery = (
             useAlwaysAvailable,
             LocationQuery: {
                 FacetBuilders: {},
-                SortClauses: {},
+                SortClauses:
+                    sortClause && sortOrder
+                        ? {
+                              [sortClause]: sortOrder,
+                          }
+                        : {},
                 Query: query,
                 Aggregations: aggregations,
                 Filters: filters,
@@ -508,7 +515,6 @@ export const findSuggestions = (
             },
         },
     });
-
     const request = new Request(ENDPOINT_CREATE_VIEW, {
         method: 'POST',
         headers: getRequestHeaders({