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,8 +1,12 @@
|
||||
<h1 mat-dialog-title>{{ 'Error Log' | translate }}</h1>
|
||||
|
||||
<div mat-dialog-content>
|
||||
<p *ngIf="!showAsCode">{{ displayData }}</p>
|
||||
<span *ngIf="showAsCode" [innerHTML]="sanitizedData"></span>
|
||||
@if (!showAsCode) {
|
||||
<p>{{ displayData }}</p>
|
||||
}
|
||||
@if (showAsCode) {
|
||||
<span [innerHTML]="sanitizedData"></span>
|
||||
}
|
||||
</div>
|
||||
|
||||
<mat-dialog-actions align="left">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/** Angular Imports. */
|
||||
import { Component, OnInit, Inject, SecurityContext } from '@angular/core';
|
||||
import { Component, OnInit, SecurityContext, inject } from '@angular/core';
|
||||
import {
|
||||
MatDialogRef,
|
||||
MAT_DIALOG_DATA,
|
||||
@@ -26,17 +26,19 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
]
|
||||
})
|
||||
export class ErrorDialogComponent {
|
||||
dialogRef = inject<MatDialogRef<ErrorDialogComponent>>(MatDialogRef);
|
||||
data = inject(MAT_DIALOG_DATA);
|
||||
private sanitizer = inject(DomSanitizer);
|
||||
|
||||
showAsCode = false;
|
||||
/**
|
||||
* @param {MatDialogRef} dialogRef Component reference to dialog.
|
||||
* @param {unknown} data Provides any data.
|
||||
* @param {DomSanitizer} sanitizer Service to sanitize HTML content.
|
||||
*/
|
||||
constructor(
|
||||
public dialogRef: MatDialogRef<ErrorDialogComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: unknown,
|
||||
private sanitizer: DomSanitizer
|
||||
) {
|
||||
constructor() {
|
||||
const data = this.data;
|
||||
|
||||
// Guard for non-string data to avoid runtime error
|
||||
this.showAsCode = typeof data === 'string' && data.startsWith('<pre><code>');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user