Skip to content

fix(site): ensure notification settings page follows RBAC correctly #19097

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
merged 2 commits into from
Jul 31, 2025
Merged

fix(site): ensure notification settings page follows RBAC correctly #19097

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
e23db57
fix(site): allow template admins to see template notification settings
DanielleMaywood Jul 30, 2025
d15973a
filter groups at the render level, rather than the data fetching leve…
aslilac Jul 31, 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
16 changes: 14 additions & 2 deletions site/src/pages/UserSettingsPage/NotificationsPage/NotificationsPage.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const meta = {
},
],
user: MockUserOwner,
permissions: { viewDeploymentConfig: true },
permissions: { createTemplates: true, createUser: true },
},
decorators: [withGlobalSnackbar, withAuthProvider, withDashboardProvider],
} satisfies Meta<typeof NotificationsPage>;
Expand Down Expand Up @@ -74,7 +74,19 @@ export const ToggleNotification: Story = {

export const NonAdmin: Story = {
parameters: {
permissions: { viewDeploymentConfig: false },
permissions: { createTemplates: false, createUser: false },
},
};

export const TemplateAdmin: Story = {
parameters: {
permissions: { createTemplates: true, createUser: false },
},
};

export const UserAdmin: Story = {
parameters: {
permissions: { createTemplates: false, createUser: true },
},
};

Expand Down
31 changes: 22 additions & 9 deletions site/src/pages/UserSettingsPage/NotificationsPage/NotificationsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
methodIcons,
methodLabels,
} from "modules/notifications/utils";
import type { Permissions } from "modules/permissions";
import { type FC, Fragment } from "react";
import { useEffect } from "react";
import { Helmet } from "react-helmet-async";
Expand All @@ -46,15 +47,7 @@ const NotificationsPage: FC = () => {
},
{
...systemNotificationTemplates(),
select: (data: NotificationTemplate[]) => {
const groups = selectTemplatesByGroup(data);
return permissions.viewDeploymentConfig
? groups
: {
// Members only have access to the "Workspace Notifications" group
"Workspace Events": groups["Workspace Events"],
};
},
select: (data: NotificationTemplate[]) => selectTemplatesByGroup(data),
},
notificationDispatchMethods(),
],
Expand Down Expand Up @@ -103,6 +96,10 @@ const NotificationsPage: FC = () => {
{ready ? (
<Stack spacing={4}>
{Object.entries(templatesByGroup.data).map(([group, templates]) => {
if (!canSeeNotificationGroup(group, permissions)) {
return null;
}

const allDisabled = templates.some((tpl) => {
return notificationIsDisabled(disabledPreferences.data, tpl);
});
Expand Down Expand Up @@ -211,6 +208,22 @@ const NotificationsPage: FC = () => {

export default NotificationsPage;

function canSeeNotificationGroup(
group: string,
permissions: Permissions,
): boolean {
switch (group) {
case "Workspace Events":
return true;
case "Template Events":
return permissions.createTemplates;
case "User Events":
return permissions.createUser;
default:
return false;
}
}

function notificationIsDisabled(
disabledPreferences: Record<string, boolean>,
tmpl: NotificationTemplate,
Expand Down
26 changes: 26 additions & 0 deletions site/src/testHelpers/entities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4402,6 +4402,32 @@ export const MockNotificationTemplates: TypesGen.NotificationTemplate[] = [
kind: "system",
enabled_by_default: true,
},
{
id: "template-event-1",
name: "Template Version Created",
title_template: 'Template version "{{.Labels.version_name}}" created',
body_template:
'Hi {{.UserName}}\nA new version of template "{{.Labels.template_name}}" has been created.',
actions:
'[{"url": "{{ base_url }}/templates/{{.Labels.template_name}}", "label": "View template"}]',
group: "Template Events",
method: "smtp",
kind: "system",
enabled_by_default: true,
},
{
id: "template-event-2",
name: "Template Updated",
title_template: 'Template "{{.Labels.template_name}}" updated',
body_template:
'Hi {{.UserName}}\nTemplate "{{.Labels.template_name}}" has been updated.',
actions:
'[{"url": "{{ base_url }}/templates/{{.Labels.template_name}}", "label": "View template"}]',
group: "Template Events",
method: "webhook",
kind: "system",
enabled_by_default: true,
},
];

export const MockNotificationMethodsResponse: TypesGen.NotificationMethodsResponse =
Expand Down
Loading