From 1d33d895fef9829dfd776d235ff43b4c6f318278 Mon Sep 17 00:00:00 2001 From: syam babu Date: Tue, 24 Sep 2024 10:45:42 +0530 Subject: [PATCH 1/3] fix: scrollbar turned off inside textarea. closes #1334 --- src/App.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/App.css b/src/App.css index fb8916887..6136dbbe4 100644 --- a/src/App.css +++ b/src/App.css @@ -4,6 +4,10 @@ font-weight: 400; } +textarea { + overflow: hidden; +} + .ant-pagination-item > a { color: #222732; } From 1172968f46c64916580c4732bd6cff76fd8e3eac Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Wed, 25 Sep 2024 15:25:14 +0530 Subject: [PATCH 2/3] chore: added data cy attribute for editor --- src/components/TextEditor/TextEditor.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TextEditor/TextEditor.jsx b/src/components/TextEditor/TextEditor.jsx index d27fadc42..1c78d17d0 100644 --- a/src/components/TextEditor/TextEditor.jsx +++ b/src/components/TextEditor/TextEditor.jsx @@ -183,7 +183,7 @@ function TextEditor(props) { ]); return ( -
+
Date: Wed, 25 Sep 2024 16:58:14 +0530 Subject: [PATCH 3/3] fix: added image display to organization read only. closes #1352 --- .../OrganizationsReadOnly.jsx | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx b/src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx index e8cc52622..06401eff1 100644 --- a/src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx +++ b/src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx @@ -34,6 +34,7 @@ import { getActiveTabKey } from '../../../redux/reducer/readOnlyTabSlice'; import ReadOnlyPageTabLayout from '../../../layout/ReadOnlyPageTabLayout/ReadOnlyPageTabLayout'; import { isDataValid } from '../../../utils/MultiLingualFormItemSupportFunctions'; import { organizationFormFieldNames } from '../../../constants/personAndOrganizationFormFieldNames'; +import ImageUpload from '../../../components/ImageUpload'; function OrganizationsReadOnly() { const { t } = useTranslation(); @@ -412,28 +413,43 @@ function OrganizationsReadOnly() { )} {checkIfFieldIsToBeDisplayed( organizationFormFieldNames.IMAGE, - organizationData?.organizationData?.image, + organizationData?.image?.find((image) => image?.isMain), + ) && + organizationData?.image?.find((image) => image?.isMain)?.large?.uri && ( + image?.isMain)?.large?.uri} + imageReadOnly={true} + preview={true} + eventImageData={organizationData?.image?.find((image) => image?.isMain)?.large} + /> + )} + {checkIfFieldIsToBeDisplayed( + organizationFormFieldNames.IMAGE, + imageConfig.enableGallery ? organizationData?.image?.filter((image) => !image?.isMain) : [], ) && (

{t('dashboard.events.addEditEvent.otherInformation.image.additionalImages')}

- {organizationData?.image?.length > 0 && imageConfig.enableGallery && ( - 0 - ? imageConfig?.large?.aspectRatio - : null - } - thumbnailAspectRatio={ - currentCalendarData?.imageConfig?.length > 0 - ? imageConfig?.thumbnail?.aspectRatio - : null - } - eventImageData={organizationData?.image?.filter((image) => !image?.isMain)} - /> - )} + {organizationData?.image?.filter((image) => !image?.isMain)?.length > 0 && + imageConfig.enableGallery && ( + <> + 0 + ? imageConfig?.large?.aspectRatio + : null + } + thumbnailAspectRatio={ + currentCalendarData?.imageConfig?.length > 0 + ? imageConfig?.thumbnail?.aspectRatio + : null + } + eventImageData={organizationData?.image?.filter((image) => !image?.isMain)} + /> + + )}
)} {checkIfFieldIsToBeDisplayed(