diff --git a/prediqo_web/src/features/approvals/ApprovalPoliciesPage.tsx b/prediqo_web/src/features/approvals/ApprovalPoliciesPage.tsx index 2ffdf99c..4e2b0c89 100644 --- a/prediqo_web/src/features/approvals/ApprovalPoliciesPage.tsx +++ b/prediqo_web/src/features/approvals/ApprovalPoliciesPage.tsx @@ -131,13 +131,16 @@ const emptyPolicy = (): PolicyDraft => ({ export function ApprovalPoliciesPage() { const { t } = useTranslation(); const qc = useQueryClient(); - const { permissions, canApproveFundOps } = useAuth(); + const { canApproveFundOps, can, auth } = useAuth(); + const permissions = auth.permissions ?? []; const canView = canApproveFundOps || hasPermission(permissions, 'approval_policy.view') || hasPermission(permissions, 'admin.approval_policies.view') || hasPermission(permissions, 'approval_policy.manage') || - hasPermission(permissions, 'admin.approval_policies.manage'); + hasPermission(permissions, 'admin.approval_policies.manage') || + can('fund_operation.approve') || + can('admin.fund_operations.approve'); const canManage = hasPermission(permissions, 'approval_policy.manage') || hasPermission(permissions, 'admin.approval_policies.manage') || diff --git a/prediqo_web/src/shared/auth/permissions.ts b/prediqo_web/src/shared/auth/permissions.ts index cce73b74..57d2c52c 100644 --- a/prediqo_web/src/shared/auth/permissions.ts +++ b/prediqo_web/src/shared/auth/permissions.ts @@ -25,20 +25,22 @@ const LEGACY_IMPLIES: Record = { 'approval_policy.manage': ['admin.approval_policies.manage'], }; -function expand(userPerms: string[]): Set { - const out = new Set(userPerms); - for (const p of userPerms) { +function expand(userPerms: string[] | null | undefined): Set { + const list = userPerms ?? []; + const out = new Set(list); + for (const p of list) { LEGACY_IMPLIES[p]?.forEach((k) => out.add(k)); } return out; } -export function hasPermission(userPerms: string[], required: string): boolean { - if (userPerms.includes(required)) return true; - const expanded = expand(userPerms); +export function hasPermission(userPerms: string[] | null | undefined, required: string): boolean { + const perms = userPerms ?? []; + if (perms.includes(required)) return true; + const expanded = expand(perms); if (expanded.has(required)) return true; const implied = LEGACY_IMPLIES[required]; - if (implied?.some((g) => userPerms.includes(g) || expanded.has(g))) return true; + if (implied?.some((g) => perms.includes(g) || expanded.has(g))) return true; return false; }