rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix obligation pages permission handling

Browse Source 
Signed-off-by: Émile Ré <nemile.re@gmail.com>
This commit is contained in:
Émile Ré
2026-01-02 09:58:53 +01:00
committed by Bryan Frimin
parent 04aecdd7e5
commit 2dd7d7800b
8 changed files with 227 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
apps/console/src/pages/organizations/obligations/ObligationDetailsPage.tsx
View File

@@ -42,8 +42,6 @@ import {
} from "@probo/helpers";
import { SnapshotBanner } from "/components/SnapshotBanner";
import type { ObligationGraphNodeQuery } from "/__generated__/core/ObligationGraphNodeQuery.graphql";
import { use } from "react";
import { PermissionsContext } from "/providers/PermissionsContext";
const updateObligationSchema = z.object({
area: z.string().optional(),
@@ -63,17 +61,18 @@ type Props = {
};
export default function ObligationDetailsPage(props: Props) {
const data = usePreloadedQuery<ObligationGraphNodeQuery>(
const { queryRef } = props;
const { node: obligation } = usePreloadedQuery<ObligationGraphNodeQuery>(
obligationNodeQuery,
props.queryRef,
queryRef,
);
const obligation = data.node;
const { __ } = useTranslate();
const { toast } = useToast();
const organizationId = useOrganizationId();
const { snapshotId } = useParams<{ snapshotId?: string }>();
const isSnapshotMode = Boolean(snapshotId);
const { isAuthorized } = use(PermissionsContext);
const disabled = isSnapshotMode || !obligation.canUpdate;
validateSnapshotConsistency(obligation, snapshotId);
@@ -186,17 +185,16 @@ export default function ObligationDetailsPage(props: Props) {
</div>
</div>
{!isSnapshotMode &&
isAuthorized("Obligation", "deleteObligation") && (
<ActionDropdown>
<DropdownItem
icon={IconTrashCan}
onClick={deleteObligation}
>
{__("Delete")}
</DropdownItem>
</ActionDropdown>
)}
{!isSnapshotMode && obligation.canDelete && (
<ActionDropdown>
<DropdownItem
icon={IconTrashCan}
onClick={deleteObligation}
>
{__("Delete")}
</DropdownItem>
</ActionDropdown>
)}
</div>
<Card padded>
@@ -209,7 +207,7 @@ export default function ObligationDetailsPage(props: Props) {
<Input
{...register("area")}
placeholder={__("Enter area")}
disabled={isSnapshotMode}
disabled={disabled}
/>
</Field>
@@ -220,7 +218,7 @@ export default function ObligationDetailsPage(props: Props) {
<Input
{...register("source")}
placeholder={__("Enter source")}
disabled={isSnapshotMode}
disabled={disabled}
/>
</Field>
</div>
@@ -237,7 +235,7 @@ export default function ObligationDetailsPage(props: Props) {
onValueChange={field.onChange}
value={field.value}
className="w-full"
disabled={isSnapshotMode}
disabled={disabled}
>
{statusOptions.map((option) => (
<Option
@@ -268,7 +266,7 @@ export default function ObligationDetailsPage(props: Props) {
label={__("Owner")}
error={formState.errors.ownerId?.message}
required
disabled={isSnapshotMode}
disabled={disabled}
/>
)}
/>
@@ -282,7 +280,7 @@ export default function ObligationDetailsPage(props: Props) {
<Input
{...register("regulator")}
placeholder={__("Enter regulator")}
disabled={isSnapshotMode}
disabled={disabled}
/>
</Field>
@@ -300,7 +298,7 @@ export default function ObligationDetailsPage(props: Props) {
onValueChange={field.onChange}
value={field.value}
className="w-full"
disabled={isSnapshotMode}
disabled={disabled}
>
{typeOptions.map((option) => (
<Option
@@ -324,7 +322,7 @@ export default function ObligationDetailsPage(props: Props) {
<Input
{...register("lastReviewDate")}
type="date"
disabled={isSnapshotMode}
disabled={disabled}
/>
</Field>
@@ -335,7 +333,7 @@ export default function ObligationDetailsPage(props: Props) {
<Input
{...register("dueDate")}
type="date"
disabled={isSnapshotMode}
disabled={disabled}
/>
</Field>
</div>
@@ -348,7 +346,7 @@ export default function ObligationDetailsPage(props: Props) {
{...register("requirement")}
placeholder={__("Enter requirement")}
rows={4}
disabled={isSnapshotMode}
disabled={disabled}
/>
</Field>
@@ -360,13 +358,13 @@ export default function ObligationDetailsPage(props: Props) {
{...register("actionsToBeImplemented")}
placeholder={__("Enter actions to be implemented")}
rows={4}
disabled={isSnapshotMode}
disabled={disabled}
/>
</Field>
{!isSnapshotMode && (
<div className="flex justify-end">
{isAuthorized("Obligation", "updateObligation") && (
{obligation.canUpdate && (
<Button
type="submit"
disabled={formState.isSubmitting}

13
apps/console/src/pages/organizations/obligations/ObligationsPage.tsx
View File

@@ -42,8 +42,6 @@ import type {
ObligationsPageFragment$key,
ObligationsPageFragment$data,
} from "/__generated__/core/ObligationsPageFragment.graphql";
import { use } from "react";
import { PermissionsContext } from "/providers/PermissionsContext";
import type { ObligationGraphListQuery } from "/__generated__/core/ObligationGraphListQuery.graphql";
type Obligation =
@@ -88,6 +86,8 @@ const obligationsPageFragment = graphql`
}
createdAt
updatedAt
canUpdate: permission(action: "core:obligation:update")
canDelete: permission(action: "core:obligation:delete")
}
}
pageInfo {
@@ -103,7 +103,6 @@ export default function ObligationsPage({ queryRef }: ObligationsPageProps) {
const organizationId = useOrganizationId();
const { snapshotId } = useParams<{ snapshotId?: string }>();
const isSnapshotMode = Boolean(snapshotId);
const { isAuthorized } = use(PermissionsContext);
usePageTitle(__("Obligations"));
@@ -124,8 +123,7 @@ export default function ObligationsPage({ queryRef }: ObligationsPageProps) {
const hasAnyAction =
!isSnapshotMode &&
(isAuthorized("Obligation", "updateObligation") ||
isAuthorized("Obligation", "deleteObligation"));
obligations.some(({ canUpdate, canDelete }) => canDelete || canUpdate);
return (
<div className="space-y-6">
@@ -136,7 +134,7 @@ export default function ObligationsPage({ queryRef }: ObligationsPageProps) {
title={__("Obligations")}
description={__("Manage your organization's obligations.")}
>
{!snapshotId && isAuthorized("Organization", "createObligation") && (
{!snapshotId && organization.node.canCreateObligation && (
<CreateObligationDialog
organizationId={organizationId}
connection={connectionId}
@@ -216,7 +214,6 @@ function ObligationRow({
const [deleteObligation] = useMutation(deleteObligationMutation);
const confirm = useConfirm();
const isSnapshotMode = Boolean(snapshotId);
const { isAuthorized } = use(PermissionsContext);
const handleDelete = () => {
confirm(
@@ -267,7 +264,7 @@ function ObligationRow({
{hasAnyAction && (
<Td noLink width={50} className="text-end">
<ActionDropdown>
{isAuthorized("Obligation", "deleteObligation") && (
{obligation.canDelete && (
<DropdownItem
icon={IconTrashCan}
variant="danger"