Refactor for better extendability.

bcgov · Jul 31, 2023 · b295e14 · b295e14
1 parent 01dc1f2
commit b295e14
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/frontend/src/components/public/PIAFormTabs/review/index.tsx b/src/frontend/src/components/public/PIAFormTabs/review/index.tsx
@@ -18,6 +18,7 @@ import PendingReview from './pendingReview';
 import ViewProgramAreaReview from './viewProgramArea';
 import EditProgramAreaReview from './editProgramArea';
 import { YesNoInput } from '../../../../types/enums/yes-no.enum';
+import { statusList } from '../../../../utils/status';
 
 export interface IReviewProps {
   printPreview?: boolean;
@@ -196,6 +197,7 @@ const PIAReview = ({ printPreview }: IReviewProps) => {
     const review = { isAcknowledged: mpoAcknowledged, reviewNote };
     stateChangeHandler(review, `mpo`, true);
   };
+
   return (
     <>
       <section>
@@ -300,8 +302,9 @@ const PIAReview = ({ printPreview }: IReviewProps) => {
                     reviewForm.programArea?.selectedRoles.map(
                       (role: string, index: number) => {
                         return reviewForm.programArea?.selectedRoles &&
-                          (pia.status === PiaStatuses.FINAL_REVIEW ||
-                            pia.status === PiaStatuses.COMPLETE) ? (
+                        // eslint-disable-next-line no-non-null-asserted-optional-chain
+                          statusList?.(pia)?.[pia?.status!]?.Pages?.review
+                            .viewProgramAreaReviews ? (
                           <div
                             className="d-flex align-items-center"
                             key={index}

diff --git a/src/frontend/src/utils/status.ts b/src/frontend/src/utils/status.ts
@@ -6,6 +6,7 @@ import { SubmitButtonTextEnum } from '../pages/PIAForm';
 export type PageAccessControl = {
   [page: string]: {
     accessControl: boolean;
+    viewProgramAreaReviews?: boolean;
   };
 };
 
@@ -293,6 +294,7 @@ export const statusList = (pia: IPiaForm | null): StatusList => {
       Pages: {
         review: {
           accessControl: true,
+          viewProgramAreaReviews: true,
         },
       },
       Privileges: {
@@ -414,6 +416,7 @@ export const statusList = (pia: IPiaForm | null): StatusList => {
       Pages: {
         review: {
           accessControl: true,
+          viewProgramAreaReviews: true,
         },
       },
       Privileges: {