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,5 +1,5 @@
|
||||
/** Angular Imports */
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http';
|
||||
|
||||
/** rxjs Imports */
|
||||
@@ -13,10 +13,7 @@ import { SettingsService } from 'app/settings/settings.service';
|
||||
*/
|
||||
@Injectable()
|
||||
export class ApiPrefixInterceptor implements HttpInterceptor {
|
||||
/**
|
||||
* @param {SettingsService} settingsService Settings Service
|
||||
*/
|
||||
constructor(private settingsService: SettingsService) {}
|
||||
private settingsService = inject(SettingsService);
|
||||
|
||||
/**
|
||||
* Intercepts a Http request and prefixes it with `serverUrl`.
|
||||
|
||||
@@ -17,6 +17,7 @@ import { environment } from '../../../environments/environment';
|
||||
export class CacheInterceptor implements HttpInterceptor {
|
||||
private forceUpdate = false;
|
||||
|
||||
// eslint-disable-next-line @angular-eslint/prefer-inject
|
||||
constructor(private httpCacheService: HttpCacheService) {}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/** Angular Imports */
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpErrorResponse } from '@angular/common/http';
|
||||
|
||||
/** rxjs Imports */
|
||||
@@ -22,14 +22,8 @@ const log = new Logger('ErrorHandlerInterceptor');
|
||||
*/
|
||||
@Injectable()
|
||||
export class ErrorHandlerInterceptor implements HttpInterceptor {
|
||||
/**
|
||||
* @param {AlertService} alertService Alert Service.
|
||||
* @param {TranslateService} translate Translation Service.
|
||||
*/
|
||||
constructor(
|
||||
private alertService: AlertService,
|
||||
private translate: TranslateService // Added TranslateService
|
||||
) {}
|
||||
private alertService = inject(AlertService);
|
||||
private translate = inject(TranslateService);
|
||||
|
||||
/**
|
||||
* Intercepts a Http request and adds a default error handler.
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable @angular-eslint/prefer-inject */
|
||||
/** Angular Imports */
|
||||
import { Inject, Injectable, InjectionToken, Injector, Optional } from '@angular/core';
|
||||
import { HttpClient, HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http';
|
||||
@@ -81,7 +82,8 @@ export class HttpService extends HttpClient {
|
||||
// Configure default interceptors that can be disabled here
|
||||
this.interceptors = [
|
||||
this.injector.get(ApiPrefixInterceptor),
|
||||
this.injector.get(ErrorHandlerInterceptor)];
|
||||
this.injector.get(ErrorHandlerInterceptor)
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user