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 f2b021b1f8..05dabc0018 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 @@ -257,7 +257,17 @@ export const findLocationsBySearchQuery = ( }; export const findLocationsById = ( - { token, siteaccess, accessToken, id, limit = QUERY_LIMIT, offset = 0, instanceUrl = DEFAULT_INSTANCE_URL }, + { + token, + siteaccess, + accessToken, + id, + noLanguageCode = false, + useAlwaysAvailable = undefined, + limit = QUERY_LIMIT, + offset = 0, + instanceUrl = DEFAULT_INSTANCE_URL, + }, callback, ) => { const body = { @@ -271,10 +281,17 @@ export const findLocationsById = ( limit, offset, }, + useAlwaysAvailable, }, }; - addLanguageCodeToCreateViewEndpoint(body); + if (useAlwaysAvailable !== undefined) { + body.ViewInput.useAlwaysAvailable = useAlwaysAvailable; + } + + if (!noLanguageCode) { + addLanguageCodeToCreateViewEndpoint(body); + } const request = new Request(`${instanceUrl}${ENDPOINT_CREATE_VIEW}`, { method: 'POST', @@ -430,7 +447,7 @@ export const loadContentInfo = ( accessToken, contentId, noLanguageCode = false, - useAlwaysAvailable = false, + useAlwaysAvailable = undefined, limit = QUERY_LIMIT, offset = 0, signal, @@ -453,6 +470,10 @@ export const loadContentInfo = ( }, }; + if (useAlwaysAvailable !== undefined) { + body.ViewInput.useAlwaysAvailable = useAlwaysAvailable; + } + if (!noLanguageCode) { addLanguageCodeToCreateViewEndpoint(body); } diff --git a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js index 6f8a3fcbab..6c05404ac4 100644 --- a/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js +++ b/src/bundle/ui-dev/src/modules/universal-discovery/universal.discovery.module.js @@ -353,15 +353,24 @@ const UniversalDiscoveryModule = (props) => { return; } - findLocationsById({ ...restInfo, id: props.selectedLocations.join(','), limit: props.selectedLocations.length }, (locations) => { - const mappedLocation = props.selectedLocations.map((locationId) => { - const location = locations.find(({ id }) => id === parseInt(locationId, 10)); + findLocationsById( + { + ...restInfo, + noLanguageCode: true, + useAlwaysAvailable: true, + id: props.selectedLocations.join(','), + limit: props.selectedLocations.length, + }, + (locations) => { + const mappedLocation = props.selectedLocations.map((locationId) => { + const location = locations.find(({ id }) => id === parseInt(locationId, 10)); - return { location }; - }); + return { location }; + }); - dispatchSelectedLocationsAction({ type: 'REPLACE_SELECTED_LOCATIONS', locations: mappedLocation }); - }); + dispatchSelectedLocationsAction({ type: 'REPLACE_SELECTED_LOCATIONS', locations: mappedLocation }); + }, + ); }, [props.selectedLocations]); useEffect(() => {