Skip to content

fix(notifications): Handle null provider in organization integrations filter #112368

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
mtopo27 merged 2 commits into from
Apr 7, 2026
+4 −3
Merged

fix(notifications): Handle null provider in organization integrations filter #112368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a5a5f8
fix(notifications): Handle null provider in organization integrations…
mtopo27 Apr 7, 2026
cf686aa
fix(notifications): Fix types for nullable organization integrations
mtopo27 Apr 7, 2026
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
7 changes: 4 additions & 3 deletions static/app/views/settings/account/notifications/notificationSettingsByType.tsx
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@TkDodo TkDodo Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please fix the types instead:

- useApiQuery<OrganizationIntegration[]>(
+ useApiQuery<Array<OrganizationIntegration | null>>(

in that case, TypeScript will force us to add the optional chaining. Also, it’s doubtful that if we get an integration, it has no key, so we’d only need:

ALLOWED_PROVIDERS.has(orgIntegration?.provider.key as SupportedProviders)

Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,13 @@ export function NotificationSettingsByType({notificationType}: Props) {
);

const {data: allOrgIntegrations = [], status: organizationIntegrationStatus} =
useApiQuery<OrganizationIntegration[]>(
useApiQuery<Array<OrganizationIntegration | null>>(
[getApiUrl('/users/$userId/organization-integrations/', {path: {userId: 'me'}})],
{staleTime: 30_000}
);
const organizationIntegrations = allOrgIntegrations.filter(orgIntegration =>
ALLOWED_PROVIDERS.has(orgIntegration.provider.key as SupportedProviders)
const organizationIntegrations = allOrgIntegrations.filter(
(orgIntegration): orgIntegration is OrganizationIntegration =>
ALLOWED_PROVIDERS.has(orgIntegration?.provider.key as SupportedProviders)
);
const {data: defaultSettings, status: defaultSettingsStatus} =
useApiQuery<DefaultSettings>([getApiUrl('/notification-defaults/')], {
Expand Down
Loading