diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py index d0e5597a48fb6..34a78cb6f4cdd 100644 --- a/src/sentry/conf/server.py +++ b/src/sentry/conf/server.py @@ -1102,6 +1102,8 @@ def SOCIAL_AUTH_DEFAULT_USERNAME(): "organizations:discover-query": True, # Enable archive/escalating issue workflow "organizations:escalating-issues": False, + # Enable archive/escalating issue workflow UI, enable everything except post processing + "organizations:escalating-issues-ui": False, # Allows an org to have a larger set of project ownership rules per project "organizations:higher-ownership-limit": False, # Enable Performance view diff --git a/src/sentry/features/__init__.py b/src/sentry/features/__init__.py index 4bb1df5989aa4..654ec3413e03f 100644 --- a/src/sentry/features/__init__.py +++ b/src/sentry/features/__init__.py @@ -212,6 +212,7 @@ default_manager.add("organizations:dynamic-sampling", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) default_manager.add("organizations:dynamic-sampling-transaction-name-priority", OrganizationFeature, FeatureHandlerStrategy.REMOTE) default_manager.add("organizations:escalating-issues", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) +default_manager.add("organizations:escalating-issues-ui", OrganizationFeature, FeatureHandlerStrategy.REMOTE) default_manager.add("organizations:event-attachments", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) default_manager.add("organizations:global-views", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) default_manager.add("organizations:incidents", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) diff --git a/static/app/components/group/inboxBadges/inboxReason.tsx b/static/app/components/group/inboxBadges/inboxReason.tsx index 12e0350a00337..1d0c07b0ea2f9 100644 --- a/static/app/components/group/inboxBadges/inboxReason.tsx +++ b/static/app/components/group/inboxBadges/inboxReason.tsx @@ -91,7 +91,7 @@ function InboxReason({inbox, fontSize = 'sm', showDateAdded}: Props) { tooltipDescription?: string | React.ReactNode; tooltipText?: string; } { - const hasEscalatingIssues = organization.features.includes('escalating-issues'); + const hasEscalatingIssues = organization.features.includes('escalating-issues-ui'); switch (reason) { case GroupInboxReason.UNIGNORED: return { diff --git a/static/app/stores/tagStore.spec.jsx b/static/app/stores/tagStore.spec.jsx index 854513485496a..3922a7cebec8c 100644 --- a/static/app/stores/tagStore.spec.jsx +++ b/static/app/stores/tagStore.spec.jsx @@ -79,7 +79,7 @@ describe('TagStore', function () { ]); const tags = TagStore.getIssueAttributes( - TestStubs.Organization({features: ['escalating-issues']}) + TestStubs.Organization({features: ['escalating-issues-ui']}) ); expect(tags.is.values).toContain('archived'); expect(tags.is.values).not.toContain('ignored'); diff --git a/static/app/stores/tagStore.tsx b/static/app/stores/tagStore.tsx index d71abc68353df..1f4af5ff26bc8 100644 --- a/static/app/stores/tagStore.tsx +++ b/static/app/stores/tagStore.tsx @@ -39,7 +39,7 @@ const storeConfig: TagStoreDefinition = { const isSuggestions = [ 'resolved', 'unresolved', - org.features.includes('escalating-issues') ? 'archived' : 'ignored', + org.features.includes('escalating-issues-ui') ? 'archived' : 'ignored', 'assigned', 'for_review', 'unassigned', diff --git a/static/app/views/issueDetails/actions/index.tsx b/static/app/views/issueDetails/actions/index.tsx index 2ef889104a510..1064f8090f8dd 100644 --- a/static/app/views/issueDetails/actions/index.tsx +++ b/static/app/views/issueDetails/actions/index.tsx @@ -362,7 +362,7 @@ class Actions extends Component { share: shareCap, } = getConfigForIssueType(group).actions; - const hasEscalatingIssues = organization.features.includes('escalating-issues'); + const hasEscalatingIssues = organization.features.includes('escalating-issues-ui'); const hasDeleteAccess = organization.access.includes('event:admin'); const activeSuperUser = isActiveSuperuser(); diff --git a/static/app/views/issueList/actions/actionSet.tsx b/static/app/views/issueList/actions/actionSet.tsx index cd4e4675330f5..7c408643b072f 100644 --- a/static/app/views/issueList/actions/actionSet.tsx +++ b/static/app/views/issueList/actions/actionSet.tsx @@ -228,7 +228,7 @@ function ActionSet({ /> )} - {organization.features.includes('escalating-issues') ? ( + {organization.features.includes('escalating-issues-ui') ? ( , { context: routerContext, diff --git a/static/app/views/issueList/utils.tsx b/static/app/views/issueList/utils.tsx index 3688f7d7c6fef..4e326c0fc380c 100644 --- a/static/app/views/issueList/utils.tsx +++ b/static/app/views/issueList/utils.tsx @@ -62,7 +62,7 @@ export function getTabs(organization: Organization) { Issues are automatically marked reviewed in 7 days.`), }, ], - organization.features.includes('escalating-issues') + organization.features.includes('escalating-issues-ui') ? [ Query.ARCHIVED, { diff --git a/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx b/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx index 08c3df3f80a2e..25eff998a06e3 100644 --- a/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx +++ b/static/app/views/settings/organizationDeveloperSettings/subscriptionBox.tsx @@ -55,7 +55,7 @@ function SubscriptionBox({ const DESCRIPTIONS: Record<(typeof EVENT_CHOICES)[number], string> = { // Swap ignored for archived if the feature is enabled issue: `created, resolved, assigned, ${ - features.includes('escalating-issues') ? 'archived' : 'ignored' + features.includes('escalating-issues-ui') ? 'archived' : 'ignored' }`, error: 'created', comment: 'created, edited, deleted',