Skip to content

ORV2-2624 - FE: Permission Matrix in Active and Expired Permits tab #2045

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

Merged
glen-aot merged 10 commits into from
May 30, 2025
Merged

ORV2-2624 - FE: Permission Matrix in Active and Expired Permits tab #2045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
79bd10d
rename VIEW_ACTIVE_PERMITS to VIEW_LIST_OF_ACTIVE_PERMITS
glen-aot May 27, 2025
2e8f0a6
Merge remote-tracking branch 'origin' into ORV2-2624
glen-aot May 27, 2025
4584cce
update PermitRowOptions component to handle both IDIR and BCeID users…
glen-aot May 28, 2025
656d8cf
Merge remote-tracking branch 'origin' into ORV2-2624
glen-aot May 28, 2025
ecc6f09
Merge remote-tracking branch 'origin' into ORV2-2624
glen-aot May 28, 2025
377c54d
PR review changes
glen-aot May 28, 2025
a0ad604
Merge remote-tracking branch 'origin' into ORV2-2624
glen-aot May 29, 2025
a3704a1
add permissions matrix check for VIEW_INDIVIDUAL_EXPIRED_PERMIT_PDF a…
glen-aot May 29, 2025
ae37542
update IDIRPermitSearchResults to inlude canViewExpiredPermitReceipt …
glen-aot May 29, 2025
8ae31d5
Merge remote-tracking branch 'origin' into ORV2-2624
glen-aot May 30, 2025
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
8 changes: 8 additions & 0 deletions frontend/src/features/idir/search/components/IDIRPermitSearchResults.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@ export const IDIRPermitSearchResults = memo(
},
});

const canViewExpiredPermitReceipt = usePermissionMatrix({
permissionMatrixKeys: {
permissionMatrixFeatureKey: "MANAGE_PERMITS",
permissionMatrixFunctionKey: "VIEW_EXPIRED_PERMIT_RECEIPT",
},
});

const canAmendPermit = usePermissionMatrix({
permissionMatrixKeys: {
permissionMatrixFeatureKey: "GLOBAL_SEARCH",
Expand Down Expand Up @@ -244,6 +251,7 @@ export const IDIRPermitSearchResults = memo(
canAmendPermit,
canResendPermit,
canViewPermitReceipt,
canViewExpiredPermitReceipt,
canVoidPermit,
}}
/>
Expand Down
17 changes: 17 additions & 0 deletions frontend/src/features/permits/components/permit-list/BasePermitList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ export const BasePermitList = ({
},
});

const canViewIndividualExpiredPermitPDF = usePermissionMatrix({
permissionMatrixKeys: {
permissionMatrixFeatureKey: "MANAGE_PERMITS",
permissionMatrixFunctionKey: "VIEW_INDIVIDUAL_EXPIRED_PERMIT_PDF",
},
});

const canResendPermit = usePermissionMatrix({
permissionMatrixKeys: {
permissionMatrixFeatureKey: "GLOBAL_SEARCH",
Expand All @@ -118,6 +125,13 @@ export const BasePermitList = ({
},
});

const canViewExpiredPermitReceipt = usePermissionMatrix({
permissionMatrixKeys: {
permissionMatrixFeatureKey: "MANAGE_PERMITS",
permissionMatrixFunctionKey: "VIEW_EXPIRED_PERMIT_RECEIPT",
},
});

const canAmendPermit = usePermissionMatrix({
permissionMatrixKeys: {
permissionMatrixFeatureKey: "GLOBAL_SEARCH",
Expand All @@ -136,7 +150,9 @@ export const BasePermitList = ({
...defaultTableOptions,
columns: PermitsColumnDefinition(
() => navigate(ERROR_ROUTES.DOCUMENT_UNAVAILABLE),
isExpired,
canViewIndividualActivePermitPDF,
canViewIndividualExpiredPermitPDF,
),
data: data?.items ?? [],
enableRowSelection: false,
Expand Down Expand Up @@ -200,6 +216,7 @@ export const BasePermitList = ({
canAmendPermit,
canResendPermit,
canViewPermitReceipt,
canViewExpiredPermitReceipt,
canVoidPermit,
}}
/>
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/features/permits/components/permit-list/Columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@ import { getPermitTypeName } from "../../types/PermitType";
*/
export const PermitsColumnDefinition = (
onDocumentUnavailable: () => void,
enableLink: boolean,
isExpired: boolean,
canViewIndividualActivePermitPDF: boolean,
canViewIndividualExpiredPermitPDF: boolean,
): MRT_ColumnDef<PermitListItem>[] => {
const enableLink =
(!isExpired && canViewIndividualActivePermitPDF) ||
(isExpired && canViewIndividualExpiredPermitPDF);
return [
{
accessorKey: "permitNumber",
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/features/permits/components/permit-list/PermitRowOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export const PermitRowOptions = ({
permissions: {
canResendPermit: boolean;
canViewPermitReceipt: boolean;
canViewExpiredPermitReceipt: boolean;
canAmendPermit: boolean;
canVoidPermit: boolean;
};
Expand Down Expand Up @@ -125,6 +126,7 @@ export const PermitRowOptions = ({
const {
canResendPermit,
canViewPermitReceipt,
canViewExpiredPermitReceipt,
canAmendPermit,
canVoidPermit,
} = permissions;
Expand All @@ -136,7 +138,9 @@ export const PermitRowOptions = ({
},
{
action: PERMIT_ACTION_TYPES.VIEW_RECEIPT,
isAuthorized: () => canViewPermitReceipt,
isAuthorized: (isExpired: boolean) =>
(!isExpired && canViewPermitReceipt) ||
(isExpired && canViewExpiredPermitReceipt),
},
{
action: PERMIT_ACTION_TYPES.AMEND,
Expand Down
Loading