Skip to content

Commit af3c78c

Browse files
[CST-15074][DSpace#3355] PR review
1 parent f56b685 commit af3c78c

10 files changed

Lines changed: 132 additions & 28 deletions

File tree

src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.ts

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,46 @@
11
import { NgIf } from '@angular/common';
2-
import { ChangeDetectionStrategy, Component, Inject, Input, OnDestroy, OnInit, } from '@angular/core';
3-
import { FormBuilder, FormGroup, ReactiveFormsModule, Validators, } from '@angular/forms';
4-
import { TranslateModule, TranslateService, } from '@ngx-translate/core';
2+
import {
3+
ChangeDetectionStrategy,
4+
Component,
5+
Inject,
6+
Input,
7+
OnDestroy,
8+
OnInit,
9+
} from '@angular/core';
10+
import {
11+
FormBuilder,
12+
FormGroup,
13+
ReactiveFormsModule,
14+
Validators,
15+
} from '@angular/forms';
16+
import {
17+
TranslateModule,
18+
TranslateService,
19+
} from '@ngx-translate/core';
520
import isEqual from 'lodash/isEqual';
6-
import { combineLatest, Subscription, take, } from 'rxjs';
21+
import {
22+
combineLatest,
23+
Subscription,
24+
take,
25+
} from 'rxjs';
726

827
import { AuthService } from '../../../core/auth/auth.service';
928
import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
1029
import { EPerson } from '../../../core/eperson/models/eperson.model';
1130
import { HardRedirectService } from '../../../core/services/hard-redirect.service';
12-
import { NativeWindowRef, NativeWindowService, } from '../../../core/services/window.service';
13-
import { getFirstCompletedRemoteData, getRemoteDataPayload, } from '../../../core/shared/operators';
31+
import {
32+
NativeWindowRef,
33+
NativeWindowService,
34+
} from '../../../core/services/window.service';
35+
import {
36+
getFirstCompletedRemoteData,
37+
getRemoteDataPayload,
38+
} from '../../../core/shared/operators';
1439
import { Registration } from '../../../core/shared/registration.model';
15-
import { hasNoValue, hasValue, } from '../../../shared/empty.util';
40+
import {
41+
hasNoValue,
42+
hasValue,
43+
} from '../../../shared/empty.util';
1644
import { NotificationsService } from '../../../shared/notifications/notifications.service';
1745
import { ExternalLoginService } from '../../services/external-login.service';
1846

src/app/external-log-in/email-confirmation/confirmation-sent/confirmation-sent.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { ChangeDetectionStrategy, Component, } from '@angular/core';
1+
import {
2+
ChangeDetectionStrategy,
3+
Component,
4+
} from '@angular/core';
25
import { TranslateModule } from '@ngx-translate/core';
36

47
@Component({

src/app/external-log-in/email-confirmation/provide-email/provide-email.component.spec.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
import { CommonModule } from '@angular/common';
22
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
3-
import { ComponentFixture, TestBed, } from '@angular/core/testing';
3+
import {
4+
ComponentFixture,
5+
TestBed,
6+
} from '@angular/core/testing';
47
import { FormBuilder } from '@angular/forms';
5-
import { TranslateLoader, TranslateModule, } from '@ngx-translate/core';
8+
import {
9+
TranslateLoader,
10+
TranslateModule,
11+
} from '@ngx-translate/core';
612

713
import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
814
import { ExternalLoginService } from '../../services/external-login.service';

src/app/external-log-in/email-confirmation/provide-email/provide-email.component.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
import { NgIf } from '@angular/common';
2-
import { ChangeDetectionStrategy, Component, Input, OnDestroy, } from '@angular/core';
3-
import { FormBuilder, FormGroup, ReactiveFormsModule, Validators, } from '@angular/forms';
2+
import {
3+
ChangeDetectionStrategy,
4+
Component,
5+
Input,
6+
OnDestroy,
7+
} from '@angular/core';
8+
import {
9+
FormBuilder,
10+
FormGroup,
11+
ReactiveFormsModule,
12+
Validators,
13+
} from '@angular/forms';
414
import { TranslateModule } from '@ngx-translate/core';
515
import { Subscription } from 'rxjs';
616

src/app/external-log-in/external-log-in/external-log-in.component.ts

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,34 @@
1-
import { NgComponentOutlet, NgIf, } from '@angular/common';
2-
import { ChangeDetectionStrategy, Component, Injector, Input, OnDestroy, OnInit, } from '@angular/core';
3-
import { NgbModal, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap';
4-
import { TranslateModule, TranslateService, } from '@ngx-translate/core';
1+
import {
2+
NgComponentOutlet,
3+
NgIf,
4+
} from '@angular/common';
5+
import {
6+
ChangeDetectionStrategy,
7+
Component,
8+
Injector,
9+
Input,
10+
OnDestroy,
11+
OnInit,
12+
} from '@angular/core';
13+
import {
14+
NgbModal,
15+
NgbModalRef,
16+
} from '@ng-bootstrap/ng-bootstrap';
17+
import {
18+
TranslateModule,
19+
TranslateService,
20+
} from '@ngx-translate/core';
521

622
import { AuthService } from '../../core/auth/auth.service';
723
import { AuthMethodType } from '../../core/auth/models/auth.method-type';
824
import { AuthRegistrationType } from '../../core/auth/models/auth.registration-type';
925
import { Registration } from '../../core/shared/registration.model';
1026
import { AlertComponent } from '../../shared/alert/alert.component';
1127
import { AlertType } from '../../shared/alert/alert-type';
12-
import { hasValue, isEmpty, } from '../../shared/empty.util';
28+
import {
29+
hasValue,
30+
isEmpty,
31+
} from '../../shared/empty.util';
1332
import { ThemedLogInComponent } from '../../shared/log-in/themed-log-in.component';
1433
import {
1534
ExternalLoginTypeComponent,

src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
import { NgIf } from '@angular/common';
2-
import { ChangeDetectionStrategy, Component, Inject, OnInit, } from '@angular/core';
3-
import { FormBuilder, FormGroup, ReactiveFormsModule, } from '@angular/forms';
2+
import {
3+
ChangeDetectionStrategy,
4+
Component,
5+
Inject,
6+
OnInit,
7+
} from '@angular/core';
8+
import {
9+
FormBuilder,
10+
FormGroup,
11+
ReactiveFormsModule,
12+
} from '@angular/forms';
413
import { TranslateModule } from '@ngx-translate/core';
514

615
import { Registration } from '../../../core/shared/registration.model';

src/app/external-log-in/services/external-login.service.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
import { Injectable } from '@angular/core';
22
import { Router } from '@angular/router';
3-
import { select, Store, } from '@ngrx/store';
3+
import {
4+
select,
5+
Store,
6+
} from '@ngrx/store';
47
import { TranslateService } from '@ngx-translate/core';
5-
import { filter, map, Observable, } from 'rxjs';
8+
import {
9+
filter,
10+
map,
11+
Observable,
12+
} from 'rxjs';
613
import { AuthMethod } from 'src/app/core/auth/models/auth.method';
714
import { getAuthenticationMethods } from 'src/app/core/auth/selectors';
815
import { CoreState } from 'src/app/core/core-state.model';

src/app/external-login-page/external-login-page.component.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
import { AsyncPipe, NgIf, } from '@angular/common';
2-
import { Component, OnInit, } from '@angular/core';
1+
import {
2+
AsyncPipe,
3+
NgIf,
4+
} from '@angular/common';
5+
import {
6+
Component,
7+
OnInit,
8+
} from '@angular/core';
39
import { ActivatedRoute } from '@angular/router';
410
import { TranslateModule } from '@ngx-translate/core';
5-
import { first, map, Observable, tap, } from 'rxjs';
11+
import {
12+
first,
13+
map,
14+
Observable,
15+
tap,
16+
} from 'rxjs';
617

718
import { RemoteData } from '../core/data/remote-data';
819
import { Registration } from '../core/shared/registration.model';

src/app/external-login-review-account-info-page/external-login-review-account-info-page.component.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
import { AsyncPipe, NgIf, } from '@angular/common';
2-
import { Component, OnInit, } from '@angular/core';
1+
import {
2+
AsyncPipe,
3+
NgIf,
4+
} from '@angular/common';
5+
import {
6+
Component,
7+
OnInit,
8+
} from '@angular/core';
39
import { ActivatedRoute } from '@angular/router';
4-
import { first, map, Observable, tap, } from 'rxjs';
10+
import {
11+
first,
12+
map,
13+
Observable,
14+
tap,
15+
} from 'rxjs';
516

617
import { RemoteData } from '../core/data/remote-data';
718
import { Registration } from '../core/shared/registration.model';

src/assets/i18n/it.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8010,5 +8010,5 @@
80108010

80118011
// "external-login-page.orcid-confirmation.email.label": "Email"
80128012
// TODO New key - Add a translation
8013-
"external-login-page.orcid-confirmation.email.label": "Email"
8013+
"external-login-page.orcid-confirmation.email.label": "Email",
80148014
}

0 commit comments

Comments
 (0)