Merge pull request #282 from jadmsaadaot/SUBMIT-task#353

Allow everybody to see entity notes all the time
bcgov · Feb 6, 2025 · 2eb5bec · 2eb5bec
2 parents 67f6d64 + 866d287
commit 2eb5bec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/submit-web/src/components/Shared/PermissionGate/utils.ts b/submit-web/src/components/Shared/PermissionGate/utils.ts
@@ -1,11 +1,5 @@
 import { EPIC_SUBMIT_ROLE } from "@/models/Role";
 
-export const checkIfEAO = (roles: string[]) => {
-  if (!roles) {
-    return false;
-  }
-  return roles.length > 0;
-};
 export const checkIfManager = (roles?: string[]) => {
   if (!roles) {
     return false;
@@ -29,13 +23,6 @@ export const checkIfStaff = (roles?: string[]) => {
   );
 };
 
-export const checkIfProponent = (roles?: string[]) => {
-  if (!roles || roles.length === 0) {
-    return true;
-  }
-  return false;
-};
-
 export const hasPermission = ({
   permissions,
   scopes,

diff --git a/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx b/submit-web/src/components/Submission/UpdateRequestWidget/AddRequestNoteSection.tsx
@@ -1,7 +1,7 @@
 import { LoadingButton } from "@/components/Shared/LoadingButton";
-import { checkIfProponent } from "@/components/Shared/PermissionGate/utils";
 import { useCreatePackageUpdateRequesNote } from "@/hooks/api/usePackages";
 import { UpdateRequest } from "@/models/UpdateRequest";
+import { USER_TYPE } from "@/models/User";
 import { useAccount } from "@/store/accountStore";
 import {
   Box,
@@ -33,8 +33,8 @@ export const AddRequestNoteSection = ({
       packageId: updateRequest.submission_package_id,
     });
 
-  const { roles } = useAccount();
-  const isProponent = checkIfProponent(roles);
+  const { userType } = useAccount();
+  const isProponent = userType === USER_TYPE.PROPONENT;
 
   return (
     <Box mt="1em">

diff --git a/submit-web/src/components/Submission/UpdateRequestWidget/RequestSection.tsx b/submit-web/src/components/Submission/UpdateRequestWidget/RequestSection.tsx
@@ -2,11 +2,11 @@ import { Box, Typography } from "@mui/material";
 import { BCDesignTokens } from "epic.theme";
 import dateUtils from "@/utils/dateUtils";
 import { UPDATE_REQUEST_TYPE, UpdateRequest } from "@/models/UpdateRequest";
-import { Case, Switch, Unless, When } from "react-if";
+import { Case, Switch, When } from "react-if";
 import { AddRequestNoteSection } from "./AddRequestNoteSection";
-import { PACKAGE_STATUS, SubmissionPackage } from "@/models/Package";
-import { checkIfEAO } from "@/components/Shared/PermissionGate/utils";
+import { SubmissionPackage } from "@/models/Package";
 import { useAccount } from "@/store/accountStore";
+import { USER_TYPE } from "@/models/User";
 
 type UpdateRequestProps = Readonly<{
   updateRequest: UpdateRequest;
@@ -21,18 +21,11 @@ export default function RequestSection({
     updateRequest;
   const createdDate = dateUtils.formatDate(created_date);
 
-  const { roles } = useAccount();
-  const isEAO = checkIfEAO(roles || []);
+  const { userType } = useAccount();
 
   const submissionItems = submissionPackage.items.filter((item) =>
     submission_item_ids.includes(item.id),
   );
-
-  const showNoteSection =
-    (isEAO &&
-      submissionPackage.status.includes(PACKAGE_STATUS.SUBMITTED.value)) ||
-    (!isEAO && Boolean(note));
-
   return (
     <Box sx={{ my: BCDesignTokens.layoutMarginLarge }}>
       <Box
@@ -69,7 +62,7 @@ export default function RequestSection({
         {reason}
       </Typography>
 
-      <When condition={showNoteSection}>
+      <When condition={Boolean(note)}>
         <Typography
           variant="body1"
           sx={{ mb: 1, fontWeight: BCDesignTokens.typographyFontWeightsBold }}
@@ -80,9 +73,9 @@ export default function RequestSection({
           {note}
         </Typography>
       </When>
-      <Unless condition={isEAO}>
+      <When condition={userType === USER_TYPE.PROPONENT}>
         <AddRequestNoteSection updateRequest={updateRequest} />
-      </Unless>
+      </When>
     </Box>
   );
 }