Merge pull request #280 from jadmsaadaot/SUBMIT-task#343

Fix condition number display and date display
bcgov · Feb 4, 2025 · f1b9595 · f1b9595
2 parents b333118 + 22dfff1
commit f1b9595
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 44 deletions.
diff --git a/submit-api/src/submit_api/models/package_metadata.py b/submit-api/src/submit_api/models/package_metadata.py
@@ -17,7 +17,8 @@ class PackageMetadataFields(enum.Enum):
 
     CONSULTATION_CHECK_COMPLETED_ON = 'cc_completed_on'
     CONSULTATION_CHECK_START_DATE = 'cc_start_date'
-    CONDITION = 'condition'
+    CONDITION = 'main_condition'
+    SUPPORTING_CONDITIONS = 'supporting_conditions'
     REVIEW_COMPLETED_ON = 'review_completed_on'
     REVIEW_START_DATE = 'review_start_date'
 

diff --git a/submit-api/src/submit_api/services/package.py b/submit-api/src/submit_api/services/package.py
@@ -75,6 +75,8 @@ def create_new_package_from_original(cls, current_package_id, session):
         new_metadata = {
             PackageMetadataFields.CONDITION.value: current_package.meta.json.get(
                 PackageMetadataFields.CONDITION.value, None),
+            PackageMetadataFields.SUPPORTING_CONDITIONS.value: current_package.meta.json.get(
+                PackageMetadataFields.SUPPORTING_CONDITIONS.value, None),
         }
         cls._create_package_metadata(
             session, new_package.id, new_metadata)

diff --git a/submit-api/src/submit_api/services/submission_review.py b/submit-api/src/submit_api/services/submission_review.py
@@ -290,6 +290,7 @@ def _update_package_metadata_mp_rejection(cls, item, session):
 
         session.add(item)
         session.add(package_metadata)
+        session.flush()
         current_app.logger.info(f"Package metadata updated for package {item.package_id}.")
 
     @classmethod

diff --git a/submit-web/src/components/Projects/ProjectTable/ProponentTableRow.tsx b/submit-web/src/components/Projects/ProjectTable/ProponentTableRow.tsx
@@ -47,7 +47,7 @@ export default function ProponentTableRow({ subPackage }: ProjectRowProps) {
           </Link>
         </StyledProjectTableCell>
         <StyledProjectTableCell align="left">
-          {dateUtils.formatDate(String(subPackage.submitted_on))}
+          {dateUtils.formatDate(subPackage.submitted_on)}
         </StyledProjectTableCell>
         <StyledProjectTableCell align="left">
           {subPackage.submitted_by ?? ""}

diff --git a/submit-web/src/components/Projects/ProjectTable/StaffTableRow.tsx b/submit-web/src/components/Projects/ProjectTable/StaffTableRow.tsx
@@ -97,7 +97,7 @@ export default function StaffTableRow({ submissionPackage }: ProjectRowProps) {
             color: BCDesignTokens.typographyFontSizeBody,
           }}
         >
-          {dateutils.formatDate(String(submitted_on))}
+          {dateutils.formatDate(submitted_on)}
         </StyledProjectTableCell>
         <StyledProjectTableCell
           align="right"

diff --git a/submit-web/src/components/Submission/InfoBox.tsx b/submit-web/src/components/Submission/InfoBox.tsx
@@ -7,6 +7,8 @@ import { ReactNode } from "@tanstack/react-router";
 import { BCDesignTokens } from "epic.theme";
 import { Case, Switch } from "react-if";
 import VersionGroup from "./VersionGroup";
