From 0e2025da4560319283eb94b8cca668a28d23e9ba Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Tue, 18 Feb 2025 08:54:44 -0800 Subject: [PATCH 1/2] Adding consulted parties from condition repo --- .../FormFieldSection.tsx | 43 ++++++++++--------- .../ConsultationRecordProponentView/index.tsx | 14 +++++- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/submit-web/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx b/submit-web/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx index 1af674f5..99deec3b 100644 --- a/submit-web/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx +++ b/submit-web/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx @@ -11,11 +11,13 @@ import { ConsultationRecordForm } from "../constants"; interface FormFieldSectionProps { methods: UseFormReturn; // Replace FormValues with your actual form schema interface errors: FieldErrors; // Replace FormValues with your actual form schema interface + partiesList: Array; } export default function FormFieldSection({ methods, errors, + partiesList, }: FormFieldSectionProps) { const { fields, append, remove } = useFieldArray({ control: methods.control, @@ -64,32 +66,31 @@ export default function FormFieldSection({ paddingLeft: BCDesignTokens.layoutPaddingSmall, }} > -
  • Ho’rem
  • -
  • Nustuk
  • -
  • Langkuem
  • -
  • Miskuuck
  • + {partiesList.map((stakeholder, index) => ( +
  • {stakeholder}
  • + ))} {fields.map((field, index) => ( - - - + + + + + 1}> + remove(index)}> + + + - 1}> - remove(index)}> - - - - - ))} + ))} { const { @@ -45,6 +47,16 @@ export const ConsultationRecordProponentView = () => { Number(submissionItemId), ]); + const submissionPackage = queryClient.getQueryData( + getSubmissionPackageQueryOptions({ + packageId: Number(submissionPackageId), + }).queryKey, + ); + + const partiesList = + submissionPackage?.meta?.main_condition?.condition_attributes + ?.parties_required_to_be_consulted?.split(", ") || []; + const formSubmission = submissionItem?.submissions?.find( (submission) => submission.type === SUBMISSION_TYPE.FORM, ); @@ -179,7 +191,7 @@ export const ConsultationRecordProponentView = () => {
    - + From 8594651a00747b2ba3f8e0cd5a97df69938a558c Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Tue, 18 Feb 2025 08:59:30 -0800 Subject: [PATCH 2/2] fixing indentation --- .../FormFieldSection.tsx | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/submit-web/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx b/submit-web/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx index 99deec3b..1499df14 100644 --- a/submit-web/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx +++ b/submit-web/src/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx @@ -73,24 +73,24 @@ export default function FormFieldSection({ {fields.map((field, index) => ( - - - - - 1}> - remove(index)}> - - - + + + - ))} + 1}> + remove(index)}> + + + + + ))}