From e63bc496ff548a664bb887a3ceb72f9b0ca377ac Mon Sep 17 00:00:00 2001 From: nsemets Date: Tue, 17 Jun 2025 19:19:59 +0300 Subject: [PATCH 1/2] fix(other-pages): fixed bugs --- .../forbidden-page/forbidden-page.component.html | 2 +- .../page-not-found/page-not-found.component.html | 2 +- .../request-access/request-access.component.html | 2 +- .../request-access/request-access.component.ts | 16 ++++++++++++---- src/app/core/interceptors/auth.interceptor.ts | 4 +--- src/app/core/interceptors/error.interceptor.ts | 5 +++++ .../view-section/view-section.component.html | 2 +- src/assets/i18n/en.json | 3 ++- 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/app/core/components/forbidden-page/forbidden-page.component.html b/src/app/core/components/forbidden-page/forbidden-page.component.html index 7f4e80965..2eb73a0f9 100644 --- a/src/app/core/components/forbidden-page/forbidden-page.component.html +++ b/src/app/core/components/forbidden-page/forbidden-page.component.html @@ -2,6 +2,6 @@

{{ 'forbiddenPage.title' | translate }}

{{ 'forbiddenPage.message' | translate }} - support@osf.io + support@osf.io.

diff --git a/src/app/core/components/page-not-found/page-not-found.component.html b/src/app/core/components/page-not-found/page-not-found.component.html index dce559811..bf7889c25 100644 --- a/src/app/core/components/page-not-found/page-not-found.component.html +++ b/src/app/core/components/page-not-found/page-not-found.component.html @@ -2,6 +2,6 @@

{{ 'pageNotFound.title' | translate }}

{{ 'pageNotFound.message' | translate }} - support@osf.io + support@osf.io.

diff --git a/src/app/core/components/request-access/request-access.component.html b/src/app/core/components/request-access/request-access.component.html index c013e1fc5..edc8780f5 100644 --- a/src/app/core/components/request-access/request-access.component.html +++ b/src/app/core/components/request-access/request-access.component.html @@ -37,6 +37,6 @@

{{ 'requestAccess.title' | translate }}

{{ 'requestAccess.helpMessage' | translate }} - support@osf.io + support@osf.io.

diff --git a/src/app/core/components/request-access/request-access.component.ts b/src/app/core/components/request-access/request-access.component.ts index 34a07c419..0881a2fc9 100644 --- a/src/app/core/components/request-access/request-access.component.ts +++ b/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'); + } + }, }); } diff --git a/src/app/core/interceptors/auth.interceptor.ts b/src/app/core/interceptors/auth.interceptor.ts index 707dca12d..0ddb43ab9 100644 --- a/src/app/core/interceptors/auth.interceptor.ts +++ b/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); } diff --git a/src/app/core/interceptors/error.interceptor.ts b/src/app/core/interceptors/error.interceptor.ts index cc6b7d2c1..feafc2605 100644 --- a/src/app/core/interceptors/error.interceptor.ts +++ b/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); diff --git a/src/app/features/project/wiki/components/view-section/view-section.component.html b/src/app/features/project/wiki/components/view-section/view-section.component.html index 9190e497d..901b184a7 100644 --- a/src/app/features/project/wiki/components/view-section/view-section.component.html +++ b/src/app/features/project/wiki/components/view-section/view-section.component.html @@ -9,7 +9,7 @@

{{ 'project.wiki.view' | translate }}

- {{ 'project.wiki.version.title' | translate }} + {{ 'project.wiki.version.title' | translate }}: Date: Tue, 17 Jun 2025 19:32:47 +0300 Subject: [PATCH 2/2] fix(account-settings): fixed email label case --- src/assets/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index ae1533173..161a46b55 100644 --- a/src/assets/i18n/en.json +++ b/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",