fix(settings): updated tokens and notifications

Author: nsemets

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

@@ -103,7 +103,7 @@ <h2>{{ 'settings.notifications.notificationPreferences.title' | translate }}</h2
       <p-skeleton width="30rem" height="1rem"></p-skeleton>
 
       <section class="notification-configuration">
-        @for (_ of [1, 2, 3, 4, 5]; track $index) {
+        @for (_ of [1, 2, 3]; track $index) {
           <p-skeleton width="20rem" height="2rem"></p-skeleton>
           <p-skeleton class="dropdown" height="3rem"></p-skeleton>
         }

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

@@ -68,12 +68,13 @@ export class NotificationsComponent implements OnInit {
     [EmailPreferencesFormControls.SubscribeOsfHelpEmail]: this.fb.control(false, { nonNullable: true }),
   });
 
-  protected readonly SUBSCRIPTION_EVENTS = SUBSCRIPTION_EVENTS;
-  protected subscriptionFrequencyOptions = Object.entries(SubscriptionFrequency).map(([key, value]) => ({
+  readonly SUBSCRIPTION_EVENTS = SUBSCRIPTION_EVENTS;
+  subscriptionFrequencyOptions = Object.entries(SubscriptionFrequency).map(([key, value]) => ({
     label: key,
     value,
   }));
-  protected notificationSubscriptionsForm = this.fb.group(
+
+  notificationSubscriptionsForm = this.fb.group(
     SUBSCRIPTION_EVENTS.reduce(
       (control, { event }) => {
         control[event] = this.fb.control<SubscriptionFrequency>(SubscriptionFrequency.Never, { nonNullable: true });
@@ -127,11 +128,9 @@ export class NotificationsComponent implements OnInit {
     const id = `${user.id}_${event}`;
 
     this.loaderService.show();
-    this.actions.updateNotificationSubscription({ id, frequency }).subscribe({
-      complete: () => {
-        this.loaderService.hide();
-        this.toastService.showSuccess('settings.notifications.notificationPreferences.successUpdate');
-      },
+    this.actions.updateNotificationSubscription({ id, frequency }).subscribe(() => {
+      this.loaderService.hide();
+      this.toastService.showSuccess('settings.notifications.notificationPreferences.successUpdate');
     });
   }
 
@@ -144,9 +143,11 @@ export class NotificationsComponent implements OnInit {
 
   private updateNotificationSubscriptionsForm() {
     const patch: Record<string, SubscriptionFrequency> = {};
+
     for (const sub of this.notificationSubscriptions()) {
       patch[sub.event] = sub.frequency;
     }
+
     this.notificationSubscriptionsForm.patchValue(patch);
   }
 }

src/app/features/settings/tokens/components/token-add-edit-form/token-add-edit-form.component.html

@@ -49,7 +49,7 @@
         class="w-12rem btn-full-width"
         [label]="'settings.tokens.form.buttons.cancel' | translate"
         severity="info"
-        (click)="dialogRef.close()"
+        (onClick)="dialogRef.close()"
       />
       <p-button
         class="w-12rem btn-full-width"

src/app/features/settings/tokens/pages/token-details/token-details.component.html

@@ -19,7 +19,7 @@ <h1>{{ token()?.name }}</h1>
             class="btn-full-width"
             [label]="'settings.tokens.details.deleteButton' | translate"
             severity="danger"
-            (click)="deleteToken()"
+            (onClick)="deleteToken()"
           />
         </div>
       </div>

src/app/features/settings/tokens/store/tokens.selectors.ts

@@ -11,11 +11,6 @@ export class TokensSelectors {
     return state.scopes.data;
   }
 
-  @Selector([TokensState])
-  static isScopesLoading(state: TokensStateModel) {
-    return state.scopes.isLoading;
-  }
-
   @Selector([TokensState])
   static getTokens(state: TokensStateModel): TokenModel[] {
     return state.tokens.data;

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

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TokensComponent } from './tokens.component';
+
+import { OSFTestingModule } from '@testing/osf.testing.module';
+
+describe.skip('TokensComponent', () => {
+  let component: TokensComponent;
+  let fixture: ComponentFixture<TokensComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TokensComponent, OSFTestingModule],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TokensComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/shared/services/my-resources.service.ts

@@ -23,7 +23,6 @@ import { environment } from 'src/environments/environment';
   providedIn: 'root',
 })
 export class MyResourcesService {
-  private apiUrl = environment.apiUrl;
   private sortFieldMap: Record<string, string> = {
     title: 'title',
     dateModified: 'date_modified',