From 6dd6144f911c2360fd3d57a85de9658b17a77b0c Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Thu, 9 Nov 2023 13:30:49 +0530 Subject: [PATCH 1/6] feat: added support for parent-child node in treeselect ,closes #culturecreates/tech-support-tickets/issues/11 --- .../TreeSelectOption/TreeSelectOption.jsx | 5 ++- .../treeSelectOption.settings.js | 31 +++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/components/TreeSelectOption/TreeSelectOption.jsx b/src/components/TreeSelectOption/TreeSelectOption.jsx index 0a0cd451f..2ce031e76 100644 --- a/src/components/TreeSelectOption/TreeSelectOption.jsx +++ b/src/components/TreeSelectOption/TreeSelectOption.jsx @@ -3,6 +3,8 @@ import { TreeSelect } from 'antd'; import './treeSelectOption.css'; function TreeSelectOption(props) { + const TITLE = 'title'; + const LABEL = 'label'; return ( trigger.parentNode} @@ -13,7 +15,8 @@ function TreeSelectOption(props) { }} multiple showSearch - treeNodeFilterProp={'title'} + treeNodeFilterProp={TITLE} + treeNodeLabelProp={LABEL} {...props} showArrow={props?.showArrow ?? true} /> diff --git a/src/components/TreeSelectOption/treeSelectOption.settings.js b/src/components/TreeSelectOption/treeSelectOption.settings.js index 7351cfa68..5a7fd8f97 100644 --- a/src/components/TreeSelectOption/treeSelectOption.settings.js +++ b/src/components/TreeSelectOption/treeSelectOption.settings.js @@ -5,7 +5,7 @@ import { ReactComponent as Organizations } from '../../assets/icons/organisation import { taxonomyClass } from '../../constants/taxonomyClass'; import { sourceOptions } from '../../constants/sourceOptions'; -const handleMultilevelTreeSelect = (children, user, calendarContentLanguage) => { +const handleMultilevelTreeSelect = (children, user, calendarContentLanguage, parentLabel) => { return children?.map((child) => { return { title: contentLanguageBilingual({ @@ -16,8 +16,17 @@ const handleMultilevelTreeSelect = (children, user, calendarContentLanguage) => }), value: child?.id, ...(child?.children && { - children: handleMultilevelTreeSelect(child?.children, user, calendarContentLanguage), + children: handleMultilevelTreeSelect(child?.children, user, calendarContentLanguage, parentLabel), }), + label: + parentLabel + + '-' + + contentLanguageBilingual({ + en: child?.name?.en, + fr: child?.name?.fr, + interfaceLanguage: user?.interfaceLanguage?.toLowerCase(), + calendarContentLanguage: calendarContentLanguage, + }), }; }); }; @@ -43,7 +52,23 @@ export const treeTaxonomyOptions = (data, user, mappedToField, isDynamicField, c }), value: concept?.id, ...(concept?.children && { - children: handleMultilevelTreeSelect(concept?.children, user, calendarContentLanguage), + children: handleMultilevelTreeSelect( + concept?.children, + user, + calendarContentLanguage, + contentLanguageBilingual({ + en: concept?.name?.en, + fr: concept?.name?.fr, + interfaceLanguage: user?.interfaceLanguage?.toLowerCase(), + calendarContentLanguage: calendarContentLanguage, + }), + ), + }), + label: contentLanguageBilingual({ + en: concept?.name?.en, + fr: concept?.name?.fr, + interfaceLanguage: user?.interfaceLanguage?.toLowerCase(), + calendarContentLanguage: calendarContentLanguage, }), }; }); From 33d62955d90f618d64f68133a5bfb411ad034582 Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Thu, 9 Nov 2023 15:18:45 +0530 Subject: [PATCH 2/6] feat: added translations for image crop modal,changed radio button color,closes #755 --- src/components/ImageCrop/ImageCrop.jsx | 22 ++++++++++------------ src/components/ImageCrop/imageCrop.css | 19 +++++++++++++++++-- src/locales/en/translationEn.json | 4 +++- src/locales/fr/transalationFr.json | 8 +++++--- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/components/ImageCrop/ImageCrop.jsx b/src/components/ImageCrop/ImageCrop.jsx index 40c3928bf..b22bddbb3 100644 --- a/src/components/ImageCrop/ImageCrop.jsx +++ b/src/components/ImageCrop/ImageCrop.jsx @@ -186,14 +186,6 @@ function ImageCrop(props) { {t('dashboard.events.addEditEvent.otherInformation.image.crop.subHeading')} - - - {t('dashboard.events.addEditEvent.otherInformation.image.crop.savedFrameSize')} - - aspectRatioControl(event.target.value)} style={{ color: '#222732' }}> - - {largeAspectRatio} {t('dashboard.events.addEditEvent.otherInformation.image.crop.ratio')} + + {largeAspectRatio} {t('dashboard.events.addEditEvent.otherInformation.image.crop.largeImage')} - - {thumbnailAspectRatio} {t('dashboard.events.addEditEvent.otherInformation.image.crop.ratio')} + + {thumbnailAspectRatio} {t('dashboard.events.addEditEvent.otherInformation.image.crop.thumbnailImage')} diff --git a/src/components/ImageCrop/imageCrop.css b/src/components/ImageCrop/imageCrop.css index f5753f8ad..fa1e42278 100644 --- a/src/components/ImageCrop/imageCrop.css +++ b/src/components/ImageCrop/imageCrop.css @@ -60,6 +60,21 @@ box-shadow: 0px 0px 0px 8px rgba(63, 81, 181, 0.16); } -.image-crop-wrapper .crop-container .reactEasyCrop_Contain{ +.image-crop-wrapper .crop-container .reactEasyCrop_Contain { z-index: -1; -} \ No newline at end of file +} + +.image-crop-wrapper .image-ratio-text { + color: #222732; + font-size: 16px; + font-style: normal; + line-height: 24px; +} + +.image-crop-wrapper .image-ratio-text .ant-radio-inner::after { + background-color: #1b3de6; +} + +.image-crop-wrapper .ant-radio-checked .ant-radio-inner { + border-color: #1b3de6; +} diff --git a/src/locales/en/translationEn.json b/src/locales/en/translationEn.json index eddfa2cec..a9d076c86 100644 --- a/src/locales/en/translationEn.json +++ b/src/locales/en/translationEn.json @@ -233,8 +233,10 @@ "crop": { "title": "Position image", "subHeading": "Adjust position if necessary.", - "savedFrameSize": "Saved frame sizes", + "savedFrameSize": "Available image ratios", "ratio": "Ratio", + "thumbnailImage": "Thumbnail image", + "largeImage": "Large image", "save": "Save", "cancel": "Cancel" } diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json index 7d30c9c76..cda83b4ff 100644 --- a/src/locales/fr/transalationFr.json +++ b/src/locales/fr/transalationFr.json @@ -230,10 +230,12 @@ "dragAndDrop": "ou glisser pour télécharger", "browse": "Parcourir", "crop": { - "title": "Position image", - "subHeading": "Adjust position if necessary.", - "savedFrameSize": "Saved frame sizes", + "title": "Positionnement de l’image", + "subHeading": "Ajuster la position de l’image si nécessaire.", + "savedFrameSize": "Ratios d'images disponibles", "ratio": "Ratio", + "thumbnailImage": "Vignette", + "largeImage": "Image grand format", "save": "Sauvegarder", "cancel": "Annuler" } From e76f34c9686d1f4d8044051938b67d0d59eb5d57 Mon Sep 17 00:00:00 2001 From: syam babu Date: Thu, 9 Nov 2023 15:54:56 +0530 Subject: [PATCH 3/6] fix: closes #748. invitaion success message added --- src/locales/en/translationEn.json | 2 +- src/locales/fr/transalationFr.json | 2 +- src/pages/Dashboard/AddUser/AddUser.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locales/en/translationEn.json b/src/locales/en/translationEn.json index eddfa2cec..68d3bfabb 100644 --- a/src/locales/en/translationEn.json +++ b/src/locales/en/translationEn.json @@ -859,7 +859,7 @@ "language": "Select preferred language." }, "notification": { - "invitation": "Invitation send successfully", + "invitation": "Success! Invitation sent.", "updateUser": "Success! User profile has been updated.", "deleteUser": "Are you sure you want to permanently delete this user?" }, diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json index 7d30c9c76..ac4bf599c 100644 --- a/src/locales/fr/transalationFr.json +++ b/src/locales/fr/transalationFr.json @@ -853,7 +853,7 @@ "language": "Sélectionnez la langue préférée" }, "notification": { - "invitation": "L'invitation a été envoyée avec succès", + "invitation": "Succès! L'invitation a été envoyée.", "updateUser": "Succès ! Le profil de l'utilisateur a été mis à jour.", "deleteUser": "Êtes-vous sûr de vouloir supprimer définitivement cet utilisateur?" }, diff --git a/src/pages/Dashboard/AddUser/AddUser.jsx b/src/pages/Dashboard/AddUser/AddUser.jsx index d886014ae..9e8ba3221 100644 --- a/src/pages/Dashboard/AddUser/AddUser.jsx +++ b/src/pages/Dashboard/AddUser/AddUser.jsx @@ -211,7 +211,7 @@ const AddUser = () => { language: values?.languagePreference?.key, calendarId, }).then((res) => { - if (res.statusCode == 202) { + if (res.statusCode == 201) { notification.success({ description: t(`dashboard.settings.addUser.notification.invitation`), key: res.message, From 1da23e0b9c9b3b6abe8a46c861d32ccd73c3e31d Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Fri, 10 Nov 2023 15:22:54 +0530 Subject: [PATCH 4/6] feat: added data cy attribute for antd components till date --- .../RecurringEvents/RecurringEvents.jsx | 23 ++++++++--- .../RecurringModal/RecurringModal.jsx | 19 ++++++--- src/pages/Dashboard/AddEvent/AddEvent.jsx | 41 +++++++++++++------ 3 files changed, 60 insertions(+), 23 deletions(-) diff --git a/src/components/RecurringEvents/RecurringEvents.jsx b/src/components/RecurringEvents/RecurringEvents.jsx index 881ad58ed..c18014a49 100644 --- a/src/components/RecurringEvents/RecurringEvents.jsx +++ b/src/components/RecurringEvents/RecurringEvents.jsx @@ -317,7 +317,8 @@ const RecurringEvents = function ({ + initialValue={formFields?.frequency ?? dateFrequencyOptions[0]?.value} + data-cy="form-item-date-frequency-label"> @@ -1793,11 +1809,12 @@ function AddEvent() { autoAdjustOverflow={false} getPopupContainer={(trigger) => trigger.parentNode} trigger={['click']} + data-cy="popover-event-place" content={
<> -
+
{t('dashboard.organization.createNew.search.footlightSectionHeading')}
From e35e14e0aec1b21a96d2f60a665158b943780590 Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Mon, 13 Nov 2023 12:50:15 +0530 Subject: [PATCH 5/6] chore: added data cy names to antd components in event form --- .../BilingualInput/BilingualInput.jsx | 1 + src/components/ImageUpload/ImageUpload.jsx | 1 + .../List/SelectionItem/SelectionItem.jsx | 54 +++++--- .../QuickCreateOrganization.jsx | 12 +- .../QuickCreatePerson/QuickCreatePerson.jsx | 16 ++- .../QuickCreatePlace/QuickCreatePlace.jsx | 26 ++-- .../QuickCreateSaving/QuickCreateSaving.jsx | 4 +- src/components/TextEditor/TextEditor.jsx | 7 +- src/pages/Dashboard/AddEvent/AddEvent.jsx | 124 ++++++++++++------ 9 files changed, 166 insertions(+), 79 deletions(-) diff --git a/src/components/BilingualInput/BilingualInput.jsx b/src/components/BilingualInput/BilingualInput.jsx index 0529968d8..d95615e8e 100644 --- a/src/components/BilingualInput/BilingualInput.jsx +++ b/src/components/BilingualInput/BilingualInput.jsx @@ -65,6 +65,7 @@ function BilingualInput(props) { animated="false" tabBarStyle={{ margin: '0' }} className="bilingual-input-tab" + data-cy="bilingual-tabs" /> ); } diff --git a/src/components/ImageUpload/ImageUpload.jsx b/src/components/ImageUpload/ImageUpload.jsx index 2109283dc..cb7a76770 100644 --- a/src/components/ImageUpload/ImageUpload.jsx +++ b/src/components/ImageUpload/ImageUpload.jsx @@ -120,6 +120,7 @@ function ImageUpload(props) { <> { e.stopPropagation(); window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer'); - }}> + }} + data-cy="artsdata-link-tag"> Artsdata @@ -56,13 +58,19 @@ function SelectionItem(props) { type="text" key="list-loadmore-close" onClick={onEdit} - style={{ color: '#1b3de6', fontSize: '12px', fontWeight: 600, padding: '0px' }}> + style={{ color: '#1b3de6', fontSize: '12px', fontWeight: 600, padding: '0px' }} + data-cy="button-edit-entity"> {t('dashboard.organization.readOnly.edit')} ), closable && ( - ), @@ -78,10 +86,19 @@ function SelectionItem(props) { backgroundColor: '#E3E8FF', borderRadius: '4px', }} + data-cy="avatar-entity-logo" /> } - title={{name}} - description={{description}} + title={ + + {name} + + } + description={ + + {description} + + } /> {(postalAddress || accessibility) && ( @@ -90,7 +107,7 @@ function SelectionItem(props) { - + {t('dashboard.events.addEditEvent.location.streetAddress')} @@ -100,7 +117,7 @@ function SelectionItem(props) {
{(postalAddress?.streetAddress?.en || postalAddress?.streetAddress?.fr) && ( - + {contentLanguageBilingual({ en: postalAddress?.streetAddress?.en, fr: postalAddress?.streetAddress?.fr, @@ -112,7 +129,7 @@ function SelectionItem(props) { )} {(postalAddress?.streetAddress?.en || postalAddress?.streetAddress?.fr) &&
} {postalAddress?.addressLocality && ( - + {contentLanguageBilingual({ en: postalAddress?.addressLocality?.en, fr: postalAddress?.addressLocality?.fr, @@ -123,7 +140,7 @@ function SelectionItem(props) { )} {postalAddress?.addressRegion && ( - + {contentLanguageBilingual({ en: postalAddress?.addressRegion?.en, fr: postalAddress?.addressRegion?.fr, @@ -134,7 +151,7 @@ function SelectionItem(props) { )} - {postalAddress?.postalCode && {postalAddress?.postalCode}} + {postalAddress?.postalCode && {postalAddress?.postalCode}}
{Array.isArray(region) && ( )} {openingHours && ( @@ -154,8 +172,9 @@ function SelectionItem(props) { target="_blank" rel="noopener noreferrer" className="selection-item-sub-content" - style={{ color: '#0F0E98' }}> - + style={{ color: '#0F0E98' }} + data-cy="anchor-opening-hours"> + {t('dashboard.events.addEditEvent.location.openingHours')}   @@ -173,7 +192,7 @@ function SelectionItem(props) { - + {t('dashboard.events.addEditEvent.location.venueAccessibility')} @@ -181,7 +200,7 @@ function SelectionItem(props) { {accessibility?.map((venueAccessibiltiy, index) => ( - + {contentLanguageBilingual({ en: venueAccessibiltiy?.name?.en, fr: venueAccessibiltiy?.name?.fr, @@ -203,13 +222,14 @@ function SelectionItem(props) {
window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')}> + onClick={() => window.open(`${artsDataLink}`, '_blank', 'noopener,noreferrer')} + data-cy="span-artsdata-link"> Artsdata - {name && {name}} + {name && {name}} {/* {description && } */}
- {description && {description}} + {description && {description}}
diff --git a/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx b/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx index 13a844653..93af6c3be 100644 --- a/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx +++ b/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx @@ -328,7 +328,8 @@ function QuickCreateOrganization(props) { ); }, }), - ]}> + ]} + data-cy="form-item-quick-create-organizer-name-french-label">