Merge pull request #309 from djnunez-aot/update-on-notes

Update to Submission item table
bcgov · Feb 26, 2025 · 805f51c · 805f51c
2 parents 5c2b8ce + 6484bad
commit 805f51c
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 50 deletions.
diff --git a/submit-web/src/components/Submission/DocumentRow/index.tsx b/submit-web/src/components/Submission/DocumentRow/index.tsx
@@ -55,7 +55,7 @@ export default function DocumentRow({
   return (
     <>
       <TableRow sx={{ "& > *": { borderBottom: "unset" } }}>
-        <SubmitTableCell>
+        <SubmitTableCell width={"50%"}>
           <Typography
             variant="body1"
             color="inherit"
@@ -78,10 +78,12 @@ export default function DocumentRow({
             )}
           </Typography>
         </SubmitTableCell>
-        <SubmitTableCell align="right">{submitted_by || ""}</SubmitTableCell>
-        <SubmitTableCell align="right">
+        <SubmitTableCell align="left" width={"10%"}>
+          {submitted_by || ""}
+        </SubmitTableCell>
+        <SubmitTableCell align="right" width={"10%"}>
           {version}
-          <IconButton onClick={() => setExpanded(!expanded)}>
+          <IconButton onClick={() => setExpanded(!expanded)} sx={{ p: 0 }}>
             <ExpandMoreIcon
               sx={{
                 transform: expanded ? "rotate(180deg)" : "rotate(0deg)",
@@ -90,14 +92,14 @@ export default function DocumentRow({
             />
           </IconButton>
         </SubmitTableCell>
-        <SubmitTableCell align="right">
+        <SubmitTableCell align="right" width={"20%"}>
           <StatusCell submittedDocument={documentSubmission} />
         </SubmitTableCell>
-        <SubmitTableCell align="right" colSpan={1}></SubmitTableCell>
+        <SubmitTableCell align="right" width={"10%"}></SubmitTableCell>
       </TableRow>
       <TableRow>
         <SubmitTableCell
-          colSpan={5}
+          colSpan={6}
           style={{ paddingBottom: 0, paddingTop: 0, borderTop: "none" }}
         >
           <Collapse in={expanded} mountOnEnter unmountOnExit>

diff --git a/submit-web/src/components/Submission/ItemsTable/index.tsx b/submit-web/src/components/Submission/ItemsTable/index.tsx
@@ -48,7 +48,7 @@ export default function ItemsTable({ submissionPackage }: ItemsTableProps) {
           }}
         >
           <TableRow>
-            <SubmitTableHeadCell>
+            <SubmitTableHeadCell width={"50%"}>
               <Typography
                 variant="body2"
                 sx={{
@@ -61,10 +61,18 @@ export default function ItemsTable({ submissionPackage }: ItemsTableProps) {
                 Form/Document
               </Typography>
             </SubmitTableHeadCell>
-            <SubmitTableHeadCell align="right">Uploaded by</SubmitTableHeadCell>
-            <SubmitTableHeadCell align="right">Version</SubmitTableHeadCell>
-            <SubmitTableHeadCell align="center">Status</SubmitTableHeadCell>
-            <SubmitTableHeadCell align="center">Actions</SubmitTableHeadCell>
+            <SubmitTableHeadCell width={"10%"} align="left">
+              Uploaded by
+            </SubmitTableHeadCell>
+            <SubmitTableHeadCell width={"10%"} align="right">
+              Version
+            </SubmitTableHeadCell>
+            <SubmitTableHeadCell width={"20%"} align="center">
+              Status
+            </SubmitTableHeadCell>
+            <SubmitTableHeadCell width={"10%"} align="left">
+              Actions
+            </SubmitTableHeadCell>
           </TableRow>
         </TableHead>
         <TableBody>

diff --git a/...-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx b/...-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
@@ -1,4 +1,5 @@
 import {
+  Box,
   Link as MuiLink,
   TableCell,
   TableRow,
@@ -47,25 +48,25 @@ export default function ProponentSubmissionItemTableRow({
   const submissionPackage = queryClient.getQueryData<SubmissionPackage>(
     getSubmissionPackageQueryOptions({
       packageId: Number(submissionPackageId),
-    }).queryKey,
+    }).queryKey
   );
 
   const isUpdated = useMemo(() => {
     if (!submissionPackage) return false;
     const last_update_request = submissionPackage.update_requests
       .filter(
         (updateRequest) =>
-          updateRequest.type === UPDATE_REQUEST_TYPE.UPDATE.value,
+          updateRequest.type === UPDATE_REQUEST_TYPE.UPDATE.value
       )
       .sort((a, b) => dayjs(b.created_date).diff(dayjs(a.created_date)))[0];
 
     if (!last_update_request) return false;
     return Boolean(
       item.submissions.find((submission) =>
         dayjs(submission.created_date).isAfter(
-          last_update_request?.created_date,
-        ),
-      ),
+          last_update_request?.created_date
+        )
+      )
     );
   }, [item, submissionPackage]);
 
@@ -87,7 +88,7 @@ export default function ProponentSubmissionItemTableRow({
   return (
     <>
       <SubmitTablePrimaryRow key={`row-${name}`} error={error}>
-        <SubmitPrimaryRowTableCell>
+        <SubmitPrimaryRowTableCell width={"50%"}>
           <MuiLink
             color="inherit"
             sx={{
@@ -106,22 +107,25 @@ export default function ProponentSubmissionItemTableRow({
             </Typography>
           </MuiLink>
         </SubmitPrimaryRowTableCell>
-        <SubmitPrimaryRowTableCell align="right" colSpan={2} />
-        <SubmitPrimaryRowTableCell align="right">
-          <SubmissionStatusChipStack
-            status={status}
-            isUpdateRequested={isUpdateRequest}
-            isUpdated={isUpdated}
-            packageStatus={submissionPackage?.status}
-          />
+        <SubmitPrimaryRowTableCell align="left" width={"10%"} />
+        <SubmitPrimaryRowTableCell align="right" width={"10%"} />
+        <SubmitPrimaryRowTableCell align="right" width={"20%"}>
+          <Box mr={2}>
+            <SubmissionStatusChipStack
+              status={status}
+              isUpdateRequested={isUpdateRequest}
+              isUpdated={isUpdated}
+              packageStatus={submissionPackage?.status}
+            />
+          </Box>
         </SubmitPrimaryRowTableCell>
-        <SubmitPrimaryRowTableCell align="right">
+        <SubmitPrimaryRowTableCell align="left" width={"10%"}>
           <Unless
             condition={
               submissionPackage?.submitted_on &&
               submissionPackage.update_requests.filter(
                 (updateRequest) =>
-                  updateRequest.status !== UPDATE_REQUEST_STATUS.ACCEPTED.value,
+                  updateRequest.status !== UPDATE_REQUEST_STATUS.ACCEPTED.value
               ).length === 0
             }
           >
@@ -153,7 +157,7 @@ export default function ProponentSubmissionItemTableRow({
       <When condition={error}>
         <TableRow key={`row-${name}-divider`}>
           <TableCell
-            colSpan={5}
+            width={"100%"}
             sx={{
               py: BCDesignTokens.layoutPaddingXsmall,
               px: 0,

diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
@@ -1,4 +1,5 @@
 import {
+  Box,
   Link as MuiLink,
   TableCell,
   TableRow,
@@ -27,6 +28,7 @@ import {
 import dayjs from "dayjs";
 import { SUBMISSION_TYPE } from "@/models/Submission";
 import SubmissionItemReviewConfirmation from "../SubmissionItemReviewConfirmation";
+import EmptyRow from "@/components/Projects/ProjectTable/EmptyRow";
 
 export default function StaffSubmissionItemTableRow({
   item,
@@ -91,7 +93,7 @@ export default function StaffSubmissionItemTableRow({
   return (
     <>
       <SubmitTablePrimaryRow key={`row-${name}`} error={error}>
-        <SubmitPrimaryRowTableCell>
+        <SubmitPrimaryRowTableCell width={"50%"}>
           <MuiLink
             color="inherit"
             sx={{
@@ -110,17 +112,20 @@ export default function StaffSubmissionItemTableRow({
             </Typography>
           </MuiLink>
         </SubmitPrimaryRowTableCell>
-        <SubmitPrimaryRowTableCell align="right" colSpan={2} />
-        <SubmitPrimaryRowTableCell align="right">
-          <SubmissionStatusChipStack
-            status={status}
-            isUpdateRequested={isUpdateRequest}
-            isUpdated={isUpdated}
-            packageStatus={submissionPackage.status}
-          />
+        <SubmitPrimaryRowTableCell align="left" width={"10%"} />
+        <SubmitPrimaryRowTableCell align="right" width={"10%"} />
+        <SubmitPrimaryRowTableCell align="right" width={"20%"}>
+          <Box mr={2}>
+            <SubmissionStatusChipStack
+              status={status}
+              isUpdateRequested={isUpdateRequest}
+              isUpdated={isUpdated}
+              packageStatus={submissionPackage.status}
+            />
+          </Box>
         </SubmitPrimaryRowTableCell>
 
-        <SubmitPrimaryRowTableCell align="center">
+        <SubmitPrimaryRowTableCell align="left" width={"10%"}>
           <When condition={submitted_on}>
             <SubmissionItemReviewConfirmation
               submissionItem={item}
@@ -157,7 +162,7 @@ export default function StaffSubmissionItemTableRow({
       <When condition={error}>
         <TableRow key={`row-${name}-divider`}>
           <TableCell
-            colSpan={5}
+            width={"100%"}
             sx={{
               py: BCDesignTokens.layoutPaddingXsmall,
               px: 0,
@@ -175,15 +180,7 @@ export default function StaffSubmissionItemTableRow({
           </TableCell>
         </TableRow>
       </When>
-      <TableRow key={`row-${name}-divider`}>
-        <TableCell
-          colSpan={5}
-          sx={{
-            py: BCDesignTokens.layoutPaddingXsmall,
-            border: 0,
-          }}
-        />
-      </TableRow>
+      <EmptyRow colSpan={5} />
     </>
   );
 }
diff --git a/submit-web/src/components/SubmissionItem/InternalDocuments/Rows.tsx b/submit-web/src/components/SubmissionItem/InternalDocuments/Rows.tsx
@@ -21,7 +21,7 @@ export default function Rows({
   return (
     <>
       <SubmitTablePrimaryRow>
-        <SubmitPrimaryRowTableCell>
+        <SubmitPrimaryRowTableCell width={"100%"}>
           <MuiLink
             color="inherit"
             sx={{