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:
@@ -1,21 +1,21 @@
|
||||
<div *ngIf="!data.reverted; else reverted">
|
||||
<h1 mat-dialog-title>{{ 'labels.heading.Revert Transaction' | translate }}</h1>
|
||||
<div mat-dialog-content>
|
||||
<p>{{ 'labels.text.Revert this transaction?' | translate }}</p>
|
||||
<mat-form-field class="flex-fill">
|
||||
<mat-label>{{ 'labels.inputs.Comments' | translate }}</mat-label>
|
||||
<textarea matInput [formControl]="comments"></textarea>
|
||||
</mat-form-field>
|
||||
@if (!data.reverted) {
|
||||
<div>
|
||||
<h1 mat-dialog-title>{{ 'labels.heading.Revert Transaction' | translate }}</h1>
|
||||
<div mat-dialog-content>
|
||||
<p>{{ 'labels.text.Revert this transaction?' | translate }}</p>
|
||||
<mat-form-field class="flex-fill">
|
||||
<mat-label>{{ 'labels.inputs.Comments' | translate }}</mat-label>
|
||||
<textarea matInput [formControl]="comments"></textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<mat-dialog-actions align="end">
|
||||
<button mat-button mat-dialog-close>{{ 'labels.buttons.No' | translate }}</button>
|
||||
<button mat-button [mat-dialog-close]="{ revert: true, comments: comments.value }">
|
||||
{{ 'labels.buttons.Yes' | translate }}
|
||||
</button>
|
||||
</mat-dialog-actions>
|
||||
</div>
|
||||
<mat-dialog-actions align="end">
|
||||
<button mat-button mat-dialog-close>{{ 'labels.buttons.No' | translate }}</button>
|
||||
<button mat-button [mat-dialog-close]="{ revert: true, comments: comments.value }">
|
||||
{{ 'labels.buttons.Yes' | translate }}
|
||||
</button>
|
||||
</mat-dialog-actions>
|
||||
</div>
|
||||
|
||||
<ng-template #reverted>
|
||||
} @else {
|
||||
<h1 mat-dialog-title>{{ 'labels.heading.Transaction Reverted' | translate }}</h1>
|
||||
<div mat-dialog-content>
|
||||
<h4>{{ 'labels.heading.Success!' | translate }}</h4>
|
||||
@@ -28,4 +28,4 @@
|
||||
{{ 'labels.buttons.Redirect to New Transaction' | translate }}
|
||||
</button>
|
||||
</mat-dialog-actions>
|
||||
</ng-template>
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/** Angular Imports */
|
||||
import { Component, Inject } from '@angular/core';
|
||||
import { Component, inject } from '@angular/core';
|
||||
import {
|
||||
MatDialogRef,
|
||||
MAT_DIALOG_DATA,
|
||||
@@ -29,15 +29,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
]
|
||||
})
|
||||
export class RevertTransactionComponent {
|
||||
dialogRef = inject<MatDialogRef<RevertTransactionComponent>>(MatDialogRef);
|
||||
data = inject(MAT_DIALOG_DATA);
|
||||
|
||||
/** Comments input form control. */
|
||||
comments = new UntypedFormControl('');
|
||||
|
||||
/**
|
||||
* @param {MatDialogRef} dialogRef Component reference to dialog.
|
||||
* @param {any} data Provides comments or reverted transaction ID.
|
||||
*/
|
||||
constructor(
|
||||
public dialogRef: MatDialogRef<RevertTransactionComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: any
|
||||
) {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user