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:
@@ -17,7 +17,6 @@ const routes: Routes = [
|
||||
data: { title: 'Settings', breadcrumb: 'Settings' }
|
||||
}
|
||||
])
|
||||
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@@ -14,27 +14,33 @@
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Default Language' | translate }}</mat-label>
|
||||
<mat-select [formControl]="language" [compareWith]="compareOptions">
|
||||
<mat-option *ngFor="let language of languages" [value]="language">
|
||||
{{ language.name }}
|
||||
</mat-option>
|
||||
@for (language of languages; track language) {
|
||||
<mat-option [value]="language">
|
||||
{{ language.name }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Default Date Format' | translate }}</mat-label>
|
||||
<mat-select [formControl]="dateFormat">
|
||||
<mat-option *ngFor="let dateFormat of dateFormats" [value]="dateFormat">
|
||||
{{ dateFormat }}
|
||||
</mat-option>
|
||||
@for (dateFormat of dateFormats; track dateFormat) {
|
||||
<mat-option [value]="dateFormat">
|
||||
{{ dateFormat }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Decimals to Display' | translate }}</mat-label>
|
||||
<mat-select [formControl]="decimalsToDisplay">
|
||||
<mat-option *ngFor="let decimalOpt of decimals" [value]="decimalOpt">
|
||||
{{ decimalOpt }}
|
||||
</mat-option>
|
||||
@for (decimalOpt of decimals; track decimalOpt) {
|
||||
<mat-option [value]="decimalOpt">
|
||||
{{ decimalOpt }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
@@ -76,9 +82,11 @@
|
||||
<mat-form-field>
|
||||
<mat-label>{{ 'labels.inputs.Default Font' | translate }}</mat-label>
|
||||
<mat-select>
|
||||
<mat-option *ngFor="let font of fonts" [value]="font">
|
||||
{{ font }}
|
||||
</mat-option>
|
||||
@for (font of fonts; track font) {
|
||||
<mat-option [value]="font">
|
||||
{{ font }}
|
||||
</mat-option>
|
||||
}
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/** Angular Imports */
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Component, OnInit, inject } from '@angular/core';
|
||||
|
||||
/** Custom Service */
|
||||
import { SettingsService } from './settings.service';
|
||||
@@ -32,6 +32,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
]
|
||||
})
|
||||
export class SettingsComponent implements OnInit {
|
||||
private settingsService = inject(SettingsService);
|
||||
|
||||
/** Placeholder for languages. update once translations are set up */
|
||||
languages: any[] = [
|
||||
{
|
||||
@@ -73,11 +75,6 @@ export class SettingsComponent implements OnInit {
|
||||
/** Decimals to Display Setting */
|
||||
decimalsToDisplay = new UntypedFormControl('');
|
||||
|
||||
/**
|
||||
* @param {SettingsService} settingsService Settings Service
|
||||
*/
|
||||
constructor(private settingsService: SettingsService) {}
|
||||
|
||||
ngOnInit() {
|
||||
this.language.patchValue(this.settingsService.language);
|
||||
this.dateFormat.patchValue(this.settingsService.dateFormat);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/** Angular Imports */
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { AlertService } from 'app/core/alert/alert.service';
|
||||
import { Dates } from 'app/core/utils/dates';
|
||||
|
||||
@@ -13,6 +13,9 @@ import { environment } from '../../environments/environment';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class SettingsService {
|
||||
private alertService = inject(AlertService);
|
||||
private dateUtils = inject(Dates);
|
||||
|
||||
public static businessDateFormat = 'yyyy-MM-dd';
|
||||
public static businessDateConfigName = 'enable-business-date';
|
||||
public static businessDateType = 'BUSINESS_DATE';
|
||||
@@ -20,11 +23,6 @@ export class SettingsService {
|
||||
minAllowedDate = new Date(1950, 0, 1);
|
||||
maxAllowedDate = new Date(2100, 0, 1);
|
||||
|
||||
constructor(
|
||||
private alertService: AlertService,
|
||||
private dateUtils: Dates
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Sets date format setting throughout the app.
|
||||
* @param {string} dateFormat Date Format
|
||||
|
||||
Reference in New Issue
Block a user