Merge pull request #3715 from unicef/fix-feedback-admin-area

[193982]-fix feedback admin 2
unicef · Mar 20, 2024 · 56c1c60 · 56c1c60
2 parents 710dac9 + a398e79
commit 56c1c60
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/frontend/src/containers/pages/accountability/feedback/CreateFeedbackPage.tsx b/frontend/src/containers/pages/accountability/feedback/CreateFeedbackPage.tsx
@@ -211,15 +211,15 @@ export function CreateFeedbackPage(): React.ReactElement {
   };
 
   const prepareVariables = (values): CreateFeedbackInput => ({
-    issueType: values.issueType,
+    area: values.area,
+    comments: values.comments,
+    consent: values.consent,
+    description: values.description,
     householdLookup: values.selectedHousehold?.id,
     individualLookup: values.selectedIndividual?.id,
-    description: values.description,
-    comments: values.comments,
-    admin2: values.admin2?.node?.id,
-    area: values.area,
+    issueType: values.issueType,
+    admin2: values.admin2,
     language: values.language,
-    consent: values.consent,
     program: values.program,
   });
 

diff --git a/frontend/src/containers/pages/accountability/feedback/EditFeedbackPage.tsx b/frontend/src/containers/pages/accountability/feedback/EditFeedbackPage.tsx
@@ -101,7 +101,7 @@ export const EditFeedbackPage = (): React.ReactElement => {
     selectedIndividual: feedback.individualLookup || null,
     description: feedback.description || null,
     comments: feedback.comments || null,
-    admin2: feedback.admin2?.name || null,
+    admin2: feedback.admin2?.id || null,
     area: feedback.area || null,
     language: feedback.language || null,
     consent: false,
@@ -115,7 +115,7 @@ export const EditFeedbackPage = (): React.ReactElement => {
     individualLookup: values.selectedIndividual?.id,
     description: values.description,
     comments: values.comments,
-    admin2: values.admin2?.node.id,
+    admin2: values.admin2,
     area: values.area,
     language: values.language,
     consent: values.consent,
@@ -218,13 +218,13 @@ export const EditFeedbackPage = (): React.ReactElement => {
                               >
                                 {feedback.householdLookup?.unicefId}
                               </BlackLink>
-                              ) : (
+                            ) : (
                               <div>
                                 {feedback.householdLookup?.id
                                   ? feedback.householdLookup?.unicefId
                                   : '-'}
                               </div>
-                              )}
+                            )}
                           </LabelizedField>
                         </Grid>
                         <Grid item xs={6}>
@@ -237,13 +237,13 @@ export const EditFeedbackPage = (): React.ReactElement => {
                               >
                                 {feedback.individualLookup?.unicefId}
                               </BlackLink>
-                              ) : (
+                            ) : (
                               <div>
                                 {feedback.individualLookup?.id
                                   ? feedback.individualLookup?.unicefId
                                   : '-'}
                               </div>
-                              )}
+                            )}
                           </LabelizedField>
                         </Grid>
                       </Grid>