Skip to content

Commit 3e25238

Browse files
authored
Merge branch 'master' into john/encode-compressed-utf8
2 parents 40da62f + 014ad52 commit 3e25238

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

src/sentry/workflow_engine/endpoints/serializers.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class SentryAppContext(TypedDict):
5252
installationId: str
5353
status: int
5454
settings: NotRequired[dict[str, Any]]
55+
title: NotRequired[str]
5556

5657

5758
class ActionHandlerSerializerResponse(TypedDict):
@@ -102,14 +103,17 @@ def serialize(
102103
sentry_app_context = kwargs.get("sentry_app_context")
103104
if sentry_app_context:
104105
installation = sentry_app_context.installation
106+
component = sentry_app_context.component
105107
sentry_app: SentryAppContext = {
106108
"id": str(installation.sentry_app.id),
107109
"name": installation.sentry_app.name,
108110
"installationId": str(installation.id),
109111
"status": installation.sentry_app.status,
110112
}
111-
if sentry_app_context.component:
112-
sentry_app["settings"] = sentry_app_context.component.app_schema.get("settings", {})
113+
if component:
114+
sentry_app["settings"] = component.app_schema.get("settings", {})
115+
if component.app_schema.get("title"):
116+
sentry_app["title"] = component.app_schema.get("title")
113117
result["sentryApp"] = sentry_app
114118

115119
services = kwargs.get("services")

static/app/types/hooks.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ export type FeatureDisabledHooks = {
239239
'feature-disabled:discover2-page': FeatureDisabledHook;
240240
'feature-disabled:discover2-sidebar-item': FeatureDisabledHook;
241241
'feature-disabled:grid-editable-actions': FeatureDisabledHook;
242+
'feature-disabled:issue-views': FeatureDisabledHook;
242243
'feature-disabled:open-discover': FeatureDisabledHook;
243244
'feature-disabled:open-in-discover': FeatureDisabledHook;
244245
'feature-disabled:performance-new-project': FeatureDisabledHook;

static/gsApp/registerHooks.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,11 @@ const GETSENTRY_HOOKS: Partial<Hooks> = {
350350
</PowerFeatureHovercard>
351351
),
352352
'feature-disabled:open-in-discover': p => <OpenInDiscoverBtn {...p} />,
353+
'feature-disabled:issue-views': p => (
354+
<PowerFeatureHovercard features={['organizations:issue-views']} id="issue-views">
355+
{typeof p.children === 'function' ? p.children(p) : p.children}
356+
</PowerFeatureHovercard>
357+
),
353358

354359
/**
355360
* Augment integration installation modals with feature grouping based on

tests/sentry/workflow_engine/endpoints/test_organization_available_action_index.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ def test_sentry_apps(self):
355355
"installationId": str(self.sentry_app_installation.id),
356356
"status": SentryAppStatus.as_str(self.sentry_app.status),
357357
"settings": ANY,
358+
"title": ANY,
358359
},
359360
},
360361
{
@@ -458,6 +459,7 @@ class PluginActionHandler(ActionHandler):
458459
"installationId": str(self.sentry_app_installation.id),
459460
"status": SentryAppStatus.as_str(self.sentry_app.status),
460461
"settings": ANY,
462+
"title": ANY,
461463
},
462464
},
463465
{

0 commit comments

Comments
 (0)