Skip to content

fix(notifications): hide provider option for weekly reports and fix org specific settings #57992

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
merged 2 commits into from
Oct 13, 2023
Merged

fix(notifications): hide provider option for weekly reports and fix org specific settings #57992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e335e
hide provider option for weekly reports
Oct 12, 2023
5e3c956
hide org selector if entity is an organization
Oct 12, 2023
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
14 changes: 9 additions & 5 deletions static/app/views/settings/account/notifications/notificationSettingsByEntity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,15 @@ function NotificationSettingsByEntity(props: Props) {
<Fragment>
<Panel>
<StyledPanelHeader>
<OrganizationSelectHeader
organizations={organizations}
organizationId={orgId}
handleOrgChange={handleOrgChange}
/>
{entityType === 'project' ? (
<OrganizationSelectHeader
organizations={organizations}
organizationId={orgId}
handleOrgChange={handleOrgChange}
/>
) : (
t('Settings for Organizations')
Copy link
Member

@scttcper scttcper Oct 13, 2023

Choose a reason for hiding this comment

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

for all organizations?

Copy link
Contributor Author

@scefali scefali Oct 13, 2023

Choose a reason for hiding this comment

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

@scttcper yea, should be all

)}
</StyledPanelHeader>
<Item>
{/* TODO: enable search for sentry projects */}
Expand Down
18 changes: 10 additions & 8 deletions static/app/views/settings/account/notifications/notificationSettingsByTypeV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,16 @@ class NotificationSettingsByTypeV2 extends DeprecatedAsyncComponent<Props, State
fields={this.getFields()}
/>
</Form>
<Form
saveOnBlur
apiMethod="PUT"
apiEndpoint="/users/me/notification-providers/"
initialData={this.getProviderInitialData()}
>
<BottomJsonForm fields={this.getProviderFields()} />
</Form>
{notificationType !== 'reports' ? (
<Form
saveOnBlur
apiMethod="PUT"
apiEndpoint="/users/me/notification-providers/"
initialData={this.getProviderInitialData()}
>
<BottomJsonForm fields={this.getProviderFields()} />
</Form>
) : null}
Copy link
Contributor

@snigdhas snigdhas Oct 12, 2023

Choose a reason for hiding this comment

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

Does this handle saving the data correctly? As in, will this set NotificationSettingProvider for email?

Copy link
Contributor Author

@scefali scefali Oct 13, 2023

Choose a reason for hiding this comment

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

@snigdhas Yes, I verified. It all goes to the control silo so it's fine. I think the problem is that to get the projects you have to pick the region silo but not an issue for the organization which has replication in the control silo.

<NotificationSettingsByEntity
notificationType={notificationType}
notificationOptions={notificationOptions}
Expand Down