Bugs/other pages

src/app/core/components/forbidden-page/forbidden-page.component.html

@@ -2,6 +2,6 @@
   <h2>{{ 'forbiddenPage.title' | translate }}</h2>
   <p class="mt-4">
     <span>{{ 'forbiddenPage.message' | translate }}</span>
-    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>
+    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>.
   </p>
 </section>

src/app/core/components/page-not-found/page-not-found.component.html

@@ -2,6 +2,6 @@
   <h2>{{ 'pageNotFound.title' | translate }}</h2>
   <p class="mt-4">
     <span>{{ 'pageNotFound.message' | translate }}</span>
-    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>
+    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>.
   </p>
 </section>

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

@@ -37,6 +37,6 @@ <h2>{{ 'requestAccess.title' | translate }}</h2>
 
   <p class="mt-4">
     <span>{{ 'requestAccess.helpMessage' | translate }}</span>
-    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>
+    <a class="ml-1 font-bold" href="mailto:support@osf.io">support&#64;osf.io</a>.
   </p>
 </section>

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

@@ -5,6 +5,7 @@ import { Textarea } from 'primeng/textarea';
 
 import { map, of } from 'rxjs';
 
+import { HttpErrorResponse } from '@angular/common/http';
 import { ChangeDetectionStrategy, Component, inject, model } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
@@ -35,10 +36,17 @@ export class RequestAccessComponent {
 
   requestAccess() {
     this.loaderService.show();
-    this.requestAccessService.requestAccessToProject(this.projectId(), this.comment()).subscribe(() => {
-      this.loaderService.hide();
-      this.router.navigate(['/']);
-      this.toastService.showSuccess('requestAccess.requestedSuccessMessage');
+    this.requestAccessService.requestAccessToProject(this.projectId(), this.comment()).subscribe({
+      next: () => {
+        this.loaderService.hide();
+        this.router.navigate(['/']);
+        this.toastService.showSuccess('requestAccess.requestedSuccessMessage');
+      },
+      error: (error: HttpErrorResponse) => {
+        if (error.status === 409) {
+          this.toastService.showError('requestAccess.alreadyRequestedMessage');
+        }
+      },
     });
   }
 

src/app/core/interceptors/auth.interceptor.ts

@@ -15,12 +15,10 @@ export const authInterceptor: HttpInterceptorFn = (
     const authReq = req.clone({
       setHeaders: {
         Authorization: `Bearer ${authToken}`,
+        Accept: req.responseType === 'text' ? '*/*' : 'application/vnd.api+json',
         'Content-Type': 'application/vnd.api+json',
       },
     });
-    if (req.responseType !== 'text') {
-      authReq.headers.set('Accept', 'application/vnd.api+json');
-    }
 
     return next(authReq);
   }

src/app/core/interceptors/error.interceptor.ts

@@ -40,6 +40,11 @@ export const errorInterceptor: HttpInterceptorFn = (req, next) => {
       }
 
       loaderService.hide();
+
+      if (error.status === 409) {
+        return throwError(() => error);
+      }
+
       toastService.showError(errorMessage);
 
       return throwError(() => error);

src/app/features/project/wiki/components/view-section/view-section.component.html

@@ -9,7 +9,7 @@
       <h2 class="mr-2">{{ 'project.wiki.view' | translate }}</h2>
     </ng-template>
     <div class="flex align-items-center mb-4">
-      <span class="mr-2">{{ 'project.wiki.version.title' | translate }}</span>
+      <span class="mr-2">{{ 'project.wiki.version.title' | translate }}:</span>
       <p-select
         [options]="mappedVersions()"
         [ngModel]="selectedVersion()"

src/assets/i18n/en.json

@@ -1136,7 +1136,7 @@
         "description": "To merge an existing account with this one or to log in with multiple email addresses, add an alternate email address below. All projects and components will be displayed under the email address listed as primary.",
         "primaryEmail": "Primary Email:",
         "alternateEmails": "Alternate Emails:",
-        "unconfirmedEmails": "Unconfirmed emails:",
+        "unconfirmedEmails": "Unconfirmed Emails:",
         "buttons": {
           "makePrimary": "Make Primary",
           "resend": "Resend",
@@ -1336,7 +1336,8 @@
     "requestAccess": "Request Access",
     "switchAccount": "Switch Account",
     "commentLabel": "Comment (Optional)",
-    "requestedSuccessMessage": "Your request for access has been sent."
+    "requestedSuccessMessage": "Your request for access has been sent.",
+    "alreadyRequestedMessage": "You already requested access."
   },
   "validation": {
     "required": "The field is required.",