+import { get, isArray } from "lodash";
+import { useMemo } from "react";
 
 type InfoBoxItemProps = {
   label?: string;
@@ -44,13 +46,23 @@ export const InfoBox = ({ submissionPackage }: InfoBoxProps) => {
 };
 
 const ProponentInfoBox = ({ submissionPackage }: InfoBoxProps) => {
-  const {
-    submitted_on,
-    date_review_completed,
-    supporting_condition,
-    submitted_by,
-    condition,
-  } = submissionPackage.meta || {};
+  const { submitted_on, date_review_completed, submitted_by } =
+    submissionPackage.meta || {};
+
+  const condition = useMemo(() => {
+    return get(submissionPackage, "meta.main_condition.condition_number", "");
+  }, [submissionPackage]);
+
+  const supportingConditions = useMemo(() => {
+    const conditions = get(submissionPackage, "meta.supporting_conditions");
+    if (!conditions || !isArray(conditions)) return "";
+
+    return conditions
+      .map((condition) => condition.condition_number)
+      .filter(Boolean)
+      .join(", ");
+  }, [submissionPackage]);
+
   return (
     <Grid
       container
@@ -94,7 +106,7 @@ const ProponentInfoBox = ({ submissionPackage }: InfoBoxProps) => {
       <Grid item xs={12} lg={4} container>
         <InfoBoxItem
           label={"Supporting Conditions"}
-          value={supporting_condition}
+          value={supportingConditions}
         />
       </Grid>
       <Grid item xs={12} lg={4} container>
@@ -107,13 +119,30 @@ const ProponentInfoBox = ({ submissionPackage }: InfoBoxProps) => {
 const StaffInfoBox = ({ submissionPackage }: InfoBoxProps) => {
   const {
     review_start_date,
-    supporting_condition,
     review_completed_on,
     cc_start_date,
     cc_completed_on,
   } = submissionPackage.meta || {};
   const { submitted_on, submitted_by, version } = submissionPackage;
 
+  const condition = useMemo(() => {
+    if (!submissionPackage.meta) return "";
+    const condition = get(submissionPackage, "meta.main_condition");
+
+    return get(condition, "condition_number", "");
+  }, [submissionPackage]);
+
+  const supportingConditions = useMemo(() => {
+    if (!submissionPackage.meta) return "";
+    const conditions = get(submissionPackage, "meta.supporting_conditions");
+    if (!conditions || !isArray(conditions)) return "";
+
+    return conditions
+      .map((condition) => condition.condition_number)
+      .filter(Boolean)
+      .join(", ");
+  }, [submissionPackage]);
+
   return (
     <Grid
       container
@@ -139,18 +168,16 @@ const StaffInfoBox = ({ submissionPackage }: InfoBoxProps) => {
       <Grid item xs={12} lg={4} container>
         <InfoBoxItem
           label={"Submitted on"}
-          value={dateUtils.formatDate(String(submitted_on))}
+          value={dateUtils.formatDate(submitted_on)}
         />
       </Grid>
       <Grid item xs={12} lg={4} container>
-        <InfoBoxItem label={"Condition"} />
+        <InfoBoxItem label={"Condition"} value={condition} />
       </Grid>
       <Grid item xs={12} lg={4} container>
         <InfoBoxItem
           label={"CC Start Date"}
-          value={
-            dateUtils.formatDate(cc_start_date)
-          }
+          value={dateUtils.formatDate(cc_start_date)}
         />
       </Grid>
       <Grid item xs={12} lg={4} container>
@@ -159,25 +186,21 @@ const StaffInfoBox = ({ submissionPackage }: InfoBoxProps) => {
       <Grid item xs={12} lg={4} container>
         <InfoBoxItem
           label={"Supporting Conditions"}
-          value={supporting_condition}
+          value={supportingConditions}
         />
       </Grid>
       <Grid item xs={12} lg={4} container>
         <InfoBoxItem
           label={"CC Completed"}
-          value={
-            dateUtils.formatDate(cc_completed_on)
-          }
+          value={dateUtils.formatDate(cc_completed_on)}
         />
       </Grid>
       <Grid item xs={12} lg={4} container></Grid>
       <Grid item xs={12} lg={4} container></Grid>
       <Grid item xs={12} lg={4} container>
         <InfoBoxItem
           label={"Review Start Date"}
-          value={
-              dateUtils.formatDate(review_start_date)
-          }
+          value={dateUtils.formatDate(review_start_date)}
         />
       </Grid>
       <Grid item xs={12} lg={4} container></Grid>
@@ -191,9 +214,7 @@ const StaffInfoBox = ({ submissionPackage }: InfoBoxProps) => {
       >
         <InfoBoxItem
           label={"Review Completed"}
-          value={
-            dateUtils.formatDate(review_completed_on)
-          }
+          value={dateUtils.formatDate(review_completed_on)}
         />
       </Grid>
     </Grid>

diff --git a/submit-web/src/components/Submission/UpdateRequestWidget/RequestSection.tsx b/submit-web/src/components/Submission/UpdateRequestWidget/RequestSection.tsx
@@ -4,8 +4,7 @@ import dateUtils from "@/utils/dateUtils";
 import { UPDATE_REQUEST_TYPE, UpdateRequest } from "@/models/UpdateRequest";
 import { Case, Switch, Unless, When } from "react-if";
 import { AddRequestNoteSection } from "./AddRequestNoteSection";
-import { SubmissionPackage } from "@/models/Package";
-import { SUBMISSION_ITEM_STATUS } from "@/models/Submission";
+import { PACKAGE_STATUS, SubmissionPackage } from "@/models/Package";
 import { checkIfEAO } from "@/components/Shared/PermissionGate/utils";
 import { useAccount } from "@/store/accountStore";
 
@@ -20,20 +19,18 @@ export default function RequestSection({
 }: UpdateRequestProps) {
   const { reason, created_date, created_by, note, type, submission_item_ids } =
     updateRequest;
-  const createdDate = dateUtils.formatDate(created_date)
+  const createdDate = dateUtils.formatDate(created_date);
 
   const { roles } = useAccount();
   const isEAO = checkIfEAO(roles || []);
 
   const submissionItems = submissionPackage.items.filter((item) =>
-    submission_item_ids.includes(item.id)
+    submission_item_ids.includes(item.id),
   );
 
   const showNoteSection =
     (isEAO &&
-      submissionPackage.status.includes(
-        SUBMISSION_ITEM_STATUS.SUBMITTED.value
-      )) ||
+      submissionPackage.status.includes(PACKAGE_STATUS.SUBMITTED.value)) ||
     (!isEAO && Boolean(note));
 
   return (

diff --git a/submit-web/src/components/Submission/utils.ts b/submit-web/src/components/Submission/utils.ts
@@ -1,4 +1,4 @@
-import { SubmissionPackage } from "@/models/Package";
+import { SubmissionPackage, SubmissionPackageMeta } from "@/models/Package";
 import {
   SUBMISSION_ITEM_STATUS,
   SubmissionItemStatus,
@@ -24,3 +24,11 @@ export const isSubmissionItemReadyToSubmit = ({
     submissionItem.status === SUBMISSION_ITEM_STATUS.COMPLETED.value;
   return isSubmissionItemCompleted;
 };
+
+export const getConditionFromPackageMeta = (
+  submissionPackageMeta: SubmissionPackageMeta,
+) => {
+  const condition = submissionPackageMeta?.main_condition;
+
+  return condition;
+};
diff --git a/submit-web/src/models/Package.ts b/submit-web/src/models/Package.ts
@@ -84,7 +84,7 @@ export const PACKAGE_STATUS: Record<
   },
 };
 
-export type SubmissionPackageMeta = Record<string, number | string>;
+export type SubmissionPackageMeta = Record<string, any>; // eslint-disable-line @typescript-eslint/no-explicit-any
 
 export type PackageVersion = {
   id: number;

diff --git a/submit-web/src/utils/dateUtils.ts b/submit-web/src/utils/dateUtils.ts
@@ -1,7 +1,6 @@
 import dayjs, { Dayjs } from "dayjs";
 import utc from "dayjs/plugin/utc";
 
-
 type UnitOfTime = "second" | "minute" | "hour" | "day" | "month" | "year";
 
 export const DATE_FORMAT = "YYYY-MM-DD";
@@ -13,12 +12,15 @@ dayjs.extend(utc);
  * @param format Valid date format
  * @returns Formatted date string
  */
-const formatDate = (date: string | number, format?: string) => {
-    if (!date) return ""; // Handle null or undefined values
-
-    // server date is in UTC, convert to local timezone
-    return dayjs.utc(String(date)).local().format(format || DATE_FORMAT);
-  };
+const formatDate = (date?: string | number, format?: string) => {
+  if (!date) return ""; // Handle null or undefined values
+
+  // server date is in UTC, convert to local timezone
+  return dayjs
+    .utc(String(date))
+    .local()
+    .format(format ?? DATE_FORMAT);
+};
 
 const diff = (fromDate: string, toDate: string, unitOfTime: UnitOfTime) => {
   return dayjs(fromDate).diff(dayjs(toDate), unitOfTime);
@@ -37,4 +39,4 @@ export default {
   diff,
   add,
   dateToISO,
-};
+};