fix(settings): updated settings

Author: nsemets

src/app/core/services/user.service.ts

@@ -15,7 +15,7 @@ import {
   UserSettingsGetResponse,
 } from '@osf/shared/models';
 
-import { JsonApiService } from '../../shared/services/json-api.service';
+import { JsonApiService } from '../../shared/services';
 
 import { environment } from 'src/environments/environment';
 

src/app/core/store/user/user.model.ts

@@ -16,7 +16,7 @@ export const USER_STATE_INITIAL: UserStateModel = {
     data: null,
     isLoading: false,
     isSubmitting: false,
-    error: '',
+    error: null,
   },
   activeFlags: [],
 };

src/app/core/store/user/user.state.ts

@@ -232,6 +232,7 @@ export class UserState {
       })
     );
   }
+
   @Action(SetUserAsModerator)
   setUserAsModerator(ctx: StateContext<UserStateModel>) {
     const state = ctx.getState();

src/app/features/settings/account-settings/components/change-password/change-password.component.html

@@ -133,7 +133,7 @@ <h2>{{ 'settings.accountSettings.changePassword.title' | translate }}</h2>
       <div class="flex justify-content-end mt-4">
         <p-button
           [label]="'settings.accountSettings.changePassword.buttons.update' | translate"
-          (click)="changePassword()"
+          (onClick)="changePassword()"
           [disabled]="passwordForm.invalid"
         >
         </p-button>

src/app/features/settings/account-settings/components/change-password/change-password.component.ts

@@ -19,6 +19,7 @@ import {
   Validators,
 } from '@angular/forms';
 
+import { AuthService } from '@core/services';
 import { CustomValidators, FormValidationHelper } from '@osf/shared/helpers';
 import { LoaderService, ToastService } from '@osf/shared/services';
 
@@ -37,6 +38,7 @@ export class ChangePasswordComponent implements OnInit {
   private readonly loaderService = inject(LoaderService);
   private readonly toastService = inject(ToastService);
   private readonly destroyRef = inject(DestroyRef);
+  private readonly authService = inject(AuthService);
 
   readonly passwordForm: AccountSettingsPasswordForm = new FormGroup({
     [AccountSettingsPasswordFormControls.OldPassword]: new FormControl('', {
@@ -57,10 +59,10 @@ export class ChangePasswordComponent implements OnInit {
     }),
   });
 
-  protected readonly AccountSettingsPasswordFormControls = AccountSettingsPasswordFormControls;
-  protected readonly FormValidationHelper = FormValidationHelper;
+  readonly AccountSettingsPasswordFormControls = AccountSettingsPasswordFormControls;
+  readonly FormValidationHelper = FormValidationHelper;
 
-  protected errorMessage = signal('');
+  errorMessage = signal('');
 
   ngOnInit(): void {
     this.setupFormValidation();
@@ -101,11 +103,11 @@ export class ChangePasswordComponent implements OnInit {
       .subscribe(() => this.passwordForm.updateValueAndValidity());
   }
 
-  protected getFormControl(controlName: string): AbstractControl | null {
+  getFormControl(controlName: string): AbstractControl | null {
     return FormValidationHelper.getFormControl(this.passwordForm, controlName);
   }
 
-  protected getFormErrors(): Record<string, boolean> {
+  getFormErrors(): Record<string, boolean> {
     const errors: Record<string, boolean> = {};
 
     if (this.passwordForm.errors?.['sameAsOldPassword']) {
@@ -141,6 +143,7 @@ export class ChangePasswordComponent implements OnInit {
 
           this.loaderService.hide();
           this.toastService.showSuccess('settings.accountSettings.changePassword.messages.success');
+          this.authService.logout();
         },
         error: (error: HttpErrorResponse) => {
           if (error.error?.errors?.[0]?.detail) {

src/app/features/settings/account-settings/components/deactivate-account/deactivate-account.component.spec.ts

@@ -12,11 +12,11 @@ import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideNoopAnimations } from '@angular/platform-browser/animations';
 
-import { AccountSettingsService } from '@osf/features/settings/account-settings/services';
-import { AccountSettingsSelectors } from '@osf/features/settings/account-settings/store';
-import { MOCK_STORE } from '@shared/mocks';
-import { ToastService } from '@shared/services';
+import { MOCK_STORE } from '@osf/shared/mocks';
+import { ToastService } from '@osf/shared/services';
 
+import { AccountSettingsService } from '../../services';
+import { AccountSettingsSelectors } from '../../store';
 import { CancelDeactivationComponent } from '../cancel-deactivation/cancel-deactivation.component';
 import { DeactivationWarningComponent } from '../deactivation-warning/deactivation-warning.component';
 

src/app/features/settings/account-settings/components/deactivate-account/deactivate-account.component.ts

@@ -35,7 +35,7 @@ export class DeactivateAccountComponent {
     deactivateAccount: DeactivateAccount,
   });
 
-  protected accountSettings = select(AccountSettingsSelectors.getAccountSettings);
+  accountSettings = select(AccountSettingsSelectors.getAccountSettings);
 
   deactivateAccount() {
     this.dialogService
@@ -51,11 +51,10 @@ export class DeactivateAccountComponent {
       .subscribe(() => {
         this.loaderService.show();
 
-        // [NS] Hidden to avoid issues with development
-        // this.action.deactivateAccount().subscribe(() => {
-        this.toastService.showSuccess('settings.accountSettings.deactivateAccount.successDeactivation');
-        this.loaderService.hide();
-        // });
+        this.action.deactivateAccount().subscribe(() => {
+          this.toastService.showSuccess('settings.accountSettings.deactivateAccount.successDeactivation');
+          this.loaderService.hide();
+        });
       });
   }
 

src/app/features/settings/account-settings/components/default-storage-location/default-storage-location.component.ts

@@ -29,9 +29,9 @@ export class DefaultStorageLocationComponent {
   private readonly loaderService = inject(LoaderService);
   private readonly toastService = inject(ToastService);
 
-  protected readonly currentUser = select(UserSelectors.getCurrentUser);
-  protected readonly regions = select(AccountSettingsSelectors.getRegions);
-  protected selectedRegion = signal<IdName | undefined>(undefined);
+  readonly currentUser = select(UserSelectors.getCurrentUser);
+  readonly regions = select(AccountSettingsSelectors.getRegions);
+  selectedRegion = signal<IdName | undefined>(undefined);
 
   constructor() {
     effect(() => {

src/app/features/settings/account-settings/components/share-indexing/share-indexing.component.ts

@@ -29,7 +29,7 @@ export class ShareIndexingComponent {
   private readonly toastService = inject(ToastService);
 
   private readonly indexing = select(UserSelectors.getShareIndexing);
-  protected readonly currentUser = select(UserSelectors.getCurrentUser);
+  readonly currentUser = select(UserSelectors.getCurrentUser);
 
   selectedOption = this.indexing();
 

src/app/shared/components/add-project-form/add-project-form.component.ts

@@ -15,10 +15,11 @@ import { FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { ProjectFormControls } from '@osf/shared/enums';
 import { Institution, ProjectForm } from '@osf/shared/models';
 import { Project } from '@osf/shared/models/projects';
-import { AffiliatedInstitutionSelectComponent } from '@shared/components/affiliated-institution-select/affiliated-institution-select.component';
-import { ProjectSelectorComponent } from '@shared/components/project-selector/project-selector.component';
-import { FetchUserInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
-import { FetchRegions, RegionsSelectors } from '@shared/stores/regions';
+import { FetchRegions, RegionsSelectors } from '@osf/shared/stores';
+import { FetchUserInstitutions, InstitutionsSelectors } from '@osf/shared/stores/institutions';
+
+import { AffiliatedInstitutionSelectComponent } from '../affiliated-institution-select/affiliated-institution-select.component';
+import { ProjectSelectorComponent } from '../project-selector/project-selector.component';
 
 @Component({
   selector: 'osf-add-project-form',