Upgrading to Angular 20:
Replaced checked in package-lock.json by regenerated one. Ran ng update @angular/core@20 @angular/cli@20 Ran npm install @angular-builders/jest@^20.0.0 @fortawesome/angular-fontawesome@^3.0.0 @swimlane/ngx-graph@^11 Ran npm install ngx-mat-select-search@^8.0.2. Ran ng update @angular/material@20. Updated all eslint and typescript to the latest versions. Removed @angular-devkit/schematics. Updated fontawesome. Updated rxjs and tslib. Moved required node version from 16 to 20. Updated jest-preset-angular. Set preserveWhitespaces to false. Corrected two type declarations in two typescript files to make ng serve run without errors. Removed unused angular-devkit/schematics from view-user.component.ts . Updated list of supported browsers. Upgraded prettier. Ran prettier . --write the first time. Ran prettier . --write the second time. Ran ng generate @angular/core:inject with defaults, excepted a handful of files. Fixed remaining eslint problems. Added dist directory to ignores in eslint.config.js. Let prettier fix formatting, almost everything is just line breaks. Made htmlhint ignore @if and @for Angular constructs. Updated node version in Github workflow to 22.12.0 (build.yml). Updated .env.ts. Updated Angular datetime format strings from YYYY-MM-DD to yyyy-MM-dd. Merged changes from dev into angular20 branch.
This commit is contained in:
Felix van Hove
@@ -5,85 +5,94 @@
|
||||
<mat-divider></mat-divider>
|
||||
|
||||
<!-- Select delivery method to receive OTP -->
|
||||
<p *ngIf="!otpRequested">{{ 'labels.text.Please select a delivery method' | translate }}:</p>
|
||||
@if (!otpRequested) {
|
||||
<p>{{ 'labels.text.Please select a delivery method' | translate }}:</p>
|
||||
}
|
||||
|
||||
<form
|
||||
class="layout-column two-factor-auth-form"
|
||||
*ngIf="!otpRequested"
|
||||
[formGroup]="twoFactorAuthenticationDeliveryMethodForm"
|
||||
(ngSubmit)="requestOTP()"
|
||||
>
|
||||
<mat-radio-group
|
||||
class="layout-column align-center radio-group-spacing"
|
||||
formControlName="twoFactorAuthenticationDeliveryMethod"
|
||||
@if (!otpRequested) {
|
||||
<form
|
||||
class="layout-column two-factor-auth-form"
|
||||
[formGroup]="twoFactorAuthenticationDeliveryMethodForm"
|
||||
(ngSubmit)="requestOTP()"
|
||||
>
|
||||
<mat-radio-button
|
||||
*ngFor="let twoFactorAuthenticationDeliveryMethod of twoFactorAuthenticationDeliveryMethods"
|
||||
[value]="twoFactorAuthenticationDeliveryMethod"
|
||||
<mat-radio-group
|
||||
class="layout-column align-center radio-group-spacing"
|
||||
formControlName="twoFactorAuthenticationDeliveryMethod"
|
||||
>
|
||||
{{ 'labels.inputs.Send' | translate }} {{ twoFactorAuthenticationDeliveryMethod.name }}
|
||||
{{ 'labels.inputs.to' | translate }} {{ twoFactorAuthenticationDeliveryMethod.target }}
|
||||
</mat-radio-button>
|
||||
</mat-radio-group>
|
||||
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
class="flex-fill align-center"
|
||||
[disabled]="!twoFactorAuthenticationDeliveryMethodForm.valid"
|
||||
>
|
||||
{{ 'labels.buttons.Request OTP' | translate }}
|
||||
<mat-spinner [diameter]="20" *ngIf="loading"></mat-spinner>
|
||||
</button>
|
||||
</form>
|
||||
@for (
|
||||
twoFactorAuthenticationDeliveryMethod of twoFactorAuthenticationDeliveryMethods;
|
||||
track twoFactorAuthenticationDeliveryMethod
|
||||
) {
|
||||
<mat-radio-button [value]="twoFactorAuthenticationDeliveryMethod">
|
||||
{{ 'labels.inputs.Send' | translate }} {{ twoFactorAuthenticationDeliveryMethod.name }}
|
||||
{{ 'labels.inputs.to' | translate }} {{ twoFactorAuthenticationDeliveryMethod.target }}
|
||||
</mat-radio-button>
|
||||
}
|
||||
</mat-radio-group>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
class="flex-fill align-center"
|
||||
[disabled]="!twoFactorAuthenticationDeliveryMethodForm.valid"
|
||||
>
|
||||
{{ 'labels.buttons.Request OTP' | translate }}
|
||||
@if (loading) {
|
||||
<mat-spinner [diameter]="20"></mat-spinner>
|
||||
}
|
||||
</button>
|
||||
</form>
|
||||
}
|
||||
|
||||
<!-- Show input for OTP -->
|
||||
<p *ngIf="otpRequested">{{ 'labels.text.Please enter the OTP' | translate }}:</p>
|
||||
@if (otpRequested) {
|
||||
<p>{{ 'labels.text.Please enter the OTP' | translate }}:</p>
|
||||
}
|
||||
|
||||
<form
|
||||
class="layout-column two-factor-auth-form"
|
||||
*ngIf="otpRequested"
|
||||
[formGroup]="twoFactorAuthenticationForm"
|
||||
(ngSubmit)="validateOTP()"
|
||||
>
|
||||
<mat-form-field class="two-factor-auth-input flex-fill align-center">
|
||||
<span matPrefix>
|
||||
<fa-icon icon="user-shield" class="m-r-10"></fa-icon>
|
||||
</span>
|
||||
<mat-label>{{ 'labels.inputs.OTP' | translate }}</mat-label>
|
||||
<input type="password" matInput autocomplete="off" required formControlName="otp" />
|
||||
<mat-hint align="start">
|
||||
<strong>{{ 'labels.inputs.Delivery Method' | translate }}:</strong>
|
||||
{{ selectedTwoFactorAuthenticationDeliveryMethod.name }}
|
||||
</mat-hint>
|
||||
<mat-hint align="end">
|
||||
<strong>{{ 'labels.inputs.Validity' | translate }}:</strong> {{ tokenValidityTime / 60 }}
|
||||
{{ 'labels.inputs.mins' | translate }}
|
||||
</mat-hint>
|
||||
<mat-error *ngIf="twoFactorAuthenticationForm.controls.otp.hasError('required')">
|
||||
{{ 'labels.inputs.OTP' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
class="two-factor-auth-button align-center"
|
||||
[disabled]="!twoFactorAuthenticationForm.valid"
|
||||
>
|
||||
{{ 'labels.buttons.Validate OTP' | translate }}
|
||||
<mat-spinner [diameter]="20" *ngIf="loading"></mat-spinner>
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
mat-button
|
||||
class="two-factor-auth-button align-center"
|
||||
(click)="resendOTP()"
|
||||
[disabled]="loading || resendOTPLoading"
|
||||
>
|
||||
{{ 'labels.buttons.Resend OTP' | translate }}
|
||||
<mat-spinner [diameter]="20" *ngIf="resendOTPLoading"></mat-spinner>
|
||||
</button>
|
||||
</form>
|
||||
@if (otpRequested) {
|
||||
<form class="layout-column two-factor-auth-form" [formGroup]="twoFactorAuthenticationForm" (ngSubmit)="validateOTP()">
|
||||
<mat-form-field class="two-factor-auth-input flex-fill align-center">
|
||||
<span matPrefix>
|
||||
<fa-icon icon="user-shield" class="m-r-10"></fa-icon>
|
||||
</span>
|
||||
<mat-label>{{ 'labels.inputs.OTP' | translate }}</mat-label>
|
||||
<input type="password" matInput autocomplete="off" required formControlName="otp" />
|
||||
<mat-hint align="start">
|
||||
<strong>{{ 'labels.inputs.Delivery Method' | translate }}:</strong>
|
||||
{{ selectedTwoFactorAuthenticationDeliveryMethod.name }}
|
||||
</mat-hint>
|
||||
<mat-hint align="end">
|
||||
<strong>{{ 'labels.inputs.Validity' | translate }}:</strong> {{ tokenValidityTime / 60 }}
|
||||
{{ 'labels.inputs.mins' | translate }}
|
||||
</mat-hint>
|
||||
@if (twoFactorAuthenticationForm.controls.otp.hasError('required')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.OTP' | translate }} {{ 'labels.commons.is' | translate }}
|
||||
<strong>{{ 'labels.commons.required' | translate }}</strong>
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
<button
|
||||
mat-raised-button
|
||||
color="primary"
|
||||
class="two-factor-auth-button align-center"
|
||||
[disabled]="!twoFactorAuthenticationForm.valid"
|
||||
>
|
||||
{{ 'labels.buttons.Validate OTP' | translate }}
|
||||
@if (loading) {
|
||||
<mat-spinner [diameter]="20"></mat-spinner>
|
||||
}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
mat-button
|
||||
class="two-factor-auth-button align-center"
|
||||
(click)="resendOTP()"
|
||||
[disabled]="loading || resendOTPLoading"
|
||||
>
|
||||
{{ 'labels.buttons.Resend OTP' | translate }}
|
||||
@if (resendOTPLoading) {
|
||||
<mat-spinner [diameter]="20"></mat-spinner>
|
||||
}
|
||||
</button>
|
||||
</form>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user