Skip to content

Commit 3472661

Browse files
vins01-4sciencevins01-4science
committed
[CST-15074][DSpace#3355] Resolved conflicts and updated control-flow syntax
1 parent 0e56427 commit 3472661

8 files changed

Lines changed: 69 additions & 84 deletions

File tree

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

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,17 @@ <h4 class="mb-3">
1212
class="form-control form-control-lg position-relative"
1313
[attr.aria-label]="'external-login.confirmation.email-label' | translate"
1414
/>
15-
<div
16-
*ngIf="
17-
emailForm.get('email').hasError('required') &&
18-
emailForm.get('email').touched
19-
"
20-
class="text-danger"
21-
>
22-
{{ "external-login.confirmation.email-required" | translate }}
23-
</div>
24-
<div
25-
*ngIf="
26-
emailForm.get('email').hasError('email') &&
27-
emailForm.get('email').touched
28-
"
29-
class="text-danger"
30-
>
31-
{{ "external-login.confirmation.email-invalid" | translate }}
32-
</div>
15+
@if (emailForm.get('email').hasError('required') && emailForm.get('email').touched) {
16+
<div class="text-danger">
17+
{{ "external-login.confirmation.email-required" | translate }}
18+
</div>
19+
}
20+
@if (emailForm.get('email').hasError('email') && emailForm.get('email').touched) {
21+
<div class="text-danger">
22+
{{ "external-login.confirmation.email-invalid" | translate }}
23+
</div>
24+
}
3325
</div>
34-
3526
<button type="submit" class="btn btn-lg btn-primary btn-block">
3627
{{ "external-login.confirm.button.label" | translate }}
3728
</button>

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

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,16 @@ <h4 class="mb-3">
1212
[attr.aria-label]="'external-login.confirmation.email' | translate"
1313
/>
1414

15-
<div
16-
*ngIf="
17-
emailForm.get('email').hasError('required') &&
18-
emailForm.get('email').touched
19-
"
20-
class="text-danger"
21-
>
22-
{{ "external-login.confirmation.email-required" | translate }}
23-
</div>
24-
<div
25-
*ngIf="
26-
emailForm.get('email').hasError('email') &&
27-
emailForm.get('email').touched
28-
"
29-
class="text-danger"
30-
>
31-
{{ "external-login.confirmation.email-invalid" | translate }}
32-
</div>
15+
@if (emailForm.get('email').hasError('required') && emailForm.get('email').touched) {
16+
<div class="text-danger">
17+
{{ "external-login.confirmation.email-required" | translate }}
18+
</div>
19+
}
20+
@if (emailForm.get('email').hasError('email') && emailForm.get('email').touched) {
21+
<div class="text-danger">
22+
{{ "external-login.confirmation.email-invalid" | translate }}
23+
</div>
24+
}
3325
</div>
3426

3527
<button type="submit" class="btn btn-lg btn-primary btn-block">

‎src/app/external-log-in/external-log-in/external-log-in.component.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ <h4>{{ 'external-login.confirmation.header' | translate}}</h4>
1010
</ds-alert>
1111
<div class="row justify-content-center">
1212
<div class="col-4 d-flex justify-content-end align-items-center">
13-
<ng-container *ngIf="registrationData.email; else provideEmail">
13+
@if (registrationData.email) {
1414
<ds-confirm-email [registrationData]="registrationData" [token]="token"></ds-confirm-email>
15-
</ng-container>
16-
<ng-template #provideEmail>
15+
} @else {
1716
<ds-provide-email [registrationId]="registrationData.id" [token]="token"></ds-provide-email>
18-
</ng-template>
17+
}
1918
</div>
2019
<div class="col-1 align-items-center d-flex justify-content-center">
2120
<h4 class="mt-2">{{ 'external-login.component.or' | translate }}</h4>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
formControlName="firstname"
2424
type="text"
2525
[attr.data-test]="'firstname' | dsBrowserOnly">
26-
<ng-container *ngIf="registrationData?.email">
26+
@if (registrationData?.email) {
2727
<label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.email" | translate}}</label>
2828
<input [attr.aria-label]="'external-login-page.orcid-confirmation.email.label' | translate"
2929
autocomplete="off"
3030
class="form-control form-control-lg position-relative"
3131
formControlName="email"
3232
type="email"
3333
[attr.data-test]="'email' | dsBrowserOnly">
34-
</ng-container>
34+
}
3535
</form>

‎src/app/external-login-page/external-login-page.component.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<div class="container">
2-
<ng-container *ngIf="(registrationData$ | async)">
3-
<ds-external-log-in [registrationData]="registrationData$ | async" [token]="token"></ds-external-log-in>
4-
</ng-container>
2+
@if (registrationData$ | async; as registrationData) {
3+
<ds-external-log-in [registrationData]="registrationData" [token]="token"></ds-external-log-in>
4+
}
55

6-
<ds-alert
7-
*ngIf="hasErrors"
8-
[type]="AlertTypeEnum.Error"
9-
[content]="'external-login.error.notification' | translate"
10-
></ds-alert>
6+
@if (hasErrors) {
7+
<ds-alert
8+
[type]="AlertTypeEnum.Error"
9+
[content]="'external-login.error.notification' | translate"
10+
></ds-alert>
11+
}
1112
</div>

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<div class="container">
2-
<ng-container *ngIf="(registrationData$ | async)">
2+
@if (registrationData$ | async; as registrationData) {
33
<ds-review-account-info
44
[registrationToken]="token"
5-
[registrationData]="registrationData$ | async"
5+
[registrationData]="registrationData"
66
></ds-review-account-info>
7-
</ng-container>
8-
<ds-alert
9-
*ngIf="hasErrors"
10-
[type]="AlertTypeEnum.Error"
11-
[content]="'review-account-info.alert.error.content'"
12-
></ds-alert>
7+
}
8+
@if (hasErrors) {
9+
<ds-alert
10+
[type]="AlertTypeEnum.Error"
11+
[content]="'review-account-info.alert.error.content'"
12+
></ds-alert>
13+
}
1314
</div>

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,32 @@ <h2> {{'external-login-validation.review-account-info.header' | translate}}</h2>
2828
</td>
2929
<td></td>
3030
</tr>
31-
<tr *ngFor="let data of dataToCompare">
32-
<th scope="row">{{ data.label | titlecase }}</th>
33-
<td>{{ data.receivedValue }}</td>
34-
<td>
35-
<span
36-
[innerHTML]="
37-
data.receivedValue | dsCompareValues : data.currentValue
38-
"
39-
>
40-
</span>
41-
</td>
42-
<td>
43-
<ui-switch
44-
*ngIf="(data.receivedValue !== data.currentValue) && data.currentValue"
45-
[checkedLabel]="'on-label' | translate"
46-
[uncheckedLabel]="'off-label' | translate"
47-
[checked]="data.overrideValue"
48-
(change)="onOverrideChange($event, data.identifier)"
49-
></ui-switch>
50-
</td>
51-
</tr>
31+
@for (data of dataToCompare; track data) {
32+
<tr>
33+
<th scope="row">{{ data.label | titlecase }}</th>
34+
<td>{{ data.receivedValue }}</td>
35+
<td>
36+
<span
37+
[innerHTML]="
38+
data.receivedValue | dsCompareValues : data.currentValue
39+
"
40+
>
41+
</span>
42+
</td>
43+
<td>
44+
@if ((data.receivedValue !== data.currentValue) && data.currentValue) {
45+
<ui-switch
46+
[checkedLabel]="'on-label' | translate"
47+
[uncheckedLabel]="'off-label' | translate"
48+
[checked]="data.overrideValue"
49+
(change)="onOverrideChange($event, data.identifier)"
50+
></ui-switch>
51+
}
52+
</td>
53+
</tr>
54+
}
5255
</tbody>
53-
</table>
54-
<div class="d-flex justify-content-end">
56+
</table> <div class="d-flex justify-content-end">
5557
<button class="btn btn-primary" (click)="onSave()">
5658
{{'confirmation-modal.review-account-info.confirm' | translate}}
5759
</button>

‎src/app/shared/log-in/log-in.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@ import { hasValue } from '../empty.util';
2727
import { ThemedLoadingComponent } from '../loading/themed-loading.component';
2828
import { LogInContainerComponent } from './container/log-in-container.component';
2929
import { rendersAuthMethodType } from './methods/log-in.methods-decorator';
30-
import { TranslateModule } from '@ngx-translate/core';
3130

3231
@Component({
3332
selector: 'ds-base-log-in',
3433
templateUrl: './log-in.component.html',
3534
styleUrls: ['./log-in.component.scss'],
3635
changeDetection: ChangeDetectionStrategy.OnPush,
3736
standalone: true,
38-
imports: [ThemedLoadingComponent, LogInContainerComponent, AsyncPipe, TranslateModule],
37+
imports: [ThemedLoadingComponent, LogInContainerComponent, AsyncPipe],
3938
})
4039
export class LogInComponent implements OnInit {
4140

0 commit comments

Comments
 (0)