From af3c78cc5055c2aabce79ab97649e3fa1d6d8f59 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Mon, 10 Mar 2025 10:21:50 +0100 Subject: [PATCH] [CST-15074][#3355] PR review --- .../confirm-email/confirm-email.component.ts | 42 +++++++++++++++---- .../confirmation-sent.component.ts | 5 ++- .../provide-email.component.spec.ts | 10 ++++- .../provide-email/provide-email.component.ts | 14 ++++++- .../external-log-in.component.ts | 29 ++++++++++--- .../orcid-confirmation.component.ts | 13 +++++- .../services/external-login.service.ts | 11 ++++- .../external-login-page.component.ts | 17 ++++++-- ...ogin-review-account-info-page.component.ts | 17 ++++++-- src/assets/i18n/it.json5 | 2 +- 10 files changed, 132 insertions(+), 28 deletions(-) diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts index 3e1befefbf..76624a7a90 100644 --- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts +++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts @@ -1,18 +1,46 @@ import { NgIf } from '@angular/common'; -import { ChangeDetectionStrategy, Component, Inject, Input, OnDestroy, OnInit, } from '@angular/core'; -import { FormBuilder, FormGroup, ReactiveFormsModule, Validators, } from '@angular/forms'; -import { TranslateModule, TranslateService, } from '@ngx-translate/core'; +import { + ChangeDetectionStrategy, + Component, + Inject, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; +import { + FormBuilder, + FormGroup, + ReactiveFormsModule, + Validators, +} from '@angular/forms'; +import { + TranslateModule, + TranslateService, +} from '@ngx-translate/core'; import isEqual from 'lodash/isEqual'; -import { combineLatest, Subscription, take, } from 'rxjs'; +import { + combineLatest, + Subscription, + take, +} from 'rxjs'; import { AuthService } from '../../../core/auth/auth.service'; import { EPersonDataService } from '../../../core/eperson/eperson-data.service'; import { EPerson } from '../../../core/eperson/models/eperson.model'; import { HardRedirectService } from '../../../core/services/hard-redirect.service'; -import { NativeWindowRef, NativeWindowService, } from '../../../core/services/window.service'; -import { getFirstCompletedRemoteData, getRemoteDataPayload, } from '../../../core/shared/operators'; +import { + NativeWindowRef, + NativeWindowService, +} from '../../../core/services/window.service'; +import { + getFirstCompletedRemoteData, + getRemoteDataPayload, +} from '../../../core/shared/operators'; import { Registration } from '../../../core/shared/registration.model'; -import { hasNoValue, hasValue, } from '../../../shared/empty.util'; +import { + hasNoValue, + hasValue, +} from '../../../shared/empty.util'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { ExternalLoginService } from '../../services/external-login.service'; diff --git a/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.ts b/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.ts index 1abda02c4d..df5aedf29b 100644 --- a/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.ts +++ b/src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.ts @@ -1,4 +1,7 @@ -import { ChangeDetectionStrategy, Component, } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, +} from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; @Component({ diff --git a/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.spec.ts b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.spec.ts index dbd58d8a3c..b5dfc341d3 100644 --- a/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.spec.ts +++ b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.spec.ts @@ -1,8 +1,14 @@ import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { + ComponentFixture, + TestBed, +} from '@angular/core/testing'; import { FormBuilder } from '@angular/forms'; -import { TranslateLoader, TranslateModule, } from '@ngx-translate/core'; +import { + TranslateLoader, + TranslateModule, +} from '@ngx-translate/core'; import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock'; import { ExternalLoginService } from '../../services/external-login.service'; diff --git a/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.ts b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.ts index 50a84238e8..123ef17154 100644 --- a/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.ts +++ b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.ts @@ -1,6 +1,16 @@ import { NgIf } from '@angular/common'; -import { ChangeDetectionStrategy, Component, Input, OnDestroy, } from '@angular/core'; -import { FormBuilder, FormGroup, ReactiveFormsModule, Validators, } from '@angular/forms'; +import { + ChangeDetectionStrategy, + Component, + Input, + OnDestroy, +} from '@angular/core'; +import { + FormBuilder, + FormGroup, + ReactiveFormsModule, + Validators, +} from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; import { Subscription } from 'rxjs'; diff --git a/src/app/external-log-in/external-log-in/external-log-in.component.ts b/src/app/external-log-in/external-log-in/external-log-in.component.ts index 24243d6885..6705da39da 100644 --- a/src/app/external-log-in/external-log-in/external-log-in.component.ts +++ b/src/app/external-log-in/external-log-in/external-log-in.component.ts @@ -1,7 +1,23 @@ -import { NgComponentOutlet, NgIf, } from '@angular/common'; -import { ChangeDetectionStrategy, Component, Injector, Input, OnDestroy, OnInit, } from '@angular/core'; -import { NgbModal, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateModule, TranslateService, } from '@ngx-translate/core'; +import { + NgComponentOutlet, + NgIf, +} from '@angular/common'; +import { + ChangeDetectionStrategy, + Component, + Injector, + Input, + OnDestroy, + OnInit, +} from '@angular/core'; +import { + NgbModal, + NgbModalRef, +} from '@ng-bootstrap/ng-bootstrap'; +import { + TranslateModule, + TranslateService, +} from '@ngx-translate/core'; import { AuthService } from '../../core/auth/auth.service'; import { AuthMethodType } from '../../core/auth/models/auth.method-type'; @@ -9,7 +25,10 @@ import { AuthRegistrationType } from '../../core/auth/models/auth.registration-t import { Registration } from '../../core/shared/registration.model'; import { AlertComponent } from '../../shared/alert/alert.component'; import { AlertType } from '../../shared/alert/alert-type'; -import { hasValue, isEmpty, } from '../../shared/empty.util'; +import { + hasValue, + isEmpty, +} from '../../shared/empty.util'; import { ThemedLogInComponent } from '../../shared/log-in/themed-log-in.component'; import { ExternalLoginTypeComponent, diff --git a/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts index 4b74b6b09e..a333f8895e 100644 --- a/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts +++ b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts @@ -1,6 +1,15 @@ import { NgIf } from '@angular/common'; -import { ChangeDetectionStrategy, Component, Inject, OnInit, } from '@angular/core'; -import { FormBuilder, FormGroup, ReactiveFormsModule, } from '@angular/forms'; +import { + ChangeDetectionStrategy, + Component, + Inject, + OnInit, +} from '@angular/core'; +import { + FormBuilder, + FormGroup, + ReactiveFormsModule, +} from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; import { Registration } from '../../../core/shared/registration.model'; diff --git a/src/app/external-log-in/services/external-login.service.ts b/src/app/external-log-in/services/external-login.service.ts index 365f3d6541..a76e66a497 100644 --- a/src/app/external-log-in/services/external-login.service.ts +++ b/src/app/external-log-in/services/external-login.service.ts @@ -1,8 +1,15 @@ import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { select, Store, } from '@ngrx/store'; +import { + select, + Store, +} from '@ngrx/store'; import { TranslateService } from '@ngx-translate/core'; -import { filter, map, Observable, } from 'rxjs'; +import { + filter, + map, + Observable, +} from 'rxjs'; import { AuthMethod } from 'src/app/core/auth/models/auth.method'; import { getAuthenticationMethods } from 'src/app/core/auth/selectors'; import { CoreState } from 'src/app/core/core-state.model'; diff --git a/src/app/external-login-page/external-login-page.component.ts b/src/app/external-login-page/external-login-page.component.ts index 709b86ab86..ef703e3a37 100644 --- a/src/app/external-login-page/external-login-page.component.ts +++ b/src/app/external-login-page/external-login-page.component.ts @@ -1,8 +1,19 @@ -import { AsyncPipe, NgIf, } from '@angular/common'; -import { Component, OnInit, } from '@angular/core'; +import { + AsyncPipe, + NgIf, +} from '@angular/common'; +import { + Component, + OnInit, +} from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { first, map, Observable, tap, } from 'rxjs'; +import { + first, + map, + Observable, + tap, +} from 'rxjs'; import { RemoteData } from '../core/data/remote-data'; import { Registration } from '../core/shared/registration.model'; diff --git a/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts index 2425ce794e..9d24a83408 100644 --- a/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts +++ b/src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts @@ -1,7 +1,18 @@ -import { AsyncPipe, NgIf, } from '@angular/common'; -import { Component, OnInit, } from '@angular/core'; +import { + AsyncPipe, + NgIf, +} from '@angular/common'; +import { + Component, + OnInit, +} from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { first, map, Observable, tap, } from 'rxjs'; +import { + first, + map, + Observable, + tap, +} from 'rxjs'; import { RemoteData } from '../core/data/remote-data'; import { Registration } from '../core/shared/registration.model'; diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5 index 570568603f..dc697d6195 100644 --- a/src/assets/i18n/it.json5 +++ b/src/assets/i18n/it.json5 @@ -8010,5 +8010,5 @@ // "external-login-page.orcid-confirmation.email.label": "Email" // TODO New key - Add a translation - "external-login-page.orcid-confirmation.email.label": "Email" + "external-login-page.orcid-confirmation.email.label": "Email", }