ref(hybrid-cloud): Restrict notification settings UX to a single organization

src/sentry/api/endpoints/project_index.py

@@ -55,6 +55,10 @@ def get(self, request: Request) -> Response:
             else:
                 queryset = queryset.filter(teams__organizationmember__user_id=request.user.id)
 
+            org_id_filter = request.GET.get("organization_id", None)
+            if org_id_filter:
+                queryset = queryset.filter(organization_id=org_id_filter)
+
         query = request.GET.get("query")
         if query:
             tokens = tokenize_query(query)

src/sentry/api/serializers/models/notification_setting.py

@@ -5,9 +5,11 @@
 from sentry.models.notificationsetting import NotificationSetting
 from sentry.models.team import Team
 from sentry.models.user import User
-from sentry.notifications.helpers import get_fallback_settings
-from sentry.notifications.types import VALID_VALUES_FOR_KEY, NotificationSettingTypes
-from sentry.services.hybrid_cloud.actor import RpcActor
+
+# from sentry.notifications.helpers import get_fallback_settings
+from sentry.notifications.types import NotificationSettingTypes  # VALID_VALUES_FOR_KEY
+
+# from sentry.services.hybrid_cloud.actor import RpcActor
 from sentry.services.hybrid_cloud.organization import RpcTeam
 from sentry.services.hybrid_cloud.user import RpcUser
 
@@ -65,15 +67,15 @@ def get_attrs(
                     f"NotificationSetting {notifications_setting.id} has neither team_id nor user_id"
                 )
 
-        for recipient in item_list:
-            # This works because both User and Team models implement `get_projects`.
-            results[recipient]["projects"] = recipient.get_projects()
+        # for recipient in item_list:
+        #     # This works because both User and Team models implement `get_projects`.
+        #     results[recipient]["projects"] = recipient.get_projects()
 
-            if isinstance(recipient, Team):
-                results[recipient]["organizations"] = {recipient.organization}
+        #     if isinstance(recipient, Team):
+        #         results[recipient]["organizations"] = {recipient.organization}
 
-            if isinstance(recipient, User):
-                results[recipient]["organizations"] = user.get_orgs()
+        #     if isinstance(recipient, User):
+        #         results[recipient]["organizations"] = user.get_orgs()
 
         return results
 
