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:
Felix van Hove
2025-12-08 11:01:01 +01:00
parent f1b4ec2cf2
commit 7fd1486c08
1516 changed files with 39367 additions and 36037 deletions
@@ -7,9 +7,11 @@
<mat-form-field id="office" class="flex-94">
<mat-label>{{ 'labels.inputs.Office' | translate }}</mat-label>
<mat-select [formControl]="officeId">
<mat-option *ngFor="let office of officeData" [value]="office.id">
{{ office.name }}
</mat-option>
@for (office of officeData; track office) {
<mat-option [value]="office.id">
{{ office.name }}
</mat-option>
}
</mat-select>
</mat-form-field>
</div>
@@ -21,8 +23,10 @@
<div [ngStyle]="{ display: hideOutput ? 'none' : 'block' }">
<canvas id="collection-pie" width="800" height="600"></canvas>
</div>
<div *ngIf="showFallback" class="fallback align-center-center">
<p>{{ 'labels.text.No Data' | translate }}</p>
</div>
@if (showFallback) {
<div class="fallback align-center-center">
<p>{{ 'labels.text.No Data' | translate }}</p>
</div>
}
</mat-card-content>
</mat-card>
@@ -1,5 +1,5 @@
/** Angular Imports */
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
@@ -10,7 +10,7 @@ import { HomeService } from '../../home.service';
import { Chart, registerables } from 'chart.js';
import { MatCard, MatCardHeader, MatCardContent } from '@angular/material/card';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { NgFor, NgStyle, NgIf } from '@angular/common';
import { NgStyle } from '@angular/common';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
// Register Chart.js components
@@ -31,6 +31,9 @@ Chart.register(...registerables);
]
})
export class AmountCollectedPieComponent implements OnInit {
private homeService = inject(HomeService);
private route = inject(ActivatedRoute);
/** Static Form control for office Id */
officeId = new UntypedFormControl();
/** Office Data */
@@ -47,10 +50,7 @@ export class AmountCollectedPieComponent implements OnInit {
* @param {HomeService} homeService Home Service.
* @param {ActivatedRoute} route Activated Route.
*/
constructor(
private homeService: HomeService,
private route: ActivatedRoute
) {
constructor() {
this.route.data.subscribe((data: { offices: any }) => {
this.officeData = data.offices;
});
@@ -7,9 +7,11 @@
<mat-form-field id="office" class="flex-94">
<mat-label>{{ 'labels.inputs.Office' | translate }}</mat-label>
<mat-select [formControl]="officeId">
<mat-option *ngFor="let office of officeData" [value]="office.id">
{{ office.name }}
</mat-option>
@for (office of officeData; track office) {
<mat-option [value]="office.id">
{{ office.name }}
</mat-option>
}
</mat-select>
</mat-form-field>
</div>
@@ -21,8 +23,10 @@
<div [ngStyle]="{ display: hideOutput ? 'none' : 'block' }">
<canvas id="disbursement-pie" width="800" height="600"></canvas>
</div>
<div *ngIf="showFallback" class="fallback align-center-center">
<p>{{ 'labels.text.No Data' | translate }}</p>
</div>
@if (showFallback) {
<div class="fallback align-center-center">
<p>{{ 'labels.text.No Data' | translate }}</p>
</div>
}
</mat-card-content>
</mat-card>
@@ -1,5 +1,5 @@
/** Angular Imports */
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
@@ -10,7 +10,7 @@ import { HomeService } from '../../home.service';
import { Chart, registerables } from 'chart.js';
import { MatCard, MatCardHeader, MatCardContent } from '@angular/material/card';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { NgFor, NgStyle, NgIf } from '@angular/common';
import { NgStyle } from '@angular/common';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
// Register Chart.js components
@@ -31,6 +31,9 @@ Chart.register(...registerables);
]
})
export class AmountDisbursedPieComponent implements OnInit {
private homeService = inject(HomeService);
private route = inject(ActivatedRoute);
/** Static Form control for office Id */
officeId = new UntypedFormControl();
/** Office Data */
@@ -47,10 +50,7 @@ export class AmountDisbursedPieComponent implements OnInit {
* @param {HomeService} homeService Home Service.
* @param {ActivatedRoute} route Activated Route.
*/
constructor(
private homeService: HomeService,
private route: ActivatedRoute
) {
constructor() {
this.route.data.subscribe((data: { offices: any }) => {
this.officeData = data.offices;
});
@@ -7,9 +7,11 @@
<mat-form-field id="office" class="flex-94">
<mat-label>{{ 'labels.inputs.Office' | translate }}</mat-label>
<mat-select [formControl]="officeId">
<mat-option *ngFor="let office of officeData" [value]="office.id">
{{ office.name }}
</mat-option>
@for (office of officeData; track office) {
<mat-option [value]="office.id">
{{ office.name }}
</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';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
@@ -15,7 +15,7 @@ import { Dates } from 'app/core/utils/dates';
import { Chart, registerables } from 'chart.js';
import { MatCard, MatCardHeader, MatCardContent } from '@angular/material/card';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { NgFor, NgStyle } from '@angular/common';
import { NgStyle } from '@angular/common';
import { MatButtonToggleGroup, MatButtonToggle } from '@angular/material/button-toggle';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -39,6 +39,10 @@ Chart.register(...registerables);
]
})
export class ClientTrendsBarComponent implements OnInit {
private homeService = inject(HomeService);
private route = inject(ActivatedRoute);
private dateUtils = inject(Dates);
/** Static Form control for office Id */
officeId = new UntypedFormControl();
/** Static Form control for time scale */
@@ -56,11 +60,7 @@ export class ClientTrendsBarComponent implements OnInit {
* @param {ActivatedRoute} route Activated Route
* @param {Dates} dateUtils Date Utils
*/
constructor(
private homeService: HomeService,
private route: ActivatedRoute,
private dateUtils: Dates
) {
constructor() {
this.route.data.subscribe((data: { offices: any }) => {
this.officeData = data.offices;
});
@@ -8,9 +8,11 @@
</mat-form-field>
<mat-autocomplete #activitySearch="matAutocomplete">
<mat-option *ngFor="let activity of filteredActivities | async" [routerLink]="activity.path">
<span>{{ activity.activity }}</span>
</mat-option>
@for (activity of filteredActivities | async; track activity) {
<mat-option [routerLink]="activity.path">
<span>{{ activity.activity }}</span>
</mat-option>
}
</mat-autocomplete>
</mat-card-content>
</div>
@@ -1,12 +1,12 @@
/** Angular Imports */
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, inject } from '@angular/core';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
import { Router, RouterLink } from '@angular/router';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { activities } from '../activities';
import { MatAutocompleteTrigger, MatAutocomplete, MatOption } from '@angular/material/autocomplete';
import { NgFor, AsyncPipe } from '@angular/common';
import { AsyncPipe } from '@angular/common';
import { ClientTrendsBarComponent } from './client-trends-bar/client-trends-bar.component';
import { AmountDisbursedPieComponent } from './amount-disbursed-pie/amount-disbursed-pie.component';
import { AmountCollectedPieComponent } from './amount-collected-pie/amount-collected-pie.component';
@@ -29,6 +29,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class DashboardComponent implements OnInit {
private router = inject(Router);
/** Array of all user activities */
userActivity: string[];
/** Array of most recent user activities */
@@ -45,7 +47,7 @@ export class DashboardComponent implements OnInit {
/**
* Gets user activities from local storage.
*/
constructor(private router: Router) {
constructor() {
this.userActivity = JSON.parse(localStorage.getItem('mifosXLocation'));
}
-1
View File
@@ -34,7 +34,6 @@ const routes: Routes = [
}
}
])
];
/**
+23 -19
View File
@@ -22,9 +22,11 @@
</div>
<mat-autocomplete #activitySearch="matAutocomplete">
<mat-option *ngFor="let activity of filteredActivities | async" [routerLink]="activity.path">
<span>{{ activity.activity }}</span>
</mat-option>
@for (activity of filteredActivities | async; track activity) {
<mat-option [routerLink]="activity.path">
<span>{{ activity.activity }}</span>
</mat-option>
}
</mat-autocomplete>
</mat-card-content>
@@ -37,22 +39,24 @@
<button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
{{ 'labels.buttons.Close' | translate }}
</button>
<button
*ngIf="prev"
mat-raised-button
color="primary"
(click)="popover.close(); showPopover(prev.template, prev.target, 'bottom', true)"
>
{{ 'labels.buttons.Back' | translate }}
</button>
<button
*ngIf="next"
mat-raised-button
color="primary"
(click)="popover.close(); showPopover(next.template, next.target, 'bottom', true)"
>
{{ 'labels.buttons.Next' | translate }}
</button>
@if (prev) {
<button
mat-raised-button
color="primary"
(click)="popover.close(); showPopover(prev.template, prev.target, 'bottom', true)"
>
{{ 'labels.buttons.Back' | translate }}
</button>
}
@if (next) {
<button
mat-raised-button
color="primary"
(click)="popover.close(); showPopover(next.template, next.target, 'bottom', true)"
>
{{ 'labels.buttons.Next' | translate }}
</button>
}
</div>
</ng-template>
+9 -19
View File
@@ -1,5 +1,5 @@
/** Angular Imports */
import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
import { ActivatedRoute, Router, NavigationEnd, RouterLink } from '@angular/router';
import { UntypedFormControl, ReactiveFormsModule } from '@angular/forms';
import { MatDialog } from '@angular/material/dialog';
@@ -22,7 +22,7 @@ import { NextStepDialogComponent } from '../configuration-wizard/next-step-dialo
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
import { MatCard, MatCardHeader, MatCardTitle, MatCardContent, MatCardImage } from '@angular/material/card';
import { MatAutocompleteTrigger, MatAutocomplete, MatOption } from '@angular/material/autocomplete';
import { NgFor, NgIf, AsyncPipe } from '@angular/common';
import { AsyncPipe } from '@angular/common';
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
/**
@@ -44,6 +44,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class HomeComponent implements OnInit, AfterViewInit {
private authenticationService = inject(AuthenticationService);
private activatedRoute = inject(ActivatedRoute);
private router = inject(Router);
private dialog = inject(MatDialog);
private configurationWizardService = inject(ConfigurationWizardService);
private popoverService = inject(PopoverService);
/** Username of authenticated user. */
username: string;
/** Activity Form. */
@@ -64,23 +71,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
/* Template for popover on search activity */
@ViewChild('templateSearchActivity', { static: false }) templateSearchActivity: TemplateRef<any>;
/**
* @param {AuthenticationService} authenticationService Authentication Service.
* @param {ActivatedRoute} activatedRoute ActivatedRoute.
* @param {Router} router Router.
* @param {MatDialog} dialog MatDialog.
* @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
* @param {PopoverService} popoverService PopoverService.
*/
constructor(
private authenticationService: AuthenticationService,
private activatedRoute: ActivatedRoute,
private router: Router,
private dialog: MatDialog,
private configurationWizardService: ConfigurationWizardService,
private popoverService: PopoverService
) {}
/**
* Sets the username of the authenticated user.
* Set Form.
+2 -5
View File
@@ -1,5 +1,5 @@
/** Angular Imports */
import { Injectable } from '@angular/core';
import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
/** rxjs Imports */
@@ -12,10 +12,7 @@ import { Observable } from 'rxjs';
providedIn: 'root'
})
export class HomeService {
/**
* @param {HttpClient} http Http Client to send requests.
*/
constructor(private http: HttpClient) {}
private http = inject(HttpClient);
/**
* @param {number} officeId Office Id.
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, inject } from '@angular/core';
import {
MatDialogRef,
MatDialogTitle,
@@ -23,5 +23,5 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class SessionTimeoutDialogComponent {
constructor(public dialogRef: MatDialogRef<SessionTimeoutDialogComponent>) {}
dialogRef = inject<MatDialogRef<SessionTimeoutDialogComponent>>(MatDialogRef);
}
@@ -1,4 +1,4 @@
import { Component } from '@angular/core';
import { Component, inject } from '@angular/core';
import {
MatDialogRef,
MatDialogTitle,
@@ -24,11 +24,13 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class WarningDialogComponent {
dialogRef = inject<MatDialogRef<WarningDialogComponent>>(MatDialogRef);
title: string;
content: string;
buttonText: string;
constructor(public dialogRef: MatDialogRef<WarningDialogComponent>) {
constructor() {
this.title = environment.warningDialog.title;
this.content = environment.warningDialog.content;
this.buttonText = environment.warningDialog.buttonText;