From 1f880ea4a0f54c80f71781b1dc72ce81b54a3c3d Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Tue, 25 Feb 2025 11:32:27 -0500
Subject: [PATCH 1/6] setup staff ui touch ups for tables

---
 .../Submission/DocumentRow/index.tsx           | 14 ++++++++------
 .../components/Submission/ItemsTable/index.tsx | 18 +++++++++++++-----
 .../StaffSubmissionItemTableRow.tsx            | 11 ++++++++---
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/submit-web/src/components/Submission/DocumentRow/index.tsx b/submit-web/src/components/Submission/DocumentRow/index.tsx
index 3545234a..5a5a831c 100644
--- 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 colSpan={10}>
           <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" colSpan={3}>
+          {submitted_by || ""}
+        </SubmitTableCell>
+        <SubmitTableCell align="right" colSpan={2}>
           {version}
-          <IconButton onClick={() => setExpanded(!expanded)}>
+          <IconButton onClick={() => setExpanded(!expanded)} sx={{ p: 0 }}>
             <ExpandMoreIcon
               sx={{
                 transform: expanded ? "rotate(180deg)" : "rotate(0deg)",
@@ -90,10 +92,10 @@ export default function DocumentRow({
             />
           </IconButton>
         </SubmitTableCell>
-        <SubmitTableCell align="right">
+        <SubmitTableCell align="right" colSpan={4}>
           <StatusCell submittedDocument={documentSubmission} />
         </SubmitTableCell>
-        <SubmitTableCell align="right" colSpan={1}></SubmitTableCell>
+        <SubmitTableCell align="right" colSpan={2}></SubmitTableCell>
       </TableRow>
       <TableRow>
         <SubmitTableCell
diff --git a/submit-web/src/components/Submission/ItemsTable/index.tsx b/submit-web/src/components/Submission/ItemsTable/index.tsx
index 42a91d72..cd25f02a 100644
--- 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 colSpan={10}>
               <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 colSpan={3} align="left">
+              Uploaded by
+            </SubmitTableHeadCell>
+            <SubmitTableHeadCell colSpan={2} align="right">
+              Version
+            </SubmitTableHeadCell>
+            <SubmitTableHeadCell colSpan={4} align="center">
+              Status
+            </SubmitTableHeadCell>
+            <SubmitTableHeadCell colSpan={2} align="left">
+              Actions
+            </SubmitTableHeadCell>
           </TableRow>
         </TableHead>
         <TableBody>
diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
index 76aa2d16..7282fce8 100644
--- a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
+++ b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
@@ -91,7 +91,7 @@ export default function StaffSubmissionItemTableRow({
   return (
     <>
       <SubmitTablePrimaryRow key={`row-${name}`} error={error}>
-        <SubmitPrimaryRowTableCell>
+        <SubmitPrimaryRowTableCell colSpan={10}>
           <MuiLink
             color="inherit"
             sx={{
@@ -110,8 +110,9 @@ export default function StaffSubmissionItemTableRow({
             </Typography>
           </MuiLink>
         </SubmitPrimaryRowTableCell>
+        <SubmitPrimaryRowTableCell align="left" colSpan={3} />
         <SubmitPrimaryRowTableCell align="right" colSpan={2} />
-        <SubmitPrimaryRowTableCell align="right">
+        <SubmitPrimaryRowTableCell align="right" colSpan={4}>
           <SubmissionStatusChipStack
             status={status}
             isUpdateRequested={isUpdateRequest}
@@ -120,7 +121,11 @@ export default function StaffSubmissionItemTableRow({
           />
         </SubmitPrimaryRowTableCell>
 
-        <SubmitPrimaryRowTableCell align="center">
+        <SubmitPrimaryRowTableCell
+          align="left"
+          colSpan={2}
+          sx={{ border: "2px solid red", pl: 1 }}
+        >
           <When condition={submitted_on}>
             <SubmissionItemReviewConfirmation
               submissionItem={item}

From 42d40dfb2166132445c6a2cf2d48c27c53fb1239 Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Tue, 25 Feb 2025 12:42:03 -0500
Subject: [PATCH 2/6] update other parts of the ui

---
 submit-web/src/components/Submission/DocumentRow/index.tsx  | 2 +-
 .../SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx  | 6 +-----
 .../components/SubmissionItem/InternalDocuments/Rows.tsx    | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/submit-web/src/components/Submission/DocumentRow/index.tsx b/submit-web/src/components/Submission/DocumentRow/index.tsx
index 5a5a831c..4924f650 100644
--- a/submit-web/src/components/Submission/DocumentRow/index.tsx
+++ b/submit-web/src/components/Submission/DocumentRow/index.tsx
@@ -99,7 +99,7 @@ export default function DocumentRow({
       </TableRow>
       <TableRow>
         <SubmitTableCell
-          colSpan={5}
+          colSpan={21}
           style={{ paddingBottom: 0, paddingTop: 0, borderTop: "none" }}
         >
           <Collapse in={expanded} mountOnEnter unmountOnExit>
diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
index 7282fce8..004aabe4 100644
--- a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
+++ b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
@@ -121,11 +121,7 @@ export default function StaffSubmissionItemTableRow({
           />
         </SubmitPrimaryRowTableCell>
 
-        <SubmitPrimaryRowTableCell
-          align="left"
-          colSpan={2}
-          sx={{ border: "2px solid red", pl: 1 }}
-        >
+        <SubmitPrimaryRowTableCell align="left" colSpan={2}>
           <When condition={submitted_on}>
             <SubmissionItemReviewConfirmation
               submissionItem={item}
diff --git a/submit-web/src/components/SubmissionItem/InternalDocuments/Rows.tsx b/submit-web/src/components/SubmissionItem/InternalDocuments/Rows.tsx
index 4c577302..595477ac 100644
--- 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 colSpan={17}>
           <MuiLink
             color="inherit"
             sx={{

From eb96a0d47ee4ec5713e6114d084a500cfaa0f59c Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:04:58 -0500
Subject: [PATCH 3/6] fix proponent side

---
 .../ProponentSubmissionItemTableRow.tsx       | 19 ++++++++++---------
 .../StaffSubmissionItemTableRow.tsx           | 11 ++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
index 8fe9ba13..52a2fd4b 100644
--- a/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
+++ b/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
@@ -47,7 +47,7 @@ export default function ProponentSubmissionItemTableRow({
   const submissionPackage = queryClient.getQueryData<SubmissionPackage>(
     getSubmissionPackageQueryOptions({
       packageId: Number(submissionPackageId),
-    }).queryKey,
+    }).queryKey
   );
 
   const isUpdated = useMemo(() => {
@@ -55,7 +55,7 @@ export default function ProponentSubmissionItemTableRow({
     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];
 
@@ -63,9 +63,9 @@ export default function ProponentSubmissionItemTableRow({
     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 +87,7 @@ export default function ProponentSubmissionItemTableRow({
   return (
     <>
       <SubmitTablePrimaryRow key={`row-${name}`} error={error}>
-        <SubmitPrimaryRowTableCell>
+        <SubmitPrimaryRowTableCell colSpan={10}>
           <MuiLink
             color="inherit"
             sx={{
@@ -106,8 +106,9 @@ export default function ProponentSubmissionItemTableRow({
             </Typography>
           </MuiLink>
         </SubmitPrimaryRowTableCell>
+        <SubmitPrimaryRowTableCell align="left" colSpan={3} />
         <SubmitPrimaryRowTableCell align="right" colSpan={2} />
-        <SubmitPrimaryRowTableCell align="right">
+        <SubmitPrimaryRowTableCell align="right" colSpan={4}>
           <SubmissionStatusChipStack
             status={status}
             isUpdateRequested={isUpdateRequest}
@@ -115,13 +116,13 @@ export default function ProponentSubmissionItemTableRow({
             packageStatus={submissionPackage?.status}
           />
         </SubmitPrimaryRowTableCell>
-        <SubmitPrimaryRowTableCell align="right">
+        <SubmitPrimaryRowTableCell align="left" colSpan={2}>
           <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
             }
           >
diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
index 004aabe4..4c380ab9 100644
--- a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
+++ b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
@@ -27,6 +27,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,
@@ -176,15 +177,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} />
     </>
   );
 }

From ce7823e34f06e61a1d1c51a91f769a57c73841aa Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:32:17 -0500
Subject: [PATCH 4/6] setup status boxes

---
 .../ProponentSubmissionItemTableRow.tsx           | 15 +++++++++------
 .../StaffSubmissionItemTableRow.tsx               | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
index 52a2fd4b..6420c414 100644
--- a/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
+++ b/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
@@ -1,4 +1,5 @@
 import {
+  Box,
   Link as MuiLink,
   TableCell,
   TableRow,
@@ -109,12 +110,14 @@ export default function ProponentSubmissionItemTableRow({
         <SubmitPrimaryRowTableCell align="left" colSpan={3} />
         <SubmitPrimaryRowTableCell align="right" colSpan={2} />
         <SubmitPrimaryRowTableCell align="right" colSpan={4}>
-          <SubmissionStatusChipStack
-            status={status}
-            isUpdateRequested={isUpdateRequest}
-            isUpdated={isUpdated}
-            packageStatus={submissionPackage?.status}
-          />
+          <Box mr={2}>
+            <SubmissionStatusChipStack
+              status={status}
+              isUpdateRequested={isUpdateRequest}
+              isUpdated={isUpdated}
+              packageStatus={submissionPackage?.status}
+            />
+          </Box>
         </SubmitPrimaryRowTableCell>
         <SubmitPrimaryRowTableCell align="left" colSpan={2}>
           <Unless
diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
index 4c380ab9..5f756e97 100644
--- 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,
@@ -114,12 +115,14 @@ export default function StaffSubmissionItemTableRow({
         <SubmitPrimaryRowTableCell align="left" colSpan={3} />
         <SubmitPrimaryRowTableCell align="right" colSpan={2} />
         <SubmitPrimaryRowTableCell align="right" colSpan={4}>
-          <SubmissionStatusChipStack
-            status={status}
-            isUpdateRequested={isUpdateRequest}
-            isUpdated={isUpdated}
-            packageStatus={submissionPackage.status}
-          />
+          <Box mr={2}>
+            <SubmissionStatusChipStack
+              status={status}
+              isUpdateRequested={isUpdateRequest}
+              isUpdated={isUpdated}
+              packageStatus={submissionPackage.status}
+            />
+          </Box>
         </SubmitPrimaryRowTableCell>
 
         <SubmitPrimaryRowTableCell align="left" colSpan={2}>

From 0eda6f750e214f358325df2bec8d84d760fe47b4 Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:04:32 -0500
Subject: [PATCH 5/6] remove colspan instances

---
 .../src/components/Submission/DocumentRow/index.tsx  | 10 +++++-----
 .../src/components/Submission/ItemsTable/index.tsx   | 10 +++++-----
 .../ProponentSubmissionItemTableRow.tsx              | 12 ++++++------
 .../StaffSubmissionItemTableRow.tsx                  | 12 ++++++------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/submit-web/src/components/Submission/DocumentRow/index.tsx b/submit-web/src/components/Submission/DocumentRow/index.tsx
index 4924f650..71b2ebc0 100644
--- 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 colSpan={10}>
+        <SubmitTableCell width={"50%"}>
           <Typography
             variant="body1"
             color="inherit"
@@ -78,10 +78,10 @@ export default function DocumentRow({
             )}
           </Typography>
         </SubmitTableCell>
-        <SubmitTableCell align="left" colSpan={3}>
+        <SubmitTableCell align="left" width={"10%"}>
           {submitted_by || ""}
         </SubmitTableCell>
-        <SubmitTableCell align="right" colSpan={2}>
+        <SubmitTableCell align="right" width={"10%"}>
           {version}
           <IconButton onClick={() => setExpanded(!expanded)} sx={{ p: 0 }}>
             <ExpandMoreIcon
@@ -92,10 +92,10 @@ export default function DocumentRow({
             />
           </IconButton>
         </SubmitTableCell>
-        <SubmitTableCell align="right" colSpan={4}>
+        <SubmitTableCell align="right" width={"20%"}>
           <StatusCell submittedDocument={documentSubmission} />
         </SubmitTableCell>
-        <SubmitTableCell align="right" colSpan={2}></SubmitTableCell>
+        <SubmitTableCell align="right" width={"10%"}></SubmitTableCell>
       </TableRow>
       <TableRow>
         <SubmitTableCell
diff --git a/submit-web/src/components/Submission/ItemsTable/index.tsx b/submit-web/src/components/Submission/ItemsTable/index.tsx
index cd25f02a..fc428368 100644
--- 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 colSpan={10}>
+            <SubmitTableHeadCell width={"50%"}>
               <Typography
                 variant="body2"
                 sx={{
@@ -61,16 +61,16 @@ export default function ItemsTable({ submissionPackage }: ItemsTableProps) {
                 Form/Document
               </Typography>
             </SubmitTableHeadCell>
-            <SubmitTableHeadCell colSpan={3} align="left">
+            <SubmitTableHeadCell width={"10%"} align="left">
               Uploaded by
             </SubmitTableHeadCell>
-            <SubmitTableHeadCell colSpan={2} align="right">
+            <SubmitTableHeadCell width={"10%"} align="right">
               Version
             </SubmitTableHeadCell>
-            <SubmitTableHeadCell colSpan={4} align="center">
+            <SubmitTableHeadCell width={"20%"} align="center">
               Status
             </SubmitTableHeadCell>
-            <SubmitTableHeadCell colSpan={2} align="left">
+            <SubmitTableHeadCell width={"10%"} align="left">
               Actions
             </SubmitTableHeadCell>
           </TableRow>
diff --git a/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx b/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
index 6420c414..8b763b49 100644
--- a/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
+++ b/submit-web/src/components/Submission/SubmissionItemTableRow/ProponentSubmissionItemTableRow.tsx
@@ -88,7 +88,7 @@ export default function ProponentSubmissionItemTableRow({
   return (
     <>
       <SubmitTablePrimaryRow key={`row-${name}`} error={error}>
-        <SubmitPrimaryRowTableCell colSpan={10}>
+        <SubmitPrimaryRowTableCell width={"50%"}>
           <MuiLink
             color="inherit"
             sx={{
@@ -107,9 +107,9 @@ export default function ProponentSubmissionItemTableRow({
             </Typography>
           </MuiLink>
         </SubmitPrimaryRowTableCell>
-        <SubmitPrimaryRowTableCell align="left" colSpan={3} />
-        <SubmitPrimaryRowTableCell align="right" colSpan={2} />
-        <SubmitPrimaryRowTableCell align="right" colSpan={4}>
+        <SubmitPrimaryRowTableCell align="left" width={"10%"} />
+        <SubmitPrimaryRowTableCell align="right" width={"10%"} />
+        <SubmitPrimaryRowTableCell align="right" width={"20%"}>
           <Box mr={2}>
             <SubmissionStatusChipStack
               status={status}
@@ -119,7 +119,7 @@ export default function ProponentSubmissionItemTableRow({
             />
           </Box>
         </SubmitPrimaryRowTableCell>
-        <SubmitPrimaryRowTableCell align="left" colSpan={2}>
+        <SubmitPrimaryRowTableCell align="left" width={"10%"}>
           <Unless
             condition={
               submissionPackage?.submitted_on &&
@@ -157,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
index 5f756e97..a8fe5a6f 100644
--- a/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
+++ b/submit-web/src/components/Submission/SubmissionItemTableRow/StaffSubmissionItemTableRow.tsx
@@ -93,7 +93,7 @@ export default function StaffSubmissionItemTableRow({
   return (
     <>
       <SubmitTablePrimaryRow key={`row-${name}`} error={error}>
-        <SubmitPrimaryRowTableCell colSpan={10}>
+        <SubmitPrimaryRowTableCell width={"50%"}>
           <MuiLink
             color="inherit"
             sx={{
@@ -112,9 +112,9 @@ export default function StaffSubmissionItemTableRow({
             </Typography>
           </MuiLink>
         </SubmitPrimaryRowTableCell>
-        <SubmitPrimaryRowTableCell align="left" colSpan={3} />
-        <SubmitPrimaryRowTableCell align="right" colSpan={2} />
-        <SubmitPrimaryRowTableCell align="right" colSpan={4}>
+        <SubmitPrimaryRowTableCell align="left" width={"10%"} />
+        <SubmitPrimaryRowTableCell align="right" width={"10%"} />
+        <SubmitPrimaryRowTableCell align="right" width={"20%"}>
           <Box mr={2}>
             <SubmissionStatusChipStack
               status={status}
@@ -125,7 +125,7 @@ export default function StaffSubmissionItemTableRow({
           </Box>
         </SubmitPrimaryRowTableCell>
 
-        <SubmitPrimaryRowTableCell align="left" colSpan={2}>
+        <SubmitPrimaryRowTableCell align="left" width={"10%"}>
           <When condition={submitted_on}>
             <SubmissionItemReviewConfirmation
               submissionItem={item}
@@ -162,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,

From 6484bad1ae0a8fa633a0b9d9677dd6f18e2ee28f Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Wed, 26 Feb 2025 14:12:16 -0500
Subject: [PATCH 6/6] remove other colspan misuses

---
 submit-web/src/components/Submission/DocumentRow/index.tsx      | 2 +-
 .../src/components/SubmissionItem/InternalDocuments/Rows.tsx    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submit-web/src/components/Submission/DocumentRow/index.tsx b/submit-web/src/components/Submission/DocumentRow/index.tsx
index 71b2ebc0..f61c0ccc 100644
--- a/submit-web/src/components/Submission/DocumentRow/index.tsx
+++ b/submit-web/src/components/Submission/DocumentRow/index.tsx
@@ -99,7 +99,7 @@ export default function DocumentRow({
       </TableRow>
       <TableRow>
         <SubmitTableCell
-          colSpan={21}
+          colSpan={6}
           style={{ paddingBottom: 0, paddingTop: 0, borderTop: "none" }}
         >
           <Collapse in={expanded} mountOnEnter unmountOnExit>
diff --git a/submit-web/src/components/SubmissionItem/InternalDocuments/Rows.tsx b/submit-web/src/components/SubmissionItem/InternalDocuments/Rows.tsx
index 595477ac..a05102c2 100644
--- 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 colSpan={17}>
+        <SubmitPrimaryRowTableCell width={"100%"}>
           <MuiLink
             color="inherit"
             sx={{