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:
+15
-9
@@ -5,23 +5,29 @@
|
||||
<mat-form-field appearance="fill" class="full-width">
|
||||
<mat-label>{{ 'labels.inputs.Password Current' | translate }}</mat-label>
|
||||
<input matInput type="password" formControlName="currentPassword" required />
|
||||
<mat-error *ngIf="changePasswordForm.get('currentPassword')?.hasError('required')">
|
||||
{{ 'labels.inputs.Password Current Required' | translate }}
|
||||
</mat-error>
|
||||
@if (changePasswordForm.get('currentPassword')?.hasError('required')) {
|
||||
<mat-error>
|
||||
{{ 'labels.inputs.Password Current Required' | translate }}
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
<mat-form-field appearance="fill" class="full-width">
|
||||
<mat-label>{{ 'labels.inputs.Password New' | translate }}</mat-label>
|
||||
<input matInput type="password" formControlName="password" required />
|
||||
<mat-error *ngIf="changePasswordForm.get('password')?.errors">
|
||||
{{ 'labels.commons.Password validation' | translate: { minchar: minPasswordLength } }}
|
||||
</mat-error>
|
||||
@if (changePasswordForm.get('password')?.errors) {
|
||||
<mat-error>
|
||||
{{ 'labels.commons.Password validation' | translate: { minchar: minPasswordLength } }}
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
<mat-form-field appearance="fill" class="full-width">
|
||||
<mat-label>{{ 'labels.inputs.Repeat Password' | translate }}</mat-label>
|
||||
<input matInput type="password" formControlName="repeatPassword" required />
|
||||
<mat-error *ngIf="changePasswordForm.get('repeatPassword')?.hasError('notequal')">
|
||||
{{ 'inputs.passwordsDoNotMatch' | translate }}
|
||||
</mat-error>
|
||||
@if (changePasswordForm.get('repeatPassword')?.hasError('notequal')) {
|
||||
<mat-error>
|
||||
{{ 'inputs.passwordsDoNotMatch' | translate }}
|
||||
</mat-error>
|
||||
}
|
||||
</mat-form-field>
|
||||
<mat-dialog-actions align="center">
|
||||
<button mat-raised-button color="warn" type="button" (click)="dialogRef.close()">
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Component, OnInit, Inject } from '@angular/core';
|
||||
import { Component, OnInit, inject } from '@angular/core';
|
||||
import { MatDialogRef, MAT_DIALOG_DATA, MatDialogActions } from '@angular/material/dialog';
|
||||
import { UntypedFormBuilder, Validators, AbstractControl, ValidationErrors, FormGroup } from '@angular/forms';
|
||||
import { confirmPasswordValidator } from 'app/login/reset-password/confirm-password.validator';
|
||||
@@ -23,17 +23,15 @@ import { TranslateService } from '@ngx-translate/core';
|
||||
]
|
||||
})
|
||||
export class ChangePasswordDialogComponent implements OnInit {
|
||||
dialogRef = inject<MatDialogRef<ChangePasswordDialogComponent>>(MatDialogRef);
|
||||
data = inject(MAT_DIALOG_DATA);
|
||||
private formBuilder = inject(UntypedFormBuilder);
|
||||
private http = inject(HttpClient);
|
||||
private translateService = inject(TranslateService);
|
||||
|
||||
minPasswordLength: number = environment.minPasswordLength || 12;
|
||||
changePasswordForm: FormGroup;
|
||||
|
||||
constructor(
|
||||
public dialogRef: MatDialogRef<ChangePasswordDialogComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: any,
|
||||
private formBuilder: UntypedFormBuilder,
|
||||
private http: HttpClient,
|
||||
private translateService: TranslateService
|
||||
) {}
|
||||
|
||||
private api = environment.OIDC.oidcApiUrl;
|
||||
|
||||
ngOnInit(): void {
|
||||
@@ -54,7 +52,8 @@ export class ChangePasswordDialogComponent implements OnInit {
|
||||
Validators.required,
|
||||
Validators.minLength(this.minPasswordLength),
|
||||
Validators.maxLength(50),
|
||||
Validators.pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).+$/)]
|
||||
Validators.pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).+$/)
|
||||
]
|
||||
],
|
||||
repeatPassword: [
|
||||
'',
|
||||
@@ -72,7 +71,8 @@ export class ChangePasswordDialogComponent implements OnInit {
|
||||
|
||||
this.changePasswordForm.get('repeatPassword')?.setValidators([
|
||||
Validators.required,
|
||||
this.matchOtherControl('password')]);
|
||||
this.matchOtherControl('password')
|
||||
]);
|
||||
}
|
||||
|
||||
matchOtherControl(controlNameToMatch: string) {
|
||||
|
||||
Reference in New Issue
Block a user