Skip to content

fix(ui): Consistent can-not-edit alerts in settings #93467

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 1 commit into from
Jun 13, 2025
+11 −22
Merged

fix(ui): Consistent can-not-edit alerts in settings #93467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 3 additions & 14 deletions static/app/views/settings/dynamicSampling/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@ import useOrganization from 'sentry/utils/useOrganization';
import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
import {OrganizationSampling} from 'sentry/views/settings/dynamicSampling/organizationSampling';
import {ProjectSampling} from 'sentry/views/settings/dynamicSampling/projectSampling';
import {
useHasDynamicSamplingReadAccess,
useHasDynamicSamplingWriteAccess,
} from 'sentry/views/settings/dynamicSampling/utils/access';
import {useHasDynamicSamplingReadAccess} from 'sentry/views/settings/dynamicSampling/utils/access';
import {OrganizationPermissionAlert} from 'sentry/views/settings/organization/organizationPermissionAlert';

export default function DynamicSamplingSettings() {
const organization = useOrganization();
const hasWriteAccess = useHasDynamicSamplingWriteAccess();
const hasReadAccess = useHasDynamicSamplingReadAccess();

if (
Expand Down Expand Up @@ -86,15 +83,7 @@ export default function DynamicSamplingSettings() {
</LinkButton>
}
/>
{!hasWriteAccess && (
<Alert.Container>
<Alert type="warning">
{t(
'These settings can only be edited by users with the organization owner or manager role.'
)}
</Alert>
</Alert.Container>
)}
<OrganizationPermissionAlert />
{hasReadAccess ? (
<Fragment>
<Paragraph>
Expand Down
7 changes: 6 additions & 1 deletion static/app/views/settings/project/projectPermissionAlert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ export function ProjectPermissionAlert({
{({hasAccess}) =>
!hasAccess && (
<Alert.Container>
<Alert data-test-id="project-permission-alert" type="warning" {...props}>
<Alert
data-test-id="project-permission-alert"
type="warning"
showIcon
{...props}
>
{t(
'These settings can only be edited by users with the organization-level owner, manager, or team-level admin roles.'
)}
Expand Down
9 changes: 2 additions & 7 deletions static/app/views/settings/projectSeer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {setApiQueryData} from 'sentry/utils/queryClient';
import useOrganization from 'sentry/utils/useOrganization';
import {getPricingDocsLinkForEventType} from 'sentry/views/settings/account/notifications/utils';
import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
import {ProjectPermissionAlert} from 'sentry/views/settings/project/projectPermissionAlert';

import {AutofixRepositories} from './autofixRepositories';

Expand Down Expand Up @@ -226,13 +227,7 @@ function ProjectSeerGeneralForm({project}: ProjectSeerProps) {
}
)}
</Alert>
{!canWriteProject && (
<Alert type="warning" system>
{t(
'These settings can only be edited by users with the organization-level owner, manager, or team-level admin role.'
)}
</Alert>
)}
<ProjectPermissionAlert project={project} />
{showWarning && (
<Alert type="warning" system showIcon>
{t(
Expand Down
Loading