fix(scheduling): update error message

packages/core/content-releases/admin/src/components/ReleaseModal.tsx

@@ -17,10 +17,10 @@ import {
 import { formatISO } from 'date-fns';
 import { utcToZonedTime, zonedTimeToUtc } from 'date-fns-tz';
 import { Formik, Form, useFormikContext } from 'formik';
-import { useIntl } from 'react-intl';
+import { MessageDescriptor, useIntl } from 'react-intl';
 import { useLocation } from 'react-router-dom';
 
-import { RELEASE_SCHEMA } from '../../../shared/validation-schemas';
+import { RELEASE_SCHEMA } from '../validation/schemas';
 import { pluginId } from '../pluginId';
 import { getTimezoneOffset } from '../utils/time';
 
@@ -111,7 +111,13 @@ export const ReleaseModal = ({
               <Form>
                 <Modal.Body>
                   <Flex direction="column" alignItems="stretch" gap={6}>
-                    <Field.Root name="name" error={errors.name} required>
+                    <Field.Root
+                      name="name"
+                      error={
+                        errors.name ? formatMessage(errors.name as MessageDescriptor) : undefined
+                      }
+                      required
+                    >
                       <Field.Label>
                         {formatMessage({
                           id: 'content-releases.modal.form.input.label.release-name',
@@ -158,7 +164,15 @@ export const ReleaseModal = ({
                       <>
                         <Flex gap={4} alignItems="start">
                           <Box width="100%">
-                            <Field.Root name="date" error={errors.date} required>
+                            <Field.Root
+                              name="date"
+                              error={
+                                errors.date
+                                  ? formatMessage(errors.date as MessageDescriptor)
+                                  : undefined
+                              }
+                              required
+                            >
                               <Field.Label>
                                 {formatMessage({
                                   id: 'content-releases.modal.form.input.label.date',
@@ -186,7 +200,15 @@ export const ReleaseModal = ({
                             </Field.Root>
                           </Box>
                           <Box width="100%">
-                            <Field.Root name="time" error={errors.time} required>
+                            <Field.Root
+                              name="time"
+                              error={
+                                errors.time
+                                  ? formatMessage(errors.time as MessageDescriptor)
+                                  : undefined
+                              }
+                              required
+                            >
                               <Field.Label>
                                 {formatMessage({
                                   id: 'content-releases.modal.form.input.label.time',
@@ -286,7 +308,11 @@ const TimezoneComponent = ({ timezoneOptions }: { timezoneOptions: ITimezoneOpti
   }, [setFieldValue, values.date, values.timezone]);
 
   return (
-    <Field.Root name="timezone" error={errors.timezone} required>
+    <Field.Root
+      name="timezone"
+      error={errors.timezone ? formatMessage(errors.timezone as MessageDescriptor) : undefined}
+      required
+    >
       <Field.Label>
         {formatMessage({
           id: 'content-releases.modal.form.input.label.timezone',

packages/core/content-releases/admin/src/validation/schemas.ts

@@ -0,0 +1,53 @@
+import * as yup from 'yup';
+import { translatedErrors } from '@strapi/admin/strapi-admin';
+
+export const RELEASE_SCHEMA = yup
+  .object()
+  .shape({
+    name: yup.string().trim().required({
+      id: translatedErrors.required.id,
+      defaultMessage: 'This field is required',
+    }),
+    scheduledAt: yup.string().nullable(),
+    isScheduled: yup.boolean().optional(),
+    time: yup.string().when('isScheduled', {
+      is: true,
+      then: yup.string().trim().required({
+        id: translatedErrors.required.id,
+        defaultMessage: 'This field is required',
+      }),
+      otherwise: yup.string().nullable(),
+    }),
+    timezone: yup.string().when('isScheduled', {
+      is: true,
+      then: yup
+        .string()
+        .required({
+          id: translatedErrors.required.id,
+          defaultMessage: 'This field is required',
+        })
+        .nullable(),
+      otherwise: yup.string().nullable(),
+    }),
+    date: yup.string().when('isScheduled', {
+      is: true,
+      then: yup
+        .string()
+        .required({
+          id: translatedErrors.required.id,
+          defaultMessage: 'This field is required',
+        })
+        .nullable(),
+      otherwise: yup.string().nullable(),
+    }),
+  })
+  .required()
+  .noUnknown();
+
+export const SETTINGS_SCHEMA = yup
+  .object()
+  .shape({
+    defaultTimezone: yup.string().nullable().default(null),
+  })
+  .required()
+  .noUnknown();

packages/core/content-releases/server/src/controllers/validation/release.ts

@@ -1,5 +1,5 @@
 import { yup, validateYupSchema } from '@strapi/utils';
-import { RELEASE_SCHEMA } from '../../../../shared/validation-schemas';
+import { RELEASE_SCHEMA } from '../validation/schemas';
 
 const FIND_BY_DOCUMENT_ATTACHED_PARAMS_SCHEMA = yup
   .object()

packages/core/content-releases/server/src/controllers/validation/schemas.ts

@@ -0,0 +1,23 @@
+import * as yup from 'yup';
+
+export const RELEASE_SCHEMA = yup
+  .object()
+  .shape({
+    name: yup.string().trim().required(),
+    scheduledAt: yup.string().nullable(),
+    timezone: yup.string().when('scheduledAt', {
+      is: (value: any) => value !== null && value !== undefined,
+      then: yup.string().required(),
+      otherwise: yup.string().nullable(),
+    }),
+  })
+  .required()
+  .noUnknown();
+
+export const SETTINGS_SCHEMA = yup
+  .object()
+  .shape({
+    defaultTimezone: yup.string().nullable().default(null),
+  })
+  .required()
+  .noUnknown();

packages/core/content-releases/server/src/controllers/validation/settings.ts

@@ -1,4 +1,4 @@
 import { validateYupSchema } from '@strapi/utils';
-import { SETTINGS_SCHEMA } from '../../../../shared/validation-schemas';
+import { SETTINGS_SCHEMA } from '../validation/schemas';
 
 export const validateSettings = validateYupSchema(SETTINGS_SCHEMA);