Merge pull request #1329 from culturecreates/develop

Develop
culturecreates · Sep 17, 2024 · 9343788 · 9343788
2 parents be483fa + 2ac08d1
commit 9343788
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/src/constants/calendarSettingsForm.js b/src/constants/calendarSettingsForm.js
@@ -127,6 +127,21 @@ const REQUIRED_MESSAGE = {
   message: <Trans i18nKey="common.validations.informationRequired" />,
 };
 
+const MINIMUM_PIXEL = [
+  {
+    required: true,
+    message: <Translation>{(t) => t('dashboard.settings.calendarSettings.validations.minimumPixel')}</Translation>,
+  },
+
+  () => ({
+    validator(_, value) {
+      if (value && parseInt(value) < 100) {
+        return Promise.reject(<Trans i18nKey="dashboard.settings.calendarSettings.validations.minimumPixel" />);
+      } else return Promise.resolve();
+    },
+  }),
+];
+
 export const calendarSettingsFormFields = {
   GENERAL_SETTINGS: [
     {
@@ -304,7 +319,7 @@ export const calendarSettingsFormFields = {
                 className="calendar-settings-small-label"
                 label={t('dashboard.settings.calendarSettings.siteImageSettings.maximumWidth')}
                 data-cy="form-item-image-max-width-thumbnail"
-                rules={[REQUIRED_MESSAGE]}>
+                rules={MINIMUM_PIXEL}>
                 <StyledInput
                   placeholder={t('dashboard.settings.calendarSettings.placeholders.imageMaxWidth')}
                   data-cy="input-calendar-image-max-width-thumbnail"
@@ -378,7 +393,7 @@ export const calendarSettingsFormFields = {
                   </Translation>
                 }
                 data-cy="form-item-image-max-width-large"
-                rules={[REQUIRED_MESSAGE]}>
+                rules={MINIMUM_PIXEL}>
                 <StyledInput
                   placeholder={t('dashboard.settings.calendarSettings.placeholders.imageMaxWidth')}
                   data-cy="input-calendar-image-max-width-large"

diff --git a/src/locales/en/translationEn.json b/src/locales/en/translationEn.json
@@ -1032,6 +1032,9 @@
         },
         "notifications": {
           "update": "Success! Your calendar settings have been updated."
+        },
+        "validations": {
+          "minimumPixel": "A minimum value of 100 pixels is required."
         }
       },
       "mandatoryFields": {

diff --git a/src/locales/fr/transalationFr.json b/src/locales/fr/transalationFr.json
@@ -1029,6 +1029,9 @@
         },
         "notification": {
           "update": "Succès ! Vos paramètres de calendrier ont été mis à jour."
+        },
+        "validations": {
+          "minimumPixel": "Une valeur minimale de 100 pixels est requise."
         }
       },
       "mandatoryFields": {

diff --git a/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx b/src/pages/Dashboard/Settings/CalendarSettings/CalendarSettings.jsx
@@ -160,7 +160,13 @@ function CalendarSettings({ setDirtyStatus, tabKey }) {
   const onSaveHandler = () => {
     let requiredFields =
       calendarSettingsFormFields?.GENERAL_SETTINGS?.filter((field) => field.required)?.map((field) => field.name) ?? [];
-    requiredFields = [...requiredFields, ['imageAspectRatio', 'thumbnail'], ['imageMaxWidth', 'thumbnail']];
+    requiredFields = [
+      ...requiredFields,
+      ['imageAspectRatio', 'thumbnail'],
+      ['imageMaxWidth', 'thumbnail'],
+      ['imageMaxWidth', 'large'],
+      ['imageAspectRatio', 'large'],
+    ];
     requiredFields = requiredFields.concat(
       calendarSettingsFormFields?.WIDGET_SETTINGS?.filter((field) => field.required)?.map((field) => field.name) ?? [],
     );