Merge pull request #170 from djnunez-aot/bug-fix

Fix re render error on CR form
bcgov · Nov 19, 2024 · 4002fc0 · 4002fc0
2 parents 859889c + 668c645
commit 4002fc0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 29 deletions.
diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
@@ -29,7 +29,11 @@ export default function StaffSubmissionItemTableRow({
 
   return (
     <>
-      <PackageTableRow key={`row-${item.name}`} error={error}>
+      <PackageTableRow
+        key={`row-${item.name}`}
+        error={error}
+        onClick={onActionClick}
+      >
         <SubmissionItemTableCell>
           <MuiLink
             color="inherit"

diff --git a/...onents/SubmissionItem/ConsultationRecord/ConsultationRecordStaffView/FormFieldSection.tsx b/...onents/SubmissionItem/ConsultationRecord/ConsultationRecordStaffView/FormFieldSection.tsx
@@ -110,7 +110,7 @@ export default function FormFieldSection({
               Were all parties listed above consulted/engaged on the development
               of this plan?
             </Typography>
-            <RadioGroup defaultValue={formData.allPartiesConsulted}>
+            <RadioGroup value={formData.allPartiesConsulted}>
               <YesNoRadioOptions disabled error={false} />
             </RadioGroup>
           </Grid>
@@ -119,7 +119,7 @@ export default function FormFieldSection({
               Was the plan provided to all parties listed above for review and
               comment during plan development?
             </Typography>
-            <RadioGroup defaultValue={formData.planWasReviewed}>
+            <RadioGroup value={formData.planWasReviewed}>
               <YesNoRadioOptions disabled error={false} />
             </RadioGroup>
           </Grid>
@@ -129,9 +129,7 @@ export default function FormFieldSection({
               on how comments were fully and impartially considered and
               addressed in the plan?
             </Typography>
-            <RadioGroup
-              defaultValue={formData.writtenExplanationsProvidedToParties}
-            >
+            <RadioGroup value={formData.writtenExplanationsProvidedToParties}>
               <YesNoRadioOptions disabled error={false} />
             </RadioGroup>
           </Grid>
@@ -142,7 +140,7 @@ export default function FormFieldSection({
               addressed?
             </Typography>
             <RadioGroup
-              defaultValue={formData.writtenExplanationsProvidedToCommenters}
+              value={formData.writtenExplanationsProvidedToCommenters}
             >
               <YesNoRadioOptions disabled error={false} />
             </RadioGroup>

diff --git a/...eb/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordStaffView/index.tsx b/...eb/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordStaffView/index.tsx
@@ -2,9 +2,6 @@ import { useMemo } from "react";
 import { Navigate, useParams } from "@tanstack/react-router";
 import { useGetAccountProject } from "@/hooks/api/useProjects";
 import { SUBMISSION_TYPE } from "@/models/Submission";
-import { booleanToString } from "@/utils";
-import { useQueryClient } from "@tanstack/react-query";
-import { SubmissionItem } from "@/models/SubmissionItem";
 import { Box, Grid, Typography } from "@mui/material";
 import { ContentBox } from "@/components/Shared/ContentBox";
 import { BCDesignTokens } from "epic.theme";
@@ -15,47 +12,43 @@ import BarTitle from "@/components/Shared/Text/BarTitle";
 import InternalDocumentSection from "./InternalDocumentSection";
 import ActionButtons from "./ActionButtons";
 import FormFieldSection from "./FormFieldSection";
+import { useGetSubmissionItemForStaff } from "@/hooks/api/useItems";
 
 export const ConsultationRecordStaffView = () => {
   const { projectId: accountProjectIdParam, submissionId: submissionItemId } =
     useParams({
       from: "/staff/_staffLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/submissions/$submissionId",
     });
   const accountProjectId = Number(accountProjectIdParam);
+  const submissionId = Number(submissionItemId);
   const { data: accountProject } = useGetAccountProject({
     accountProjectId,
   });
 
-  const queryClient = useQueryClient();
-
-  const submissionItem = queryClient.getQueryData<SubmissionItem>([
-    "item",
-    Number(submissionItemId),
-  ]);
+  const { data: submissionItem } = useGetSubmissionItemForStaff({
+    itemId: submissionId,
+  });
 
   const formSubmission = submissionItem?.submissions?.find(
-    (submission) => submission.type === SUBMISSION_TYPE.FORM
+    (submission) => submission.type === SUBMISSION_TYPE.FORM,
   );
 
   const formData = useMemo(() => {
     if (!formSubmission?.submitted_form?.submission_json) return {};
 
     return {
       ...formSubmission.submitted_form.submission_json,
-      allPartiesConsulted: booleanToString(
-        formSubmission.submitted_form.submission_json.allPartiesConsulted
-      ),
-      planWasReviewed: booleanToString(
-        formSubmission.submitted_form.submission_json.planWasReviewed
-      ),
-      writtenExplanationsProvidedToParties: booleanToString(
+      allPartiesConsulted:
+        formSubmission.submitted_form.submission_json.allPartiesConsulted,
+      planWasReviewed:
+        formSubmission.submitted_form.submission_json.planWasReviewed,
+
+      writtenExplanationsProvidedToParties:
         formSubmission.submitted_form.submission_json
-          .writtenExplanationsProvidedToParties
-      ),
-      writtenExplanationsProvidedToCommenters: booleanToString(
+          .writtenExplanationsProvidedToParties,
+      writtenExplanationsProvidedToCommenters:
         formSubmission.submitted_form.submission_json
-          .writtenExplanationsProvidedToCommenters
-      ),
+          .writtenExplanationsProvidedToCommenters,
     };
   }, [formSubmission]);