Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[UTOPIA-1288] only allow one idir user to review one program area selected role #1381

Merged
merged 9 commits into from
Jul 19, 2023
Merged

[UTOPIA-1288] only allow one idir user to review one program area selected role #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
deaf7fe
only allow one idir user to review program area selected role
binggaofw Jul 13, 2023
f953ded
add a null check in allowUserReviewProgramArea and add comments
binggaofw Jul 14, 2023
3637c07
Merge branch 'main' into UTOPIA-1288
binggaofw Jul 17, 2023
eed8260
Merge branch 'main' into UTOPIA-1288
binggaofw Jul 17, 2023
5c33a12
Merge branch 'main' into UTOPIA-1288
binggaofw Jul 17, 2023
387cefd
Merge branch 'main' into UTOPIA-1288
binggaofw Jul 17, 2023
5378801
Merge branch 'main' into UTOPIA-1288
binggaofw Jul 18, 2023
ac7eba0
Merge branch 'main' into UTOPIA-1288
binggaofw Jul 18, 2023
9af6b38
fix lint and docker build fail
binggaofw Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/frontend/src/components/public/PIAFormTabs/review/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
import { IReview } from './interfaces';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faTrash } from '@fortawesome/free-solid-svg-icons';
import { useParams } from 'react-router-dom';
import { getGUID } from '../../../../utils/helper.util';
import { IPiaForm } from '../../../../types/interfaces/pia-form.interface';
import {
IPiaFormContext,
PiaFormContext,
Expand Down Expand Up @@ -293,6 +296,11 @@ const PIAReview = ({ printPreview }: IReviewProps) => {
pia={pia}
role={role}
stateChangeHandler={stateChangeHandler}
isAcknowledged={
Object(pia?.review?.programArea)?.reviews?.[
role
]?.isAcknowledged || false
}
/>
) : (
<EditProgramAreaReview
Expand Down Expand Up @@ -359,7 +367,11 @@ const PIAReview = ({ printPreview }: IReviewProps) => {
<div className="drop-shadow card p-4 p-md-5">
<div className="data-table__container">
{enableMPOReviewViewMode() ? (
<ViewMPOReview pia={pia} editReviewNote={setEditReviewNote} />
<ViewMPOReview
pia={pia}
editReviewNote={setEditReviewNote}
isAcknowledged={pia?.review?.mpo?.isAcknowledged || false}
/>
) : (
<>
<div className="data-row">
Expand Down Expand Up @@ -442,6 +454,10 @@ const PIAReview = ({ printPreview }: IReviewProps) => {
{pia?.review?.programArea?.selectedRoles.map((role: string) => (
<>
<ViewProgramAreaReview
isAcknowledged={
pia?.review?.programArea?.reviews?.[role].isAcknowledged ||
false
}
pia={pia}
printPreview
role={role}
Expand All @@ -454,6 +470,7 @@ const PIAReview = ({ printPreview }: IReviewProps) => {
pia={pia}
printPreview
editReviewNote={setEditReviewNote}
isAcknowledged={pia?.review?.mpo?.isAcknowledged || false}
/>
</>
)}
Expand Down
5 changes: 4 additions & 1 deletion src/frontend/src/components/public/PIAFormTabs/review/viewMPOReview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ interface IMPOReviewProps {
pia: IPiaForm;
editReviewNote: Dispatch<SetStateAction<boolean>>;
printPreview?: boolean;
isAcknowledged: boolean;
}

const ViewMPOReview = (props: IMPOReviewProps) => {
const { pia, printPreview, editReviewNote } = props;
const { pia, printPreview, editReviewNote, isAcknowledged } = props;

return (
<div className="d-grid gap-3">
Expand All @@ -29,12 +30,14 @@ const ViewMPOReview = (props: IMPOReviewProps) => {
reviewSection={pia.review?.mpo}
editReviewNote={editReviewNote}
printPreview
isAcknowledged={isAcknowledged}
/>
</div>
)}
</div>
) : (
<ViewReviewSection
isAcknowledged={isAcknowledged}
pia={pia}
reviewSection={pia?.review?.mpo}
editReviewNote={editReviewNote}
Expand Down
5 changes: 4 additions & 1 deletion src/frontend/src/components/public/PIAFormTabs/review/viewProgramArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ interface IViewProgramAreaReviewProps {
editReviewNote?: Dispatch<SetStateAction<boolean>>;
printPreview?: boolean;
role: string;
isAcknowledged: boolean;
}

const ViewProgramAreaReview = (props: IViewProgramAreaReviewProps) => {
const { pia, printPreview, stateChangeHandler, role } = props;
const { pia, printPreview, stateChangeHandler, role, isAcknowledged } = props;

return (
<div className="d-grid gap-3">
Expand All @@ -38,6 +39,7 @@ const ViewProgramAreaReview = (props: IViewProgramAreaReviewProps) => {
pia?.review?.programArea?.reviews?.[role as keyof IReview]
}
printPreview
isAcknowledged={isAcknowledged}
/>
</div>
)}
Expand All @@ -51,6 +53,7 @@ const ViewProgramAreaReview = (props: IViewProgramAreaReviewProps) => {
}
stateChangeHandler={stateChangeHandler}
role={role}
isAcknowledged={isAcknowledged}
/>
</div>
)}
Expand Down
4 changes: 3 additions & 1 deletion src/frontend/src/components/public/PIAFormTabs/review/viewReviewSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ interface IReviewProps {
stateChangeHandler?: (value: any, path: string, callApi?: boolean) => void;
printPreview?: boolean;
role?: string;
isAcknowledged: boolean;
}

const ViewReviewSection = (props: IReviewProps) => {
Expand All @@ -27,6 +28,7 @@ const ViewReviewSection = (props: IReviewProps) => {
editReviewNote,
stateChangeHandler,
role,
isAcknowledged,
} = props;

const reviewGuid = reviewSection?.reviewedByGuid;
Expand Down Expand Up @@ -78,7 +80,7 @@ const ViewReviewSection = (props: IReviewProps) => {
<div className="row mt-4">
<Checkbox
value=""
checked={true}
checked={isAcknowledged}
isLink={false}
label={
messages.PiaReviewHeader.MinistrySection.Input.AcceptAccountability
Expand Down
Loading