From f361c2fc340803ea77d3df232eac1b157e40f7bb Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Sat, 23 Sep 2023 01:38:03 +0530 Subject: [PATCH 1/5] feat: artsdata source displayed for arts data entities --- .../CreateNewOrganization.jsx | 117 +++++++++--------- .../CreateNewPerson/CreateNewPerson.jsx | 107 ++++++++-------- .../CreateNewPlace/CreateNewPlace.jsx | 12 +- 3 files changed, 122 insertions(+), 114 deletions(-) diff --git a/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx b/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx index 2828cf86a..4b63ffcb9 100644 --- a/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx +++ b/src/pages/Dashboard/CreateNewOrganization/CreateNewOrganization.jsx @@ -549,62 +549,67 @@ function CreateNewOrganization() { return ( <> - {artsDataLinkChecker(organizationData?.sameAs) && section[0]?.category === formCategory.PRIMARY && ( - - -

- {t('dashboard.organization.createNew.addOrganization.dataSource')} -

- - - - - -
- - {t('dashboard.organization.createNew.addOrganization.question.firstPart')} - - { - navigate( - `${PathName.Dashboard}/${calendarId}${PathName.Organizations}${PathName.Search}`, - ); - }}> - {t('dashboard.organization.createNew.addOrganization.question.secondPart')} - - - {t('dashboard.organization.createNew.addOrganization.question.thirdPart')} - -
- - -
-
-
- - - )} + {(artsDataLinkChecker(organizationData?.sameAs) || artsDataLinkChecker(artsData?.sameAs)) && + section[0]?.category === formCategory.PRIMARY && ( + + +

+ {t('dashboard.organization.createNew.addOrganization.dataSource')} +

+ + + + + +
+ + {t('dashboard.organization.createNew.addOrganization.question.firstPart')} + + { + navigate( + `${PathName.Dashboard}/${calendarId}${PathName.Organizations}${PathName.Search}`, + ); + }}> + {t('dashboard.organization.createNew.addOrganization.question.secondPart')} + + + {t('dashboard.organization.createNew.addOrganization.question.thirdPart')} + +
+ + +
+
+
+ + + )} {section?.map((field) => { return formFieldValue?.map((formField, index) => { if (formField?.type === field.type) { diff --git a/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx b/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx index ebea656ce..d9b76c4a8 100644 --- a/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx +++ b/src/pages/Dashboard/CreateNewPerson/CreateNewPerson.jsx @@ -349,58 +349,61 @@ function CreateNewPerson() { return ( <> - {artsDataLinkChecker(personData?.sameAs) && section[0]?.category === formCategory.PRIMARY && ( - - -

{t('dashboard.people.createNew.addPerson.dataSource')}

- - - - - -
- - {t('dashboard.people.createNew.addPerson.question.firstPart')} - - { - navigate(`${PathName.Dashboard}/${calendarId}${PathName.People}${PathName.Search}`); - }}> - {t('dashboard.people.createNew.addPerson.question.secondPart')} - - - {t('dashboard.people.createNew.addPerson.question.thirdPart')} - -
- - -
-
-
- - - )} + {(artsDataLinkChecker(personData?.sameAs) || artsDataLinkChecker(artsData?.sameAs)) && + section[0]?.category === formCategory.PRIMARY && ( + + +

{t('dashboard.people.createNew.addPerson.dataSource')}

+ + + + + +
+ + {t('dashboard.people.createNew.addPerson.question.firstPart')} + + { + navigate(`${PathName.Dashboard}/${calendarId}${PathName.People}${PathName.Search}`); + }}> + {t('dashboard.people.createNew.addPerson.question.secondPart')} + + + {t('dashboard.people.createNew.addPerson.question.thirdPart')} + +
+ + +
+
+
+ + + )} {section?.map((field) => { return formFieldValue?.map((formField, index) => { if (formField?.type === field.type) { diff --git a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx index 6d3f193cd..073d80daf 100644 --- a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx +++ b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx @@ -715,7 +715,7 @@ function CreateNewPlace() { <> - {artsDataLinkChecker(placeData?.sameAs) && ( + {(artsDataLinkChecker(placeData?.sameAs) || artsDataLinkChecker(artsData?.sameAs)) && (

@@ -724,16 +724,16 @@ function CreateNewPlace() { Date: Sat, 23 Sep 2023 01:46:59 +0530 Subject: [PATCH 2/5] feat: added validation texts for place form --- src/locales/en/translationEn.json | 9 ++- src/locales/fr/transalationFr.json | 7 +- .../CreateNewPlace/CreateNewPlace.jsx | 75 +++++-------------- 3 files changed, 29 insertions(+), 62 deletions(-) diff --git a/src/locales/en/translationEn.json b/src/locales/en/translationEn.json index b1872decd..00dd421ad 100644 --- a/src/locales/en/translationEn.json +++ b/src/locales/en/translationEn.json @@ -636,7 +636,10 @@ "saveError": "This place needs more information before it can be saved." }, "validations": { - "nameRequired": "Name is required." + "nameRequired": "Name is required.", + "placeTypeRequired": "A minimum of one type is requred.", + "streetAddressRequired": "Street address is required.", + "postalCodeRequired": "Postal code is required." } } } @@ -730,7 +733,7 @@ "userTypes": "User types", "clear": "Clear", "userName": "Username", - "addUser":"Utilisateur", + "addUser": "Utilisateur", "firstName": "First name", "lastName": "Last name", "active": "Active", @@ -740,7 +743,7 @@ "editor": "Editor", "contributor": "Contributor", "guest": "Guest", - "superAdmin":"Super Admin", + "superAdmin": "Super Admin", "invitedBy": "Invited By", "tooltip": { "editUser": "Edit user", diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json index 78a39ff45..5e5af0a76 100644 --- a/src/locales/fr/transalationFr.json +++ b/src/locales/fr/transalationFr.json @@ -633,7 +633,10 @@ "saveError": "Cet lieu a besoin de plus d'informations avant d'être enregistré." }, "validations": { - "nameRequired": "Le nom est requis." + "nameRequired": "Le nom est requis.", + "placeTypeRequired": "Un minimum d'un type est requis.", + "streetAddressRequired": "L'adresse postale est requise.", + "postalCodeRequired": "Le code postal est requis." } } } @@ -723,7 +726,7 @@ "sort": "Trier par", "status": "Statut", "userTypes": "Type", - "addUser":"Utilisateur", + "addUser": "Utilisateur", "clear": "Réinitialiser", "userName": "Nom d’utilisateur", "firstName": "Prénom", diff --git a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx index 073d80daf..1a5a38984 100644 --- a/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx +++ b/src/pages/Dashboard/CreateNewPlace/CreateNewPlace.jsx @@ -838,7 +838,12 @@ function CreateNewPlace() { initialValue={placeData?.additionalType?.map((type) => { return type?.entityId; })} - required={true}> + rules={[ + { + required: true, + message: t('dashboard.places.createNew.addPlace.validations.placeTypeRequired'), + }, + ]}> @@ -1254,7 +1261,9 @@ function CreateNewPlace() { if (value || getFieldValue(formFieldNames.STREET_ADDRESS_FRENCH)) { return Promise.resolve(); } else - return Promise.reject(new Error(t('dashboard.events.addEditEvent.validations.title'))); + return Promise.reject( + new Error(t('dashboard.places.createNew.addPlace.validations.streetAddressRequired')), + ); }, }), ]}> @@ -1330,8 +1339,8 @@ function CreateNewPlace() { label={t('dashboard.places.createNew.addPlace.address.postalCode.postalCode')} rules={[ { - type: 'url', - message: t('dashboard.events.addEditEvent.validations.url'), + required: true, + message: t('dashboard.places.createNew.addPlace.validations.postalCodeRequired'), }, ]}> @@ -1346,19 +1355,7 @@ function CreateNewPlace() { name={formFieldNames.PROVINCE_FRENCH} key={contentLanguage.FRENCH} initialValue={placeData?.address?.addressRegion?.fr ?? artsData?.address?.addressRegion?.fr} - dependencies={[formFieldNames.PROVINCE_ENGLISH]} - rules={[ - ({ getFieldValue }) => ({ - validator(_, value) { - if (value || getFieldValue(formFieldNames.PROVINCE_ENGLISH)) { - return Promise.resolve(); - } else - return Promise.reject( - new Error(t('dashboard.events.addEditEvent.validations.title')), - ); - }, - }), - ]}> + dependencies={[formFieldNames.PROVINCE_ENGLISH]}>