fix(log-out): updated translations and log out

Author: nsemets

src/app/core/components/header/header.component.ts

@@ -42,7 +42,6 @@ export class HeaderComponent {
       command: () => {
         this.loaderService.show();
         this.actions.logout();
-        this.router.navigate(['/']).then(() => window.location.reload());
       },
     },
   ];

src/app/core/components/request-access/request-access.component.ts

@@ -1,3 +1,5 @@
+import { createDispatchMap } from '@ngxs/store';
+
 import { TranslatePipe } from '@ngx-translate/core';
 
 import { Button } from 'primeng/button';
@@ -12,6 +14,7 @@ import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import { RequestAccessService } from '@osf/core/services';
+import { Logout } from '@osf/features/auth/store';
 import { InputLimits } from '@osf/shared/constants';
 import { LoaderService, ToastService } from '@osf/shared/services';
 
@@ -29,10 +32,11 @@ export class RequestAccessComponent {
   private readonly route = inject(ActivatedRoute);
   private readonly id = toSignal(this.route?.params.pipe(map((params) => params['id'])) ?? of(undefined));
 
-  private readonly requestAccessService = inject(RequestAccessService);
   private readonly router = inject(Router);
+  private readonly requestAccessService = inject(RequestAccessService);
   private readonly loaderService = inject(LoaderService);
   private readonly toastService = inject(ToastService);
+  private readonly actions = createDispatchMap({ logout: Logout });
 
   requestAccess() {
     this.loaderService.show();
@@ -51,6 +55,6 @@ export class RequestAccessComponent {
   }
 
   switchAccount() {
-    // [NS] TODO: add logout logic when the user is logged in
+    this.actions.logout();
   }
 }

src/app/features/auth/services/auth.service.ts

@@ -29,7 +29,7 @@ export class AuthService {
 
   logout(): void {
     this.cookieService.deleteAll();
-    this.actions.setAuthenticated(false);
+    window.location.href = `${environment.webUrl}/logout/?next=${encodeURIComponent('/')}`;
   }
 
   register(payload: SignUpModel) {

src/app/features/project/analytics/analytics.component.html

@@ -1,4 +1,4 @@
-<osf-sub-header [title]="'navigation.project.analytics' | translate"></osf-sub-header>
+<osf-sub-header [title]="'navigation.analytics' | translate"></osf-sub-header>
 
 <section class="flex flex-column bg-white flex-1 h-full p-5 gap-4">
   <div class="flex align-items-center justify-content-end">

src/app/features/project/contributors/contributors.component.html

@@ -1,4 +1,4 @@
-<h1 class="py-5 px-3 md:px-5 xl:px-4">{{ 'navigation.project.contributors' | translate }}</h1>
+<h1 class="py-5 px-3 md:px-5 xl:px-4">{{ 'navigation.contributors' | translate }}</h1>
 
 <section class="contributors flex flex-column align-items-baseline w-full p-3 pt-4 md:px-5 xl:px-4">
   <p-button

src/app/features/project/registrations/registrations.component.html

@@ -1,7 +1,7 @@
 <osf-sub-header
   [showButton]="true"
   [buttonLabel]="'project.registrations.addRegistration' | translate"
-  [title]="'navigation.project.registrations' | translate"
+  [title]="'navigation.registrations' | translate"
   (buttonClick)="addRegistration()"
 />
 @if (isRegistrationsLoading()) {

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

@@ -1,5 +1,5 @@
 <section class="flex flex-column flex-1">
-  <osf-sub-header [title]="'navigation.project.settings' | translate" />
+  <osf-sub-header [title]="'navigation.settings' | translate" />
 
   <div class="flex flex-column flex-1 gap-4 w-full bg-white py-4 px-3 md:px-5 xl:px-4">
     <osf-settings-project-form-card

src/app/features/project/wiki/wiki.component.html

@@ -1,4 +1,4 @@
-<osf-sub-header [title]="'navigation.project.wiki' | translate" [tooltip]="'project.wiki.tooltip' | translate">
+<osf-sub-header [title]="'navigation.wiki' | translate" [tooltip]="'project.wiki.tooltip' | translate">
   <p-buttongroup class="ml-auto">
     <p-button
       [label]="'project.wiki.view' | translate"

src/app/features/registries/constants/default-steps.ts

@@ -3,7 +3,7 @@ import { StepOption } from '@osf/shared/models';
 export const DEFAULT_STEPS: StepOption[] = [
   {
     index: 0,
-    label: 'navigation.project.metadata',
+    label: 'navigation.metadata',
     value: '',
     routeLink: 'metadata',
   },

src/app/features/registry/pages/registry-wiki/registry-wiki.component.html

@@ -1,4 +1,4 @@
-<osf-sub-header [title]="'navigation.project.wiki' | translate" [tooltip]="'project.wiki.tooltip' | translate">
+<osf-sub-header [title]="'navigation.wiki' | translate" [tooltip]="'project.wiki.tooltip' | translate">
   <p-buttongroup class="ml-auto">
     <p-button
       [label]="'project.wiki.view' | translate"