No validate end date for existing programmes (#3847)

unicef · May 13, 2024 · 67d8ccc · 67d8ccc
1 parent 77d943e
commit 67d8ccc
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/frontend/src/components/programs/CreateProgram/programValidationSchema.ts b/frontend/src/components/programs/CreateProgram/programValidationSchema.ts
@@ -7,22 +7,25 @@ export const programValidationSchema = (
   t: TFunction<'translation', undefined>,
 ): Yup.ObjectSchema<any, any, any, any> =>
   Yup.object().shape({
+    editMode: Yup.boolean(),
     name: Yup.string()
       .required(t('Programme Name is required'))
       .min(3, t('Too short'))
       .max(150, t('Too long')),
     programmeCode: Yup.string()
       .min(4, t('Programme code has to be 4 characters'))
       .max(4, t('Programme code has to be 4 characters'))
-      .matches(/^[A-Za-z0-9\-/.]{4}$/, t('Programme code may only contain letters, digits and \'-\', \'/\', \'.\'.'))
+      .matches(
+        /^[A-Za-z0-9\-/.]{4}$/,
+        t("Programme code may only contain letters, digits and '-', '/', '.'."),
+      )
       .nullable(),
     startDate: Yup.date()
       .required(t('Start Date is required'))
       .transform((v) => (v instanceof Date && !isNaN(v.getTime()) ? v : null)),
     endDate: Yup.date()
       .transform((curr, orig) => (orig === '' ? null : curr))
       .required(t('End Date is required'))
-      .min(today, t('End Date cannot be in the past'))
       .when('startDate', (startDate, schema) =>
         startDate instanceof Date && !isNaN(startDate.getTime())
           ? schema.min(
@@ -32,7 +35,12 @@ export const programValidationSchema = (
               ).format('YYYY-MM-DD')}`,
             )
           : schema,
-      ),
+      )
+      .when('editMode', ([editMode], schema) => {
+        return editMode
+          ? schema
+          : schema.min(today, t('End Date cannot be in the past'));
+      }),
     sector: Yup.string().required(t('Sector is required')),
     dataCollectingTypeCode: Yup.string().required(
       t('Data Collecting Type is required'),

diff --git a/frontend/src/containers/forms/ProgramForm.tsx b/frontend/src/containers/forms/ProgramForm.tsx
@@ -79,7 +79,7 @@ export const ProgramForm = ({ values }: ProgramFormPropTypes): ReactElement => {
             initialFocusedDate={values.startDate}
             fullWidth
             decoratorEnd={<CalendarTodayRoundedIcon color="disabled" />}
-            minDate={today}
+            minDate={values.startDate}
             data-cy="input-end-date"
           />
         </Grid>

diff --git a/frontend/src/containers/pages/program/CreateProgramPage.tsx b/frontend/src/containers/pages/program/CreateProgramPage.tsx
@@ -43,6 +43,7 @@ export const CreateProgramPage = (): ReactElement => {
   });
 
   const handleSubmit = async (values): Promise<void> => {
+    delete values.editMode;
     const budgetValue = parseFloat(values.budget) ?? 0;
     const budgetToFixed = !Number.isNaN(budgetValue)
       ? budgetValue.toFixed(2)
@@ -86,6 +87,7 @@ export const CreateProgramPage = (): ReactElement => {
   };
 
   const initialValues = {
+    editMode: false,
     name: '',
     programmeCode: '',
     startDate: '',

diff --git a/frontend/src/containers/pages/program/DuplicateProgramPage.tsx b/frontend/src/containers/pages/program/DuplicateProgramPage.tsx
@@ -44,6 +44,7 @@ export const DuplicateProgramPage = (): ReactElement => {
     useUserPartnerChoicesQuery();
 
   const handleSubmit = async (values): Promise<void> => {
+    delete values.editMode;
     const budgetValue = parseFloat(values.budget) ?? 0;
     const budgetToFixed = !Number.isNaN(budgetValue)
       ? budgetValue.toFixed(2)
@@ -103,6 +104,7 @@ export const DuplicateProgramPage = (): ReactElement => {
   } = data.program;
 
   const initialValues = {
+    editMode: false,
     name: `Copy of Programme: (${name})`,
     programmeCode: '',
     startDate,

diff --git a/frontend/src/containers/pages/program/EditProgramPage.tsx b/frontend/src/containers/pages/program/EditProgramPage.tsx
@@ -85,6 +85,7 @@ export const EditProgramPage = (): ReactElement => {
   } = data.program;
 
   const handleSubmit = async (values): Promise<void> => {
+    delete values.editMode;
     const budgetValue = parseFloat(values.budget) ?? 0;
     const budgetToFixed = !Number.isNaN(budgetValue)
       ? budgetValue.toFixed(2)
@@ -123,6 +124,7 @@ export const EditProgramPage = (): ReactElement => {
   };
 
   const initialValues = {
+    editMode: true,
     name,
     programmeCode,
     startDate,