Skip to content

Commit 3cb0e92

Browse files
committed
fix(ui): Consistent can-not-edit alerts in settings
1 parent c62601a commit 3cb0e92

File tree

3 files changed

+11
-22
lines changed

3 files changed

+11
-22
lines changed

static/app/views/settings/dynamicSampling/index.tsx

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,11 @@ import useOrganization from 'sentry/utils/useOrganization';
1616
import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
1717
import {OrganizationSampling} from 'sentry/views/settings/dynamicSampling/organizationSampling';
1818
import {ProjectSampling} from 'sentry/views/settings/dynamicSampling/projectSampling';
19-
import {
20-
useHasDynamicSamplingReadAccess,
21-
useHasDynamicSamplingWriteAccess,
22-
} from 'sentry/views/settings/dynamicSampling/utils/access';
19+
import {useHasDynamicSamplingReadAccess} from 'sentry/views/settings/dynamicSampling/utils/access';
20+
import {OrganizationPermissionAlert} from 'sentry/views/settings/organization/organizationPermissionAlert';
2321

2422
export default function DynamicSamplingSettings() {
2523
const organization = useOrganization();
26-
const hasWriteAccess = useHasDynamicSamplingWriteAccess();
2724
const hasReadAccess = useHasDynamicSamplingReadAccess();
2825

2926
if (
@@ -86,15 +83,7 @@ export default function DynamicSamplingSettings() {
8683
</LinkButton>
8784
}
8885
/>
89-
{!hasWriteAccess && (
90-
<Alert.Container>
91-
<Alert type="warning">
92-
{t(
93-
'These settings can only be edited by users with the organization owner or manager role.'
94-
)}
95-
</Alert>
96-
</Alert.Container>
97-
)}
86+
<OrganizationPermissionAlert />
9887
{hasReadAccess ? (
9988
<Fragment>
10089
<Paragraph>

static/app/views/settings/project/projectPermissionAlert.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,12 @@ export function ProjectPermissionAlert({
2222
{({hasAccess}) =>
2323
!hasAccess && (
2424
<Alert.Container>
25-
<Alert data-test-id="project-permission-alert" type="warning" {...props}>
25+
<Alert
26+
data-test-id="project-permission-alert"
27+
type="warning"
28+
showIcon
29+
{...props}
30+
>
2631
{t(
2732
'These settings can only be edited by users with the organization-level owner, manager, or team-level admin roles.'
2833
)}

static/app/views/settings/projectSeer/index.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {setApiQueryData} from 'sentry/utils/queryClient';
2222
import useOrganization from 'sentry/utils/useOrganization';
2323
import {getPricingDocsLinkForEventType} from 'sentry/views/settings/account/notifications/utils';
2424
import SettingsPageHeader from 'sentry/views/settings/components/settingsPageHeader';
25+
import {ProjectPermissionAlert} from 'sentry/views/settings/project/projectPermissionAlert';
2526

2627
import {AutofixRepositories} from './autofixRepositories';
2728

@@ -226,13 +227,7 @@ function ProjectSeerGeneralForm({project}: ProjectSeerProps) {
226227
}
227228
)}
228229
</Alert>
229-
{!canWriteProject && (
230-
<Alert type="warning" system>
231-
{t(
232-
'These settings can only be edited by users with the organization-level owner, manager, or team-level admin role.'
233-
)}
234-
</Alert>
235-
)}
230+
<ProjectPermissionAlert project={project} />
236231
{showWarning && (
237232
<Alert type="warning" system showIcon>
238233
{t(

0 commit comments

Comments
 (0)