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.

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

ORV2-2823 - FE: Add rejectionHistory to Application response data type #1655

Merged
merged 7 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ import { Dayjs } from "dayjs";

import { applyWhenNotNullable } from "../../../common/helpers/util";
import { Application, ApplicationResponseData } from "../types/application";
import { getEndOfDate, getStartOfDate, now, toLocalDayjs, utcToLocalDayjs } from "../../../common/helpers/formatDate";
import {
getEndOfDate,
getStartOfDate,
now,
toLocalDayjs,
utcToLocalDayjs,
} from "../../../common/helpers/formatDate";
import { getDurationOrDefault } from "./getDefaultApplicationFormData";
import { getExpiryDate } from "./permitState";
import { minDurationForPermitType } from "./dateSelection";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import { ReviewFeeSummary } from "./ReviewFeeSummary";
import { ReviewPermitDetails } from "./ReviewPermitDetails";
import { ReviewPermitLOAs } from "./ReviewPermitLOAs";
import { ReviewVehicleInfo } from "./ReviewVehicleInfo";
import { ApplicationRejectionHistory } from "../../../../types/ApplicationRejectionHistory";
import { ReviewApplicationRejectionHistory } from "./ReviewApplicationRejectionHistory";
import { isPermitStartOrExpiryDateInPast } from "../../../../helpers/dateSelection";

interface PermitReviewProps {
Expand Down Expand Up @@ -58,9 +60,15 @@ interface PermitReviewProps {
calculatedFee: string;
doingBusinessAs?: Nullable<string>;
loas?: Nullable<PermitLOA[]>;
applicationRejectionHistory?: Nullable<ApplicationRejectionHistory[]>;
}

export const PermitReview = (props: PermitReviewProps) => {
const shouldShowRejectionHistory =
props.reviewContext === PERMIT_REVIEW_CONTEXTS.QUEUE &&
props.applicationRejectionHistory &&
props.applicationRejectionHistory.length > 0;

const invalidPermitDates =
props.permitStartDate && props.permitExpiryDate
? isPermitStartOrExpiryDateInPast(
Expand Down Expand Up @@ -115,6 +123,12 @@ export const PermitReview = (props: PermitReviewProps) => {
oldFields={props.oldFields?.permitData?.vehicleDetails}
/>

{shouldShowRejectionHistory && props.applicationRejectionHistory && (
<ReviewApplicationRejectionHistory
applicationRejectionHistory={props.applicationRejectionHistory}
/>
)}

<ReviewFeeSummary
hasAttemptedSubmission={props.hasAttemptedCheckboxes}
areAllConfirmed={props.allConfirmed}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@use "../../../../../../themes/orbcStyles";

@include orbcStyles.permit-main-box-style(".rejection-history");
@include orbcStyles.permit-left-box-style(".rejection-history__header");
@include orbcStyles.permit-right-box-style(".rejection-history__body");

.rejection-history {
&__info {
padding-top: 1.5rem;
}

&__item, .item {

padding-bottom: 1.5rem;

&__row {
&--flex {
display: flex;
}
}}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { Box, Typography } from "@mui/material";
import { ApplicationRejectionHistory } from "../../../../types/ApplicationRejectionHistory";
import "./ReviewApplicationRejectionHistory.scss";
import {
DATE_FORMATS,
toLocal,
} from "../../../../../../common/helpers/formatDate";
import { canViewApplicationQueue } from "../../../../../queue/helpers/canViewApplicationQueue";
import { useContext } from "react";
import OnRouteBCContext from "../../../../../../common/authentication/OnRouteBCContext";

export const ReviewApplicationRejectionHistory = ({
applicationRejectionHistory,
}: {
applicationRejectionHistory: ApplicationRejectionHistory[];
}) => {
const { idirUserDetails } = useContext(OnRouteBCContext);
return (
<Box className="rejection-history">
<Box className="rejection-history__header">
<Typography
variant={"h3"}
className="rejection-history__title"
data-testid="rejection-history-title"
>
Rejection History
</Typography>
</Box>
<Box className="rejection-history__body">
<Box className="rejection-history__info">
{applicationRejectionHistory.map((item) => (
<Box
className="rejection-history__item item"
key={item.caseActivityId}
>
<div className="item__row item__row--flex">
<Typography>
{canViewApplicationQueue(idirUserDetails?.userRole)
? `${item.userName}, ${toLocal(item.dateTime, DATE_FORMATS.LONG)}`
: toLocal(item.dateTime, DATE_FORMATS.LONG)}
</Typography>
</div>
<div className="item__row">
<Typography>{item.caseNotes}</Typography>
</div>
</Box>
))}
</Box>
</Box>
</Box>
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export interface ApplicationRejectionHistory {
caseActivityId: number;
userName: string;
dateTime: string;
caseNotes: string;
}
2 changes: 2 additions & 0 deletions frontend/src/features/permits/types/application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { PermitApplicationOrigin } from "./PermitApplicationOrigin";
import { PermitApprovalSource } from "./PermitApprovalSource";
import { PermitData } from "./PermitData";
import { ApplicationQueueStatus } from "../../queue/types/ApplicationQueueStatus";
import { ApplicationRejectionHistory } from "./ApplicationRejectionHistory";

/**
* A partial permit type that consists of all common fields used for a permit.
Expand Down Expand Up @@ -39,6 +40,7 @@ export interface Application extends PartialApplication {
updatedDateTime?: Nullable<Dayjs>;
permitData: PermitData;
applicant?: Nullable<string>;
rejectionHistory?: Nullable<ApplicationRejectionHistory[]>;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ export const ApplicationInQueueReview = ({
}
doingBusinessAs={doingBusinessAs}
calculatedFee={fee}
applicationRejectionHistory={applicationData?.rejectionHistory}
/>
</FormProvider>
{showRejectApplicationModal && (
Expand Down
Loading