IBX-7677: Remove markedLocationId reset to null from useSearchByQuery…

…Fetch (#1172)
ibexa · Feb 15, 2024 · b4b49bd · b4b49bd
1 parent e88c235
commit b4b49bd
Show file tree

Hide file tree

Showing 2 changed files with 4 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
@@ -12,7 +12,7 @@ import ContentTable from '../content-table/content.table';
 import Filters from '../filters/filters';
 import SearchTags from './search.tags';
 import { useSearchByQueryFetch } from '../../hooks/useSearchByQueryFetch';
-import { AllowedContentTypesContext, SearchTextContext } from '../../universal.discovery.module';
+import { AllowedContentTypesContext, MarkedLocationIdContext, SearchTextContext } from '../../universal.discovery.module';
 import { createCssClassNames } from '../../../common/helpers/css.class.names';
 import { getAdminUiConfig, getTranslator } from '@ibexa-admin-ui/src/bundle/Resources/public/js/scripts/helpers/context.helper';
 
@@ -33,6 +33,7 @@ const Search = ({ itemsPerPage }) => {
     const Translator = getTranslator();
     const adminUiConfig = getAdminUiConfig();
     const allowedContentTypes = useContext(AllowedContentTypesContext);
+    const [, setMarkedLocationId] = useContext(MarkedLocationIdContext);
     const [searchText] = useContext(SearchTextContext);
     const [offset, setOffset] = useState(0);
     const [selectedContentTypes, dispatchSelectedContentTypesAction] = useReducer(selectedContentTypesReducer, []);
@@ -61,6 +62,7 @@ const Search = ({ itemsPerPage }) => {
 
         const contentTypes = !!selectedContentTypes.length ? [...selectedContentTypes] : allowedContentTypes;
 
+        setMarkedLocationId(null);
         searchByQuery(searchText, contentTypes, selectedSection, selectedSubtree, itemsPerPage, offset, selectedLanguage);
     };
     const changePage = (pageIndex) => setOffset(pageIndex * itemsPerPage);

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
@@ -1,7 +1,7 @@
 import { useContext, useCallback, useReducer } from 'react';
 
 import { findLocationsBySearchQuery } from '../services/universal.discovery.service';
-import { RestInfoContext, LoadedLocationsMapContext, MarkedLocationIdContext } from '../universal.discovery.module';
+import { RestInfoContext, LoadedLocationsMapContext } from '../universal.discovery.module';
 
 const SEARCH_START = 'SEARCH_START';
 const SEARCH_END = 'SEARCH_END';
@@ -22,7 +22,6 @@ const searchByQueryReducer = (state, action) => {
 
 export const useSearchByQueryFetch = () => {
     const restInfo = useContext(RestInfoContext);
-    const [, setMarkedLocationId] = useContext(MarkedLocationIdContext);
     const [, dispatchLoadedLocationsAction] = useContext(LoadedLocationsMapContext);
     const [{ isLoading, data }, dispatch] = useReducer(searchByQueryReducer, { isLoading: false, data: {} });
     const searchByQuery = useCallback(
@@ -41,7 +40,6 @@ export const useSearchByQueryFetch = () => {
             contentNameCriterion = null,
         ) => {
             const handleFetch = (response) => {
-                setMarkedLocationId(null);
                 dispatchLoadedLocationsAction({ type: 'CLEAR_LOCATIONS' });
                 dispatch({ type: SEARCH_END, response });
             };