Merge pull request #4196 from unicef/fix/209087

Prevent to press the next button without choosing category.
unicef · Sep 6, 2024 · 2a5a6c7 · 2a5a6c7
2 parents b44520d + faaf7c0
commit 2a5a6c7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/frontend/src/components/grievances/CreateGrievance/Selection/Selection.tsx b/frontend/src/components/grievances/CreateGrievance/Selection/Selection.tsx
@@ -57,7 +57,7 @@ export function Selection({
       <Grid item xs={6}>
         <Field
           name="category"
-          label="Category*"
+          label="Category"
           onChange={(e) => {
             setFieldValue('issueType', null);
             handleChange(e);
@@ -66,20 +66,22 @@ export function Selection({
           choices={choicesData.grievanceTicketManualCategoryChoices}
           component={FormikSelectField}
           disabled={redirectedFromRelatedTicket}
+          required
         />
       </Grid>
       {showIssueType(values) && (
         <Grid item xs={6}>
           <Field
             name="issueType"
-            label="Issue Type*"
+            label="Issue Type"
             variant="outlined"
             choices={
               redirectedFromRelatedTicket
                 ? dataChangeIssueTypes
                 : issueTypeDict[values.category].subCategories
             }
             component={FormikSelectField}
+            required
           />
         </Grid>
       )}

diff --git a/frontend/src/components/grievances/utils/validateGrievance.ts b/frontend/src/components/grievances/utils/validateGrievance.ts
@@ -264,6 +264,19 @@ export function validateUsingSteps(
   //   'sex',
   // ];
 
+  if (!category) {
+    errors.category = 'Category is Required';
+  }
+  if (
+    category === GRIEVANCE_CATEGORIES.SENSITIVE_GRIEVANCE ||
+    category === GRIEVANCE_CATEGORIES.DATA_CHANGE ||
+    category === GRIEVANCE_CATEGORIES.GRIEVANCE_COMPLAINT
+  ) {
+    if (!issueType) {
+      errors.issueType = 'Issue Type is required';
+    }
+  }
+
   if (category === GRIEVANCE_CATEGORIES.DATA_CHANGE) {
     if (issueType === GRIEVANCE_ISSUE_TYPES.ADD_INDIVIDUAL) {
       if (!values.selectedHousehold && activeStep === GrievanceSteps.Lookup) {
@@ -415,15 +428,6 @@ export function validateUsingSteps(
       }
     }
   }
-  if (
-    category === GRIEVANCE_CATEGORIES.SENSITIVE_GRIEVANCE ||
-    category === GRIEVANCE_CATEGORIES.DATA_CHANGE ||
-    category === GRIEVANCE_CATEGORIES.GRIEVANCE_COMPLAINT
-  ) {
-    if (!issueType) {
-      errors.issueType = 'Issue Type is required';
-    }
-  }
 
   if (
     category === GRIEVANCE_CATEGORIES.DATA_CHANGE &&

diff --git a/frontend/src/containers/pages/accountability/feedback/CreateFeedbackPage.tsx b/frontend/src/containers/pages/accountability/feedback/CreateFeedbackPage.tsx
@@ -84,8 +84,8 @@ const BoxWithBorders = styled.div`
 
 export const validationSchemaWithSteps = (currentStep: number): unknown => {
   const datum = {
-    category: Yup.string().required('Category is required').nullable(),
-    issueType: Yup.string().required('Issue Type is required').nullable(),
+    category: Yup.string().required('Category is required'),
+    issueType: Yup.string().required('Issue Type is required'),
     admin: Yup.string().nullable(),
     description: Yup.string().nullable(),
     consent: Yup.bool().nullable(),