Merge remote-tracking branch 'bcgov/develop' into SUBMIT-task#387

bcgov · Feb 18, 2025 · cdb2159 · cdb2159
2 parents 1f28521 + ba62451
commit cdb2159
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/submit-api/migrations/versions/1f4745895453_.py b/submit-api/migrations/versions/1f4745895453_.py
@@ -20,7 +20,7 @@ def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
 
     with op.batch_alter_table('update_requests', schema=None) as batch_op:
-        batch_op.add_column(sa.Column('submission_item_types', sa.ARRAY(sa.Integer()), nullable=False))
+        batch_op.add_column(sa.Column('submission_item_types', sa.ARRAY(sa.Integer()), nullable=False, server_default=sa.text("'{}'::INTEGER[]")))
         batch_op.drop_column('submission_item_ids')
 
     # ### end Alembic commands ###
@@ -30,5 +30,5 @@ def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('update_requests', schema=None) as batch_op:
         batch_op.add_column(sa.Column('submission_item_ids', postgresql.ARRAY(sa.INTEGER()), autoincrement=False, nullable=False))
-        batch_op.drop_column('submission_item_types')
+        batch_op.drop_column('submission_item_types', server_default=None)
     # ### end Alembic commands ###
diff --git a/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestSection.tsx b/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestSection.tsx
@@ -70,7 +70,7 @@ export default function AddRequestSection({
   const filteredItems = useMemo(() => {
     return submissionPackage.items.filter(
       (item) =>
-        item.type.submission_method === SUBMISSION_ITEM_METHOD.DOCUMENT_UPLOAD,
+        item.type.submission_method === SUBMISSION_ITEM_METHOD.DOCUMENT_UPLOAD
     );
   }, [submissionPackage.items]);
 
@@ -82,7 +82,7 @@ export default function AddRequestSection({
             variant="body1"
             sx={{
               pt: BCDesignTokens.layoutPaddingLarge,
-              fontWeight: BCDesignTokens.typographyBoldBody,
+              fontWeight: 700,
               mb: BCDesignTokens.layoutMarginSmall,
             }}
           >
@@ -101,12 +101,12 @@ export default function AddRequestSection({
             <Typography
               variant="body1"
               sx={{
-                fontWeight: BCDesignTokens.typographyBoldBody,
-                pt: BCDesignTokens.layoutPaddingLarge,
+                fontWeight: 700,
+
                 mb: BCDesignTokens.layoutMarginSmall,
               }}
             >
-              Request reason
+              Request Note
             </Typography>
             <ControlledTextField
               name="reason"

diff --git a/...ts/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx b/...ts/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/FormFieldSection.tsx
@@ -11,11 +11,13 @@ import { ConsultationRecordForm } from "../constants";
 interface FormFieldSectionProps {
   methods: UseFormReturn<ConsultationRecordForm>; // Replace FormValues with your actual form schema interface
   errors: FieldErrors<ConsultationRecordForm>; // Replace FormValues with your actual form schema interface
+  partiesList: Array<string>;
 }
 
 export default function FormFieldSection({
   methods,
   errors,
+  partiesList,
 }: FormFieldSectionProps) {
   const { fields, append, remove } = useFieldArray({
     control: methods.control,
@@ -64,10 +66,9 @@ export default function FormFieldSection({
                 paddingLeft: BCDesignTokens.layoutPaddingSmall,
               }}
             >
-              <li>Ho’rem</li>
-              <li>Nustuk</li>
-              <li>Langkuem</li>
-              <li>Miskuuck</li>
+              {partiesList.map((stakeholder, index) => (
+                <li key={index}>{stakeholder}</li>
+              ))}
             </ul>
           </Typography>
           <Grid item container xs={12} spacing={2}>

diff --git a/...rc/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/index.tsx b/...rc/components/SubmissionItem/ConsultationRecord/ConsultationRecordProponentView/index.tsx
@@ -22,6 +22,8 @@ import FormFieldSection from "./FormFieldSection";
 import ActionButtons from "./ActionButtons";
 import { consultationRecordSchema, ConsultationRecordForm } from "../constants";
 import { SubmissionFormContainer } from "../../SubmissionFormContainer";
+import { getSubmissionPackageQueryOptions } from "@/hooks/api/usePackages";
+import { SubmissionPackage } from "@/models/Package";
 
 export const ConsultationRecordProponentView = () => {
   const {
@@ -45,6 +47,16 @@ export const ConsultationRecordProponentView = () => {
     Number(submissionItemId),
   ]);
 
+  const submissionPackage = queryClient.getQueryData<SubmissionPackage>(
+    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 = () => {
       <FormProvider {...methods}>
         <Form onSubmit={handleSubmit(handleCompleteForm)}>
           <Grid container spacing={BCDesignTokens.layoutMarginMedium}>
-            <FormFieldSection errors={errors} methods={methods} />
+            <FormFieldSection errors={errors} methods={methods} partiesList={partiesList} />
             <Grid item xs={12}>
               <DocumentUploadSection />
             </Grid>