Skip to content

Commit d964f49

Browse files
auumgnauumgn
committed
migrate reactivation form
1 parent a5df61b commit d964f49

File tree

11 files changed

+70
-75
lines changed

11 files changed

+70
-75
lines changed

‎src/app/app-routing.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ const routes: Routes = [
151151
matcher: routerReactivation,
152152
canActivateChild: [LanguageGuard, RegisterGuard],
153153
loadChildren: () =>
154-
import('./register/register.module').then((m) => m.RegisterModuleLegacy),
154+
import('./register2/register.module').then((m) => m.Register2Module),
155155
},
156156
{
157157
path: ApplicationRoutes.selfService,

‎src/app/register2/components/form-personal/form-personal.component.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,16 @@ <h3 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
114114
appearance="outline"
115115
[hideRequiredMarker]="true"
116116
[ngClass]="{
117-
'valid-password-input': emailsAreValid,
117+
'valid-password-input':
118+
emailsAreValid || this.reactivation?.isReactivation,
118119
'disable-error': !emailError
119120
}"
120121
>
121-
<mat-icon *ngIf="emailsAreValid" matSuffix>done</mat-icon>
122+
<mat-icon
123+
*ngIf="emailsAreValid || this.reactivation?.isReactivation"
124+
matSuffix
125+
>done</mat-icon
126+
>
122127

123128
<input
124129
aria-labelledby="email-input-input-label"
@@ -234,10 +239,9 @@ <h3 i18n="@@register.yourEmailAddresses" class="orc-font-body margin-top-12">
234239
<!-- <mat-label i18n="@@register.confirmEmail"
235240
>Confirm primary email</mat-label
236241
> -->
237-
<div class="input-container">
242+
<div class="input-container" *ngIf="!reactivation?.isReactivation">
238243
<mat-form-field
239244
appearance="outline"
240-
*ngIf="!reactivation?.isReactivation"
241245
[hideRequiredMarker]="true"
242246
[ngClass]="{ 'valid-password-input': emailsAreValid }"
243247
>

‎src/app/register2/components/form-personal/form-personal.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ export class FormPersonalComponent
152152
{
153153
email: new UntypedFormControl('', {
154154
validators: [Validators.required, OrcidValidators.email],
155-
asyncValidators: this._register.backendValueValidate('email'),
155+
asyncValidators:
156+
!this.reactivation?.isReactivation &&
157+
this._register.backendValueValidate('email'),
156158
}),
157159
additionalEmails: this.additionalEmails,
158160
},
@@ -320,7 +322,7 @@ export class FormPersonalComponent
320322

321323
get emailConfirmationValid() {
322324
return ((this.form.controls.emails as any).controls?.confirmEmail as any)
323-
.valid
325+
?.valid
324326
}
325327

