diff --git a/static/app/types/event.tsx b/static/app/types/event.tsx index d26f0ead43b5a3..aacd0c4b67e8ad 100644 --- a/static/app/types/event.tsx +++ b/static/app/types/event.tsx @@ -29,7 +29,7 @@ export type EventGroupComponent = { name: string | null; values: EventGroupComponent[] | string[]; }; -export type EventGroupingConfig = { +type EventGroupingConfig = { base: string | null; delegates: string[]; id: string; diff --git a/static/app/views/settings/projectGeneralSettings/index.spec.tsx b/static/app/views/settings/projectGeneralSettings/index.spec.tsx index 993f415d2328e3..ef5bd216dd8218 100644 --- a/static/app/views/settings/projectGeneralSettings/index.spec.tsx +++ b/static/app/views/settings/projectGeneralSettings/index.spec.tsx @@ -1,4 +1,3 @@ -import {GroupingConfigsFixture} from 'sentry-fixture/groupingConfigs'; import {OrganizationFixture} from 'sentry-fixture/organization'; import {ProjectFixture} from 'sentry-fixture/project'; @@ -37,7 +36,6 @@ describe('projectGeneralSettings', () => { securityTokenHeader: 'x-security-header', verifySSL: true, }); - const groupingConfigs = GroupingConfigsFixture(); let putMock: jest.Mock; const mockOnChangeSlug = jest.fn(); @@ -50,11 +48,6 @@ describe('projectGeneralSettings', () => { beforeEach(() => { MockApiClient.clearMockResponses(); - MockApiClient.addMockResponse({ - url: `/organizations/${organization.slug}/grouping-configs/`, - method: 'GET', - body: groupingConfigs, - }); MockApiClient.addMockResponse({ url: `/projects/${organization.slug}/${project.slug}/`, method: 'GET', @@ -471,11 +464,6 @@ describe('projectGeneralSettings', () => { beforeEach(() => { mockOnChangeSlug.mockClear(); MockApiClient.clearMockResponses(); - MockApiClient.addMockResponse({ - url: '/organizations/org-slug/grouping-configs/', - method: 'GET', - body: groupingConfigs, - }); MockApiClient.addMockResponse({ url: '/projects/org-slug/project-slug/environments/', method: 'GET', diff --git a/static/app/views/settings/projectIssueGrouping/index.spec.tsx b/static/app/views/settings/projectIssueGrouping/index.spec.tsx index 9fcb7dd6626db9..12ea404e572146 100644 --- a/static/app/views/settings/projectIssueGrouping/index.spec.tsx +++ b/static/app/views/settings/projectIssueGrouping/index.spec.tsx @@ -13,47 +13,15 @@ describe('projectIssueGrouping', () => { const project = projects[0]!; it('renders successfully', async () => { - const request = MockApiClient.addMockResponse({ - url: `/projects/${organization.slug}/${project.slug}/grouping-configs/`, - body: [], - }); - render(, { organization, outletContext: {project}, }); - expect(request).toHaveBeenCalled(); expect(await screen.findByText('Issue Grouping')).toBeInTheDocument(); }); - it('renders error', async () => { - const request = MockApiClient.addMockResponse({ - url: `/projects/${organization.slug}/${project.slug}/grouping-configs/`, - body: { - detail: 'Internal Error', - }, - statusCode: 500, - }); - - render(, { - organization, - outletContext: {project}, - }); - - expect(request).toHaveBeenCalled(); - expect( - await screen.findByText('Failed to load grouping configs') - ).toBeInTheDocument(); - }); - it('shows derived grouping enhancements only for superusers', async () => { - // Mock the API response - MockApiClient.addMockResponse({ - url: `/projects/${organization.slug}/${project.slug}/grouping-configs/`, - body: [], - }); - // First render with a non-superuser const {rerender} = render(, { organization, diff --git a/static/app/views/settings/projectIssueGrouping/index.tsx b/static/app/views/settings/projectIssueGrouping/index.tsx index d822c49c78c65e..f11dbe2e3c2041 100644 --- a/static/app/views/settings/projectIssueGrouping/index.tsx +++ b/static/app/views/settings/projectIssueGrouping/index.tsx @@ -3,16 +3,11 @@ import {ExternalLink} from '@sentry/scraps/link'; import {hasEveryAccess} from 'sentry/components/acl/access'; import {Form} from 'sentry/components/forms/form'; import JsonForm from 'sentry/components/forms/jsonForm'; -import {LoadingError} from 'sentry/components/loadingError'; -import {LoadingIndicator} from 'sentry/components/loadingIndicator'; import {SentryDocumentTitle} from 'sentry/components/sentryDocumentTitle'; import {fields} from 'sentry/data/forms/projectIssueGrouping'; import {t, tct} from 'sentry/locale'; import {ProjectsStore} from 'sentry/stores/projectsStore'; -import type {EventGroupingConfig} from 'sentry/types/event'; import type {Project} from 'sentry/types/project'; -import {getApiUrl} from 'sentry/utils/api/getApiUrl'; -import {useApiQuery} from 'sentry/utils/queryClient'; import {routeTitleGen} from 'sentry/utils/routeTitle'; import {useOrganization} from 'sentry/utils/useOrganization'; import {SettingsPageHeader} from 'sentry/views/settings/components/settingsPageHeader'; @@ -24,29 +19,6 @@ export default function ProjectIssueGrouping() { const organization = useOrganization(); const {project} = useProjectSettingsOutlet(); - const queryKey = getApiUrl( - '/projects/$organizationIdOrSlug/$projectIdOrSlug/grouping-configs/', - { - path: {organizationIdOrSlug: organization.slug, projectIdOrSlug: project.slug}, - } - ); - const { - data: groupingConfigs, - isPending, - isError, - refetch, - } = useApiQuery([queryKey], {staleTime: 0, gcTime: 0}); - - if (isPending) { - return ; - } - - if (isError) { - return ( - - ); - } - const handleSubmit = (response: Project) => { // This will update our project context ProjectsStore.onUpdateSuccess(response); @@ -58,10 +30,6 @@ export default function ProjectIssueGrouping() { const hasAccess = hasEveryAccess(['project:write'], {organization, project}); const jsonFormProps = { - additionalFieldProps: { - organization, - groupingConfigs, - }, features: new Set(organization.features), access, disabled: !hasAccess, diff --git a/tests/js/fixtures/groupingConfigs.ts b/tests/js/fixtures/groupingConfigs.ts deleted file mode 100644 index ff21fd052c8c08..00000000000000 --- a/tests/js/fixtures/groupingConfigs.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type {EventGroupingConfig} from 'sentry/types/event'; - -export function GroupingConfigsFixture(): EventGroupingConfig[] { - return [ - { - id: 'default:XXXX', - base: null, - delegates: [], - strategies: [], - }, - ]; -}