Skip to content

feat(webhooks): allow org members read-only access to org webhooks #1043

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
sejori merged 2 commits into from
May 5, 2026
Merged

feat(webhooks): allow org members read-only access to org webhooks #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
140d989
feat(webhooks): allow org members read-only access to org webhooks
sejori May 5, 2026
513833d
chore(webhooks): address PR review feedback
sejori May 5, 2026
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: 5 additions & 3 deletions dashboard/src/api/control-layer/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,13 @@ export function useUsers(options?: UsersQuery & { enabled?: boolean }) {
}


export function useUser(id: string, options?: { include?: string }) {
export function useUser(id: string, options?: { include?: string; enabled?: boolean }) {
const { enabled = true, include } = options || {};
return useQuery({
queryKey: queryKeys.users.byId(id, options?.include),
queryFn: () => dwctlApi.users.get(id, options),
queryKey: queryKeys.users.byId(id, include),
queryFn: () => dwctlApi.users.get(id, { include }),
staleTime: 30 * 1000, // 30 seconds - matches useTransactions to keep balance in sync
enabled,
});
}

Expand Down
137 changes: 81 additions & 56 deletions dashboard/src/components/features/notifications/NotificationSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,25 @@ interface NotificationSettingsProps {
showPlatformScope?: boolean;
/** Whether the userId refers to an organization */
isOrganization?: boolean;
/**
* Render webhook list as read-only — hides email & low-balance toggles
* and all webhook mutation controls. Used to let regular org members see
* the org's webhooks (and any delivery failures) without being able to
* change them.
*/
readOnly?: boolean;
}

export const NotificationSettings: React.FC<NotificationSettingsProps> = ({
userId,
showPlatformScope = false,
isOrganization = false,
readOnly = false,
}) => {
const { data: user, refetch: refetchUser } = useUser(userId);
// Skip the user fetch in read-only mode — every consumer of `user` is in
// the email/low-balance section, which read-only callers don't render. Also
// avoids a needless 403 if a member lacks permission to read the org user.
const { data: user, refetch: refetchUser } = useUser(userId, { enabled: !readOnly });
const updateUserMutation = useUpdateUser();
const updateOrgMutation = useUpdateOrganization();
const navigate = useNavigate();
Expand Down Expand Up @@ -355,9 +366,11 @@ export const NotificationSettings: React.FC<NotificationSettingsProps> = ({
<>
<div className="bg-white rounded-lg shadow-sm border border-gray-200 p-6">
<h4 className="text-lg font-medium text-gray-900 mb-4">
Notifications
{readOnly ? "Webhooks" : "Notifications"}
</h4>

{!readOnly && (
<>
{/* Email Section */}
<h5 className="text-sm font-medium text-gray-500 uppercase tracking-wide mb-3">
Email
Expand Down Expand Up @@ -446,10 +459,15 @@ export const NotificationSettings: React.FC<NotificationSettingsProps> = ({
</div>
</div>

</>
)}

{/* Webhooks Section */}
<h5 className="text-sm font-medium text-gray-500 uppercase tracking-wide mt-6 mb-3">
Webhooks
</h5>
{!readOnly && (
<h5 className="text-sm font-medium text-gray-500 uppercase tracking-wide mt-6 mb-3">
Webhooks
</h5>
)}
<div>
<div className="flex items-center justify-between mb-3">
<div className="flex items-center gap-3">
Expand All @@ -458,19 +476,23 @@ export const NotificationSettings: React.FC<NotificationSettingsProps> = ({
</div>
<div>
<p className="text-xs text-gray-500">
Receive HTTP callbacks when events occur
{readOnly
? "HTTP callbacks sent when events occur. Contact an admin to make changes."
: "Receive HTTP callbacks when events occur"}
</p>
</div>
</div>
<Button
variant="outline"
size="sm"
onClick={openCreateWebhookDialog}
aria-label="Add webhook"
>
<Plus className="w-3.5 h-3.5" />
Add Webhook
</Button>
{!readOnly && (
<Button
variant="outline"
size="sm"
onClick={openCreateWebhookDialog}
aria-label="Add webhook"
>
<Plus className="w-3.5 h-3.5" />
Add Webhook
</Button>
)}
</div>

{/* Webhook List */}
Expand Down Expand Up @@ -541,53 +563,56 @@ export const NotificationSettings: React.FC<NotificationSettingsProps> = ({
)}
</div>
</div>
<div className="flex items-center gap-1 shrink-0">
<Switch
checked={webhook.enabled}
onCheckedChange={() =>
handleWebhookToggle(webhook)
}
aria-label={`Toggle webhook ${webhook.url}`}
/>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon"
className="h-7 w-7"
onClick={() => openEditWebhookDialog(webhook)}
aria-label={`Edit webhook ${webhook.url}`}
>
<Pencil className="w-3.5 h-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent>Edit webhook</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon"
className="h-7 w-7 text-red-500 hover:text-red-700 hover:bg-red-50"
onClick={() =>
setDeletingWebhookId(webhook.id)
}
aria-label={`Delete webhook ${webhook.url}`}
>
<Trash2 className="w-3.5 h-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent>Delete webhook</TooltipContent>
</Tooltip>
</div>
{!readOnly && (
<div className="flex items-center gap-1 shrink-0">
<Switch
checked={webhook.enabled}
onCheckedChange={() =>
handleWebhookToggle(webhook)
}
aria-label={`Toggle webhook ${webhook.url}`}
/>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon"
className="h-7 w-7"
onClick={() => openEditWebhookDialog(webhook)}
aria-label={`Edit webhook ${webhook.url}`}
>
<Pencil className="w-3.5 h-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent>Edit webhook</TooltipContent>
</Tooltip>
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon"
className="h-7 w-7 text-red-500 hover:text-red-700 hover:bg-red-50"
onClick={() =>
setDeletingWebhookId(webhook.id)
}
aria-label={`Delete webhook ${webhook.url}`}
>
<Trash2 className="w-3.5 h-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent>Delete webhook</TooltipContent>
</Tooltip>
</div>
)}
</div>
</div>
))}
</div>
) : (
<div className="text-sm text-gray-500 py-4 text-center border border-dashed border-gray-200 rounded-lg">
No webhooks configured. Add one to receive HTTP
notifications.
{readOnly
? "No webhooks configured."
: "No webhooks configured. Add one to receive HTTP notifications."}
</div>
)}
</div>
Expand Down
12 changes: 11 additions & 1 deletion dashboard/src/components/features/organizations/MyOrganization.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe("MyOrganization", () => {
).toBeInTheDocument();
});

it("does not render notification settings for regular members", async () => {
it("renders read-only webhooks view for regular members", async () => {
server.use(userWithOrg("member"));
const { container } = render(<MyOrganization />, {
wrapper: createWrapper(),
Expand All @@ -113,9 +113,19 @@ describe("MyOrganization", () => {
).toBeInTheDocument();
});

// Read-only view: heading is "Webhooks", and admin-only controls are absent.
expect(
within(container).getByRole("heading", { name: "Webhooks" }),
).toBeInTheDocument();
expect(
within(container).queryByRole("heading", { name: "Notifications" }),
).not.toBeInTheDocument();
expect(
within(container).queryByRole("button", { name: "Add webhook" }),
).not.toBeInTheDocument();
expect(
within(container).queryByRole("switch", { name: "Email notifications" }),
).not.toBeInTheDocument();
});

it("passes the org ID to NotificationSettings", async () => {
Expand Down
8 changes: 5 additions & 3 deletions dashboard/src/components/features/organizations/MyOrganization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ export function MyOrganization() {
readOnly={!canManage}
/>

{canManage && (
<NotificationSettings userId={activeOrganizationId} isOrganization />
)}
<NotificationSettings
userId={activeOrganizationId}
isOrganization
readOnly={!canManage}
/>
</div>
);
}
Loading
Loading