diff --git a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx index f742851a6..6d3f193cd 100644 --- a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx +++ b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx @@ -18,7 +18,7 @@ import { PathName } from '../../../constants/pathName'; import FeatureFlag from '../../../layout/FeatureFlag/FeatureFlag'; import { featureFlags } from '../../../utils/featureFlags'; import { useTranslation } from 'react-i18next'; -import { loadArtsDataEntity } from '../../../services/artsData'; +import { loadArtsDataPlaceEntity } from '../../../services/artsData'; import { useAddPlaceMutation, useGetPlaceQuery, @@ -556,8 +556,6 @@ function CreateNewPlace() { } }, [addedFields]); - console.log(artsData); - useEffect(() => { if (calendarId && placeData && currentCalendarData) { let initialAddedFields = [], @@ -646,22 +644,27 @@ function CreateNewPlace() { useEffect(() => { if (artsDataId) { setArtsDataLoading(true); - loadArtsDataEntity({ entityId: artsDataId }) + loadArtsDataPlaceEntity({ entityId: artsDataId }) .then((response) => { - setArtsData(response?.data[0]); + if (response?.data?.length > 0) { + setArtsData(response?.data[0]); + form.setFieldsValue({ + latitude: response?.data[0]?.geo?.latitude && '' + response?.data[0]?.geo?.latitude, + longitude: response?.data[0]?.geo?.longitude && '' + response?.data[0]?.geo?.longitude, + }); + } setArtsDataLoading(false); }) .catch((error) => { setArtsDataLoading(false); console.log(error); }); - } else if (location?.state?.name) - form.setFieldValue({ - name: { - fr: location?.state?.name, - en: location?.state?.name, - }, + } else if (location?.state?.name) { + form.setFieldsValue({ + french: location?.state?.name, + english: location?.state?.name, }); + } placesSearch(''); }, []); @@ -768,11 +771,11 @@ function CreateNewPlace() { )} - + ({ @@ -797,7 +800,7 @@ function CreateNewPlace() { ({ @@ -865,11 +868,14 @@ function CreateNewPlace() { - + ({ @@ -894,7 +900,9 @@ function CreateNewPlace() { ({ @@ -921,12 +929,15 @@ function CreateNewPlace() { - + - + ({ @@ -1235,7 +1246,7 @@ function CreateNewPlace() { ({ @@ -1262,11 +1273,12 @@ function CreateNewPlace() { - + ({ @@ -1289,7 +1301,7 @@ function CreateNewPlace() { ({ @@ -1314,7 +1326,7 @@ function CreateNewPlace() { - + ({ @@ -1357,7 +1370,7 @@ function CreateNewPlace() { ({ @@ -1388,11 +1401,14 @@ function CreateNewPlace() { - + ({ @@ -1417,7 +1433,9 @@ function CreateNewPlace() { ({ @@ -1447,8 +1465,10 @@ function CreateNewPlace() { @@ -1462,9 +1482,14 @@ function CreateNewPlace() { 'name', false, )} - initialValue={placeData?.regions?.map((type) => { - return type?.entityId; - })}> + initialValue={ + placeData?.regions?.map((type) => { + return type?.entityId; + }) ?? + artsData?.regions?.map((region) => { + return region?.entityId; + }) + }> { - navigate(`${PathName.Dashboard}/${calendarId}${PathName.Places}${PathName.Search}`, { state: { data: entity } }); + navigate(`${PathName.Dashboard}/${calendarId}${PathName.Places}${PathName.AddPlace}`, { state: { data: entity } }); }; const searchHandler = (value) => { @@ -185,7 +185,9 @@ function SearchPlaces() { quickCreateKeyword={quickCreateKeyword} onClick={() => { navigate(`${PathName.Dashboard}/${calendarId}${PathName.Places}${PathName.AddPlace}`, { - name: quickCreateKeyword, + state: { + name: quickCreateKeyword, + }, }); }} /> diff --git a/src/services/artsData.js b/src/services/artsData.js index fdecd98f7..ea54cf18a 100644 --- a/src/services/artsData.js +++ b/src/services/artsData.js @@ -19,3 +19,8 @@ export async function loadArtsDataEntity({ entityId }) { const url = `${baseUrl}/${query}`; return fetchData(url); } +export async function loadArtsDataPlaceEntity({ entityId }) { + const query = `query?adid=${entityId}&format=json&frame=ranked_place_footlight&sparql=ranked_place_footlight`; + const url = `${baseUrl}/${query}`; + return fetchData(url); +}