From 70b7fbaa18fec2e4890da6e0076b37bb1b497a11 Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Fri, 31 Jan 2025 11:26:14 -0500
Subject: [PATCH 1/3] fix update request not displaying for proponent + qol

---
 .../AddRequestNoteSection.tsx                 | 22 +++++++++++++++----
 .../UpdateRequestWidget/RequestSection.tsx    |  2 +-
 .../_submissionLayout/index.tsx               | 14 +++++-------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx b/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
index aa7474c4..21a4444b 100644
--- a/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
+++ b/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
@@ -3,10 +3,17 @@ import { checkIfProponent } from "@/components/Shared/PermissionGate/utils";
 import { useCreatePackageUpdateRequesNote } from "@/hooks/api/usePackages";
 import { UpdateRequest } from "@/models/UpdateRequest";
 import { useAccount } from "@/store/accountStore";
-import { Box, Button, Collapse, Stack, TextField } from "@mui/material";
+import {
+  Box,
+  Button,
+  Collapse,
+  Stack,
+  TextField,
+  Typography,
+} from "@mui/material";
 import { BCDesignTokens } from "epic.theme";
 import { useState } from "react";
-import { When } from "react-if";
+import { Unless, When } from "react-if";
 
 type AddRequestNoteSectionProps = Readonly<{
   updateRequest: UpdateRequest;
@@ -27,10 +34,17 @@ export const AddRequestNoteSection = ({
     });
 
   const { roles } = useAccount();
-  const isProponent = checkIfProponent(roles);
+  const isProponent = checkIfProponent(roles || []);
+
   return (
     <Box mt="1em">
       <Collapse in={isAddingNote && !updateRequest.note}>
+        <Typography
+          variant="body1"
+          sx={{ mb: 1, fontWeight: BCDesignTokens.typographyFontWeightsBold }}
+        >
+          Note for the EAO
+        </Typography>
         <TextField
           onChange={handleNoteChange}
           value={note}
@@ -69,7 +83,7 @@ export const AddRequestNoteSection = ({
           </Button>
         </Stack>
       </Collapse>
-      <When condition={!updateRequest.note && !isAddingNote && isProponent}>
+      <When condition={isProponent && !updateRequest.note && !isAddingNote}>
         <Button
           color="primary"
           variant="outlined"
diff --git a/submit-web/src/components/Submission/UpdateRequestWidget/RequestSection.tsx b/submit-web/src/components/Submission/UpdateRequestWidget/RequestSection.tsx
index 6236e73c..3b7d9efd 100644
--- a/submit-web/src/components/Submission/UpdateRequestWidget/RequestSection.tsx
+++ b/submit-web/src/components/Submission/UpdateRequestWidget/RequestSection.tsx
@@ -74,7 +74,7 @@ export default function RequestSection({
 
       <When condition={showNoteSection}>
         <Typography
-          variant="subtitle1"
+          variant="body1"
           sx={{ mb: 1, fontWeight: BCDesignTokens.typographyFontWeightsBold }}
         >
           Note to EAO
diff --git a/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx b/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx
index d5e2f2e5..0c6b4f5a 100644
--- a/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx
+++ b/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx
@@ -170,14 +170,12 @@ export default function SubmissionPage() {
                 </Box>
               </Box>
               <InfoBox submissionPackage={submissionPackage} />
-              {submissionPackage?.update_requests.length > 0 && (
-                <Box mt="1em" width="100%">
-                  <UpdateRequestWidget
-                    submissionPackage={submissionPackage}
-                    summaryBackgroundColor="#FEF8E8"
-                  />
-                </Box>
-              )}
+              <Box mt="1em" width="100%">
+                <UpdateRequestWidget
+                  submissionPackage={submissionPackage}
+                  summaryBackgroundColor="#FEF8E8"
+                />
+              </Box>
               <Box
                 sx={{
                   mb: BCDesignTokens.layoutMarginXlarge,

From 17b2c90cc77d0f5cdc2b11e82d24ddbab6ae8b57 Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Fri, 31 Jan 2025 11:32:00 -0500
Subject: [PATCH 2/3] only didsplay update request if they have requests
 pending

---
 .../UpdateRequestWidget/AddRequestNoteSection.tsx  |  2 +-
 .../_submissionLayout/index.tsx                    | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx b/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
index 21a4444b..1f955e7c 100644
--- a/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
+++ b/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
@@ -13,7 +13,7 @@ import {
 } from "@mui/material";
 import { BCDesignTokens } from "epic.theme";
 import { useState } from "react";
-import { Unless, When } from "react-if";
+import { When } from "react-if";
 
 type AddRequestNoteSectionProps = Readonly<{
   updateRequest: UpdateRequest;
diff --git a/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx b/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx
index 0c6b4f5a..d5e2f2e5 100644
--- a/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx
+++ b/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx
@@ -170,12 +170,14 @@ export default function SubmissionPage() {
                 </Box>
               </Box>
               <InfoBox submissionPackage={submissionPackage} />
-              <Box mt="1em" width="100%">
-                <UpdateRequestWidget
-                  submissionPackage={submissionPackage}
-                  summaryBackgroundColor="#FEF8E8"
-                />
-              </Box>
+              {submissionPackage?.update_requests.length > 0 && (
+                <Box mt="1em" width="100%">
+                  <UpdateRequestWidget
+                    submissionPackage={submissionPackage}
+                    summaryBackgroundColor="#FEF8E8"
+                  />
+                </Box>
+              )}
               <Box
                 sx={{
                   mb: BCDesignTokens.layoutMarginXlarge,

From a21dc54a66cb97caf2f744c9dbf8964ea9625892 Mon Sep 17 00:00:00 2001
From: David Nunez <103138766+djnunez-aot@users.noreply.github.com>
Date: Fri, 31 Jan 2025 13:16:42 -0500
Subject: [PATCH 3/3] fix isproponent check

---
 submit-web/src/components/Shared/PermissionGate/utils.ts       | 3 ++-
 .../Submission/UpdateRequestWidget/AddRequestNoteSection.tsx   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/submit-web/src/components/Shared/PermissionGate/utils.ts b/submit-web/src/components/Shared/PermissionGate/utils.ts
index fd9a2c70..2e9d206f 100644
--- a/submit-web/src/components/Shared/PermissionGate/utils.ts
+++ b/submit-web/src/components/Shared/PermissionGate/utils.ts
@@ -30,9 +30,10 @@ export const checkIfStaff = (roles?: string[]) => {
 };
 
 export const checkIfProponent = (roles?: string[]) => {
-  if (!roles) {
+  if (!roles || roles.length === 0) {
     return true;
   }
+  return false;
 };
 
 export const hasPermission = ({
diff --git a/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx b/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
index 1f955e7c..31c3941a 100644
--- a/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
+++ b/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
@@ -34,7 +34,7 @@ export const AddRequestNoteSection = ({
     });
 
   const { roles } = useAccount();
-  const isProponent = checkIfProponent(roles || []);
+  const isProponent = checkIfProponent(roles);
 
   return (
     <Box mt="1em">