326328
get givenNameFormTouched() {

‎src/app/register2/components/step-a/step-a.component.html

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
1313
Create your ORCID iD
1414
</h1>
1515
</ng-container>
16-
<ng-container
17-
*ngIf="reactivation?.isReactivation"
18-
i18n="@@register.reactivation"
19-
>
20-
Thank you for reactivating your ORCID iD.
16+
<ng-container *ngIf="reactivation?.isReactivation">
17+
<h1
18+
class="orc-font-heading-small"
19+
i18n="@@register.reactivateYourOrcidAccount"
20+
>
21+
Reactivate your ORCID account
22+
</h1>
2123
</ng-container>
2224
</mat-card-title>
2325
<mat-card-subtitle role="heading" aria-level="2">
@@ -71,7 +73,16 @@ <h2 class="orc-font-body-small" i18n="@@register.step1.3">
7173
type="button"
7274
id="step-a-back-button"
7375
>
74-
<a i18n="@@register.cancelRegistration"> Cancel registration</a>
76+
<a
77+
i18n="@@register.cancelRegistration"
78+
*ngIf="!reactivation?.isReactivation"
79+
>Cancel registration</a
80+
>
81+
<a
82+
i18n="@@register.cancelReactivation"
83+
*ngIf="reactivation?.isReactivation"
84+
>Cancel reactivation</a
85+
>
7586
</button>
7687
</div>
7788
</form>

‎src/app/register2/components/step-a/step-a.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class StepAComponent
7979
ngAfterViewInit(): void {
8080
// Timeout used to get focus on the first input after the first step loads
8181
setTimeout(() => {
82-
this.firstInput.nativeElement.focus()
82+
this.firstInput?.nativeElement.focus()
8383
}),
8484
100
8585
}

‎src/app/register2/components/step-b/step-b.component.html

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
1313
Create your ORCID iD
1414
</h1>
1515
</ng-container>
16-
<ng-container
17-
*ngIf="reactivation?.isReactivation"
18-
i18n="@@register.reactivation"
19-
>
20-
Thank you for reactivating your ORCID iD.
16+
<ng-container *ngIf="reactivation?.isReactivation">
17+
<h1
18+
class="orc-font-heading-small"
19+
i18n="@@register.reactivateYourOrcidAccount"
20+
>
21+
Reactivate your ORCID account
22+
</h1>
2123
</ng-container>
2224
</mat-card-title>
2325
<mat-card-subtitle role="heading" aria-level="2">
@@ -41,18 +43,7 @@ <h2 class="orc-font-body-small" i18n="@@register.step2.3">
4143
matStepperNext
4244
(click)="nextButton2()"
4345
>
44-
<ng-container
45-
*ngIf="!reactivation?.isReactivation"
46-
i18n="@@register.nextStep"
47-
>
48-
Next Step
49-
</ng-container>
50-
<ng-container
51-
*ngIf="reactivation?.isReactivation"
52-
i18n="@@register.reactivate"
53-
>
54-
REACTIVATE
55-
</ng-container>
46+
<ng-container i18n="@@register.nextStep"> Next Step </ng-container>
5647
</button>
5748
<button
5849
mat-button

‎src/app/register2/components/step-c/step-c.component.html

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
1919
Create your ORCID iD
2020
</h1>
2121
</ng-container>
22-
<ng-container
23-
*ngIf="reactivation?.isReactivation"
24-
i18n="@@register.reactivation"
25-
>
26-
Thank you for reactivating your ORCID iD.
22+
<ng-container *ngIf="reactivation?.isReactivation">
23+
<h1
24+
class="orc-font-heading-small"
25+
i18n="@@register.reactivateYourOrcidAccount"
26+
>
27+
Reactivate your ORCID account
28+
</h1>
2729
</ng-container>
2830
</mat-card-title>
2931
<mat-card-subtitle role="heading" aria-level="2">
@@ -47,18 +49,7 @@ <h2 class="orc-font-body-small" i18n="@@register.step4.3">
4749
matStepperNext
4850
(click)="nextButton2()"
4951
>
50-
<ng-container
51-
*ngIf="!reactivation?.isReactivation"
52-
i18n="@@register.nextStep"
53-
>
54-
Next Step
55-
</ng-container>
56-
<ng-container
57-
*ngIf="reactivation?.isReactivation"
58-
i18n="@@register.reactivate"
59-
>
60-
REACTIVATE
61-
</ng-container>
52+
<ng-container i18n="@@register.nextStep"> Next Step </ng-container>
6253
</button>
6354
<button
6455
mat-button

‎src/app/register2/components/step-c2/step-c2.component.html

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
1919
Create your ORCID iD
2020
</h1>
2121
</ng-container>
22-
<ng-container
23-
*ngIf="reactivation?.isReactivation"
24-
i18n="@@register.reactivation"
25-
>
26-
Thank you for reactivating your ORCID iD.
22+
<ng-container *ngIf="reactivation?.isReactivation">
23+
<h1
24+
class="orc-font-heading-small"
25+
i18n="@@register.reactivateYourOrcidAccount"
26+
>
27+
Reactivate your ORCID account
28+
</h1>
2729
</ng-container>
2830
</mat-card-title>
2931
<mat-card-subtitle role="heading" aria-level="2">
@@ -51,18 +53,7 @@ <h2 class="orc-font-body-small" i18n="@@register.step3.3">
5153
[disabled]="loading"
5254
(click)="nextButton2()"
5355
>
54-
<ng-container
55-
*ngIf="!reactivation?.isReactivation"
56-
i18n="@@register.nextStep"
57-
>
58-
Next Step
59-
</ng-container>
60-
<ng-container
61-
*ngIf="reactivation?.isReactivation"
62-
i18n="@@register.reactivate"
63-
>
64-
REACTIVATE
65-
</ng-container>
56+
<ng-container i18n="@@register.nextStep"> Next Step </ng-container>
6657
</button>
6758
<button
6859
mat-button

‎src/app/register2/components/step-d/step-d.component.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ <h1 class="orc-font-heading-small" i18n="@@register.create">
1919
Create your ORCID iD
2020
</h1>
2121
</ng-container>
22-
<ng-container
23-
*ngIf="reactivation?.isReactivation"
24-
i18n="@@register.reactivation"
25-
>
26-
Thank you for reactivating your ORCID iD.
22+
<ng-container *ngIf="reactivation?.isReactivation">
23+
<h1
24+
class="orc-font-heading-small"
25+
i18n="@@register.reactivateYourOrcidAccount"
26+
>
27+
Reactivate your ORCID account
28+
</h1>
2729
</ng-container>
2830
</mat-card-title>
2931
<mat-card-subtitle role="heading" aria-level="2">
@@ -57,9 +59,9 @@ <h2 class="orc-font-body-small" i18n="@@register.step5.3">
5759
</ng-container>
5860
<ng-container
5961
*ngIf="reactivation?.isReactivation"
60-
i18n="@@register.reactivate"
62+
i18n="@@register.reactivateMyOrcidAccount"
6163
>
62-
REACTIVATE
64+
Reactivate my ORCID account
6365
</ng-container>
6466
</button>
6567
<button
@@ -70,7 +72,7 @@ <h2 class="orc-font-body-small" i18n="@@register.step5.3">
7072
id="step-d-back-button"
7173
(click)="backButton()"
7274
>
73-
<a i18n="@@shared.previousStep"> Previous Step</a>
75+
<a i18n="@@shared.previousStep">Previous Step</a>
7476
</button>
7577
</div>
7678
</form>

‎src/app/register2/register-observability.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ export class RegisterObservabilityService {
5252
emailError: (form.controls.emails as UntypedFormGroup).controls.email
5353
.errors,
5454
confirmEmailError: (form.controls.emails as UntypedFormGroup).controls
55-
.confirmEmail.errors,
55+
.confirmEmail?.errors,
5656
additionalEmailsError: (form.controls.emails as UntypedFormGroup)
57-
.controls.additionalEmails.errors,
57+
.controls.additionalEmails?.errors,
5858
},
5959
}
6060
)

‎src/locale/properties/register/register.en.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ register.reactivating=Reactivating your account
103103
register.resendReactivate=click here to reactivate
104104
register.deactivated=A deactivated ORCID record is associated with this email address.
105105
register.reactivation=Thank you for reactivating your ORCID iD.
106+
register.reactivateYourOrcidAccount=Reactivate your ORCID account
107+
register.reactivateMyOrcidAccount=Reactivate my ORCID account
106108
register.reactivate=REACTIVATE
107109
register.passwordIsToLong=Passwords must be between 8 and 256 characters long
108110
register.wrongPasswordPatternV2=Password must meet all requirements
@@ -166,6 +168,7 @@ register.step3.3=Step 3 of 5 - Current employment
166168
register.step5.3=Step 5 of 5 - Terms and conditions
167169
register.nextStep=Next Step
168170
register.cancelRegistration=Cancel registration
171+
register.cancelReactivation=Cancel reactivation
169172
register.previousStep=Previous Step
170173
register.completeRegistration=Complete registration
171174
register.passwordRequired2=Please enter a password

0 commit comments

Comments
 (0)