@@ -110,25 +112,26 @@ def serialize(
         :param kwargs: The same `kwargs` as `get_attrs`.
         :returns A mapping. See example.
         """
-        type_option: Optional[NotificationSettingTypes] = kwargs.get("type")
-        types_to_serialize = {type_option} if type_option else set(VALID_VALUES_FOR_KEY.keys())
-
-        project_ids = {_.id for _ in attrs["projects"]}
-        organization_ids = {_.id for _ in attrs["organizations"]}
-
-        data = get_fallback_settings(
-            types_to_serialize,
-            project_ids,
-            organization_ids,
-            recipient=RpcActor.from_object(obj),
-        )
+        # type_option: Optional[NotificationSettingTypes] = kwargs.get("type")
+        # types_to_serialize = {type_option} if type_option else set(VALID_VALUES_FOR_KEY.keys())
+
+        # project_ids = {_.id for _ in attrs["projects"]}
+        # organization_ids = {_.id for _ in attrs["organizations"]}
+
+        data: MutableMapping[
+            str, MutableMapping[str, MutableMapping[int, MutableMapping[str, str]]]
+        ] = defaultdict(lambda: defaultdict(lambda: defaultdict(dict)))
+        # data = get_fallback_settings(
+        #     types_to_serialize,
+        #     project_ids,
+        #     organization_ids,
+        #     recipient=RpcActor.from_object(obj),
+        # )
 
         # Forgive the variable name, I wanted the following lines to be legible.
         for n in attrs["settings"]:
             # Filter out invalid notification settings.
-            if (n.scope_str == "project" and n.scope_identifier not in project_ids) or (
-                n.scope_str == "organization" and n.scope_identifier not in organization_ids
-            ):
+            if n.scope_str not in ["project", "organization"]:
                 continue
 
             # Override the notification settings.

src/sentry/models/notificationsetting.py

@@ -85,7 +85,7 @@ def provider_str(self) -> str:
             (NotificationSettingTypes.QUOTA, "quota"),
             (NotificationSettingTypes.QUOTA_ERRORS, "quotaErrors"),
             (NotificationSettingTypes.QUOTA_TRANSACTIONS, "quotaTransactions"),
-            (NotificationSettingTypes.QUOTA_ATTACHMENTS, "quotaAttacments"),
+            (NotificationSettingTypes.QUOTA_ATTACHMENTS, "quotaAttachments"),
             (NotificationSettingTypes.QUOTA_REPLAYS, "quotaReplays"),
             (NotificationSettingTypes.QUOTA_WARNINGS, "quotaWarnings"),
             (NotificationSettingTypes.QUOTA_SPEND_ALLOCATIONS, "quotaSpendAllocations"),

static/app/views/settings/account/accountNotificationFineTuning.tsx

@@ -17,7 +17,9 @@ import {
   ACCOUNT_NOTIFICATION_FIELDS,
   FineTuneField,
 } from 'sentry/views/settings/account/notifications/fields';
-import NotificationSettingsByType from 'sentry/views/settings/account/notifications/notificationSettingsByType';
+import NotificationSettingsByType, {
+  OrganizationSelectHeader,
+} from 'sentry/views/settings/account/notifications/notificationSettingsByType';
 import {
   getNotificationTypeFromPathname,
   groupByOrganization,
@@ -69,7 +71,6 @@ function AccountNotificationsByProject({projects, field}: ANBPProps) {
     <Fragment>
       {data.map(({name, projects: projectFields}) => (
         <div key={name}>
-          <PanelHeader>{name}</PanelHeader>
           {projectFields.map(f => (
             <PanelBodyLineItem key={f.name}>
               <SelectField
@@ -133,20 +134,33 @@ type State = AsyncView['state'] & {
   emails: UserEmail[] | null;
   fineTuneData: Record<string, any> | null;
   notifications: Record<string, any> | null;
+  organizationId: string;
   projects: Project[] | null;
 };
 
 class AccountNotificationFineTuning extends AsyncView<Props, State> {
+  getDefaultState() {
+    return {
+      ...super.getDefaultState(),
+      emails: [],
+      fineTuneData: null,
+      notifications: [],
+      projects: [],
+      organizationId: this.props.organizations[0].id,
+    };
+  }
+
   getEndpoints(): ReturnType<AsyncView['getEndpoints']> {
     const {fineTuneType: pathnameType} = this.props.params;
+    const orgId = this.state?.organizationId || this.props.organizations[0].id;
     const fineTuneType = getNotificationTypeFromPathname(pathnameType);
     const endpoints = [
       ['notifications', '/users/me/notifications/'],
       ['fineTuneData', `/users/me/notifications/${fineTuneType}/`],
     ];
 
     if (isGroupedByProject(fineTuneType)) {
-      endpoints.push(['projects', '/projects/']);
+      endpoints.push(['projects', `/projects/?organization_id=${orgId}`]);
     }
 
     endpoints.push(['emails', '/users/me/emails/']);
@@ -176,6 +190,14 @@ class AccountNotificationFineTuning extends AsyncView<Props, State> {
     );
   }
 
+  handleOrgChange = (option: {label: string; value: string}) => {
+    this.setState({organizationId: option.value});
+    const self = this;
+    setTimeout(() => {
+      self.reloadData();
+    }, 0);
+  };
+
   renderBody() {
     const {params} = this.props;
     const {fineTuneType: pathnameType} = params;
@@ -202,7 +224,6 @@ class AccountNotificationFineTuning extends AsyncView<Props, State> {
     if (!notifications || !fineTuneData) {
       return null;
     }
-
     return (
       <div>
         <SettingsPageHeader title={title} />
@@ -225,19 +246,25 @@ class AccountNotificationFineTuning extends AsyncView<Props, State> {
             </Form>
           )}
         <Panel>
+          <PanelHeader hasButtons={isProject}>
+            {isProject ? (
+              <Fragment>
+                <OrganizationSelectHeader
+                  organizations={this.props.organizations}
+                  organizationId={this.state.organizationId}
+                  handleOrgChange={this.handleOrgChange}
+                />
+                {this.renderSearchInput({
+                  placeholder: t('Search Projects'),
+                  url,
+                  stateKey,
+                })}
+              </Fragment>
+            ) : (
+              <Heading>{t('Organizations')}</Heading>
+            )}
+          </PanelHeader>
           <PanelBody>
-            <PanelHeader hasButtons={isProject}>
-              <Heading>{isProject ? t('Projects') : t('Organizations')}</Heading>
-              <div>
-                {isProject &&
-                  this.renderSearchInput({
-                    placeholder: t('Search Projects'),
-                    url,
-                    stateKey,
-                  })}
-              </div>
-            </PanelHeader>
-
             <Form
               saveOnBlur
               apiMethod="PUT"
@@ -269,4 +296,4 @@ const Heading = styled('div')`
   flex: 1;
 `;
 
-export default AccountNotificationFineTuning;
+export default withOrganizations(AccountNotificationFineTuning);

static/app/views/settings/account/notifications/notificationSettingsByOrganization.tsx

@@ -1,12 +1,12 @@
 import Form from 'sentry/components/forms/form';
-import JsonForm from 'sentry/components/forms/jsonForm';
 import {t} from 'sentry/locale';
 import {OrganizationSummary} from 'sentry/types';
 import withOrganizations from 'sentry/utils/withOrganizations';
 import {
   NotificationSettingsByProviderObject,
   NotificationSettingsObject,
 } from 'sentry/views/settings/account/notifications/constants';
+import {StyledJsonForm} from 'sentry/views/settings/account/notifications/notificationSettingsByProjects';
 import {
   getParentData,
   getParentField,
@@ -38,11 +38,16 @@ function NotificationSettingsByOrganization({
       initialData={getParentData(notificationType, notificationSettings, organizations)}
       onSubmitSuccess={onSubmitSuccess}
     >
-      <JsonForm
+      <StyledJsonForm
         title={t('Organizations')}
-        fields={organizations.map(organization =>
-          getParentField(notificationType, notificationSettings, organization, onChange)
-        )}
+        fields={organizations.map(organization => {
+          return getParentField(
+            notificationType,
+            notificationSettings,
+            organization,
+            onChange
+          );
+        })}
       />
     </Form>
   );

static/app/views/settings/account/notifications/notificationSettingsByProjects.spec.tsx

@@ -5,10 +5,10 @@ import {Project} from 'sentry/types';
 import NotificationSettingsByProjects from 'sentry/views/settings/account/notifications/notificationSettingsByProjects';
 
 const renderComponent = (projects: Project[]) => {
-  const {routerContext} = initializeOrg();
+  const {routerContext, organization} = initializeOrg();
 
   MockApiClient.addMockResponse({
-    url: '/projects/',
+    url: `/projects/`,
     method: 'GET',
     body: projects,
   });
@@ -28,6 +28,9 @@ const renderComponent = (projects: Project[]) => {
       notificationSettings={notificationSettings}
       onChange={jest.fn()}
       onSubmitSuccess={jest.fn()}
+      organizationId={organization.id}
+      organizations={[organization]}
+      handleOrgChange={jest.fn()}
     />,
     {context: routerContext}
   );