[ENG-9758] Follow-up fix: reverts #761

src/app/features/settings/notifications/constants/notifications-constants.ts

@@ -12,14 +12,3 @@ export const SUBSCRIPTION_EVENTS: SubscriptionEventModel[] = [
     labelKey: 'settings.notifications.notificationPreferences.items.preprints',
   },
 ];
-
-export const FORM_EVENT_TO_API_EVENT: Record<string, string> = {
-  new_pending_submissions: 'new_pending_submissions',
-  files_updated: 'files_updated',
-  global_file_updated: 'global_file_updated',
-};
-
-export const API_EVENT_TO_FORM_EVENT: Record<string, string> = {
-  new_pending_submissions: 'new_pending_submissions',
-  files_updated: 'global_file_updated',
-};

src/app/features/settings/notifications/notifications.component.spec.ts

@@ -41,19 +41,13 @@ describe('NotificationsComponent', () => {
     subscribeOsfHelpEmail: false,
   };
 
-  // new_pending_submissions → global_reviews
-  // files_updated → global_file_updated
   const mockNotificationSubscriptions = [
+    { id: 'id1', event: SubscriptionEvent.GlobalFileUpdated, frequency: SubscriptionFrequency.Daily },
     {
-      id: 'osf_new_pending_submissions',
-      event: 'new_pending_submissions',
+      id: 'id2',
+      event: SubscriptionEvent.GlobalFileUpdated,
       frequency: SubscriptionFrequency.Instant,
     },
-    {
-      id: 'cuzg4_global_file_updated',
-      event: 'files_updated',
-      frequency: SubscriptionFrequency.Daily,
-    },
   ];
 
   beforeEach(async () => {
@@ -83,7 +77,7 @@ describe('NotificationsComponent', () => {
       return signal(null);
     });
 
-    MOCK_STORE.dispatch.mockReturnValue(of({}));
+    MOCK_STORE.dispatch.mockImplementation(() => of());
 
     await TestBed.configureTestingModule({
       imports: [
@@ -122,9 +116,9 @@ describe('NotificationsComponent', () => {
 
       return signal(null);
     });
-
     component.emailPreferencesFormSubmit();
-    expect(loaderService.hide).toHaveBeenCalledTimes(1);
+
+    expect(loaderService.hide).not.toHaveBeenCalled();
   });
 
   it('should handle subscription completion correctly', () => {
@@ -142,15 +136,11 @@ describe('NotificationsComponent', () => {
   it('should call dispatch only once per subscription change', () => {
     const mockDispatch = jest.fn().mockReturnValue(of({}));
     MOCK_STORE.dispatch.mockImplementation(mockDispatch);
+    const event = SubscriptionEvent.GlobalFileUpdated;
+    const frequency = SubscriptionFrequency.Daily;
 
-    component.onSubscriptionChange(SubscriptionEvent.GlobalFileUpdated, SubscriptionFrequency.Daily);
+    component.onSubscriptionChange(event, frequency);
 
     expect(mockDispatch).toHaveBeenCalledTimes(1);
   });
-
-  it('should default to API value', () => {
-    const subs = component.notificationSubscriptionsForm.value;
-    expect(subs.new_pending_submissions).toBe(SubscriptionFrequency.Instant);
-    expect(subs.global_file_updated).toBe(SubscriptionFrequency.Daily);
-  });
 });

src/app/features/settings/notifications/notifications.component.ts

@@ -21,7 +21,7 @@ import { ToastService } from '@osf/shared/services/toast.service';
 import { AccountSettings } from '../account-settings/models';
 import { AccountSettingsSelectors, GetAccountSettings, UpdateAccountSettings } from '../account-settings/store';
 
-import { API_EVENT_TO_FORM_EVENT, FORM_EVENT_TO_API_EVENT, SUBSCRIPTION_EVENTS } from './constants';
+import { SUBSCRIPTION_EVENTS } from './constants';
 import { EmailPreferencesForm, EmailPreferencesFormControls } from './models';
 import {
   GetAllGlobalNotificationSubscriptions,
@@ -80,9 +80,7 @@ export class NotificationsComponent implements OnInit {
   notificationSubscriptionsForm = this.fb.group(
     SUBSCRIPTION_EVENTS.reduce(
       (control, { event }) => {
-        control[event as string] = this.fb.control<SubscriptionFrequency>(SubscriptionFrequency.Never, {
-          nonNullable: true,
-        });
+        control[event] = this.fb.control<SubscriptionFrequency>(SubscriptionFrequency.Never, { nonNullable: true });
         return control;
       },
       {} as Record<string, FormControl<SubscriptionFrequency>>
@@ -130,24 +128,7 @@ export class NotificationsComponent implements OnInit {
   onSubscriptionChange(event: SubscriptionEvent, frequency: SubscriptionFrequency) {
     const user = this.currentUser();
     if (!user) return;
-
-    const eventKey = event as string;
-
-    const apiEventName = FORM_EVENT_TO_API_EVENT[eventKey] ?? eventKey;
-
-    let id: string | undefined;
-
-    if (event === SubscriptionEvent.GlobalReviews) {
-      const subs = this.notificationSubscriptions();
-      const match = subs.find((s) => (s.event as string) === 'new_pending_submissions');
-      if (match) {
-        id = match.id;
-      } else {
-        return;
-      }
-    } else {
-      id = `${user.id}_${apiEventName}`;
-    }
+    const id = `${user.id}_${event}`;
 
     this.loaderService.show();
     this.actions.updateNotificationSubscription({ id, frequency }).subscribe(() => {
@@ -164,24 +145,10 @@ export class NotificationsComponent implements OnInit {
   }
 
   private updateNotificationSubscriptionsForm() {
-    const subs = this.notificationSubscriptions();
-    if (!subs?.length) {
-      return;
-    }
-
     const patch: Record<string, SubscriptionFrequency> = {};
 
-    for (const sub of subs) {
-      const apiEvent = sub.event as string | null;
-      if (!apiEvent) {
-        continue;
-      }
-
-      const formEventKey = API_EVENT_TO_FORM_EVENT[apiEvent];
-
-      if (formEventKey) {
-        patch[formEventKey] = sub.frequency;
-      }
+    for (const sub of this.notificationSubscriptions()) {
+      patch[sub.event] = sub.frequency;
     }
 
     this.notificationSubscriptionsForm.patchValue(patch);

src/app/shared/enums/subscriptions/subscription-event.enum.ts

@@ -1,5 +1,5 @@
 export enum SubscriptionEvent {
   GlobalFileUpdated = 'global_file_updated',
-  GlobalReviews = 'new_pending_submissions',
+  GlobalReviews = 'global_reviews',
   FileUpdated = 'file_updated',
 }