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
@@ -2,12 +2,11 @@
<mat-form-field class="flex-48">
<mat-label>{{ 'labels.inputs.Charge' | translate }}</mat-label>
<mat-select #charge>
<mat-option
*ngFor="let charge of chargeData | chargesFilter: chargesDataSource : currencyCode.value"
[value]="charge"
>
{{ charge.name }}
</mat-option>
@for (charge of chargeData | chargesFilter: chargesDataSource : currencyCode.value; track charge) {
<mat-option [value]="charge">
{{ charge.name }}
</mat-option>
}
</mat-select>
</mat-form-field>
@@ -1,5 +1,5 @@
/** Angular Imports */
import { Component, OnInit, OnChanges, Input } from '@angular/core';
import { Component, OnInit, OnChanges, Input, inject } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { UntypedFormControl } from '@angular/forms';
@@ -56,6 +56,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class SharesAccountChargesStepComponent implements OnInit, OnChanges {
private dialog = inject(MatDialog);
private translateService = inject(TranslateService);
/** Shares Account Product Template */
@Input() sharesAccountProductTemplate: any;
/** Shares Account Template */
@@ -80,14 +83,6 @@ export class SharesAccountChargesStepComponent implements OnInit, OnChanges {
'action'
];
/**
* @param {MatDialog} dialog Mat Dialog
*/
constructor(
private dialog: MatDialog,
private translateService: TranslateService
) {}
ngOnInit() {
this.currencyCode.valueChanges.subscribe(() => {
if (!this.isChargesPatched && this.sharesAccountTemplate.charges) {
@@ -129,7 +124,6 @@ export class SharesAccountChargesStepComponent implements OnInit, OnChanges {
type: 'number',
required: false
})
];
const data = {
title: this.translateService.instant('labels.heading.Edit Charge'),
@@ -3,9 +3,11 @@
<mat-form-field class="flex-48">
<mat-label>{{ 'labels.inputs.Product Name' | translate }}</mat-label>
<mat-select formControlName="productId" required>
<mat-option *ngFor="let product of productData" [value]="product.id">
{{ product.name }}
</mat-option>
@for (product of productData; track product) {
<mat-option [value]="product.id">
{{ product.name }}
</mat-option>
}
</mat-select>
<mat-error>
{{ 'labels.inputs.Product Name' | translate }} {{ 'labels.commons.is' | translate }}
@@ -1,5 +1,5 @@
/** Angular Imports */
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { Component, OnInit, Input, Output, EventEmitter, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { SettingsService } from 'app/settings/settings.service';
@@ -24,6 +24,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class SharesAccountDetailsStepComponent implements OnInit {
private formBuilder = inject(UntypedFormBuilder);
private sharesService = inject(SharesService);
private settingsService = inject(SettingsService);
/** Shares Account Template */
@Input() sharesAccountTemplate: any;
@@ -45,11 +49,7 @@ export class SharesAccountDetailsStepComponent implements OnInit {
* @param {SharesService} sharesService Shares Service.
* @param {SettingsService} settingsService Settings Service
*/
constructor(
private formBuilder: UntypedFormBuilder,
private sharesService: SharesService,
private settingsService: SettingsService
) {
constructor() {
this.createSharesAccountDetailsForm();
}
@@ -16,12 +16,16 @@
<div class="flex-fill">
<span class="flex-40">{{ 'labels.inputs.External Id' | translate }}</span>
<span class="flex-60" *ngIf="sharesAccount.externalId">
<mifosx-external-identifier externalId="{{ sharesAccount.externalId }}"></mifosx-external-identifier>
</span>
<span class="flex-60" *ngIf="!sharesAccount.externalId">
{{ 'labels.inputs.Unassigned' | translate }}
</span>
@if (sharesAccount.externalId) {
<span class="flex-60">
<mifosx-external-identifier externalId="{{ sharesAccount.externalId }}"></mifosx-external-identifier>
</span>
}
@if (!sharesAccount.externalId) {
<span class="flex-60">
{{ 'labels.inputs.Unassigned' | translate }}
</span>
}
</div>
<h3 class="mat-h3 flex-fill">{{ 'labels.heading.Terms' | translate }}</h3>
@@ -59,27 +63,31 @@
}}</span>
</div>
<div class="flex-fill" *ngIf="sharesAccount.minimumActivePeriod">
<span class="flex-40">{{ 'labels.inputs.Minimum Active Period' | translate }}</span>
<span class="flex-60"
>{{ sharesAccount.minimumActivePeriod }}&nbsp;{{
sharesAccount.minimumActivePeriodFrequencyType
| find: sharesAccountProductTemplate.minimumActivePeriodFrequencyTypeOptions : 'id' : 'value'
| translateKey: 'catalogs'
}}</span
>
</div>
@if (sharesAccount.minimumActivePeriod) {
<div class="flex-fill">
<span class="flex-40">{{ 'labels.inputs.Minimum Active Period' | translate }}</span>
<span class="flex-60"
>{{ sharesAccount.minimumActivePeriod }}&nbsp;{{
sharesAccount.minimumActivePeriodFrequencyType
| find: sharesAccountProductTemplate.minimumActivePeriodFrequencyTypeOptions : 'id' : 'value'
| translateKey: 'catalogs'
}}</span
>
</div>
}
<div class="flex-fill" *ngIf="sharesAccount.lockinPeriodFrequency">
<span class="flex-40">{{ 'labels.inputs.Lock-in Period' | translate }}</span>
<span class="flex-60"
>{{ sharesAccount.lockinPeriodFrequency }}&nbsp;{{
sharesAccount.lockinPeriodFrequencyType
| find: sharesAccountProductTemplate.lockinPeriodFrequencyTypeOptions : 'id' : 'value'
| translateKey: 'catalogs'
}}</span
>
</div>
@if (sharesAccount.lockinPeriodFrequency) {
<div class="flex-fill">
<span class="flex-40">{{ 'labels.inputs.Lock-in Period' | translate }}</span>
<span class="flex-60"
>{{ sharesAccount.lockinPeriodFrequency }}&nbsp;{{
sharesAccount.lockinPeriodFrequencyType
| find: sharesAccountProductTemplate.lockinPeriodFrequencyTypeOptions : 'id' : 'value'
| translateKey: 'catalogs'
}}</span
>
</div>
}
<div class="flex-fill">
<span class="flex-40">{{ 'labels.inputs.Application Date' | translate }}</span>
@@ -91,43 +99,40 @@
<span class="flex-60">{{ sharesAccount.allowDividendCalculationForInactiveClients | yesNo }}</span>
</div>
<div *ngIf="sharesAccount.charges.length" class="layout-row-wrap responsive-column flex-fill">
<h3 class="mat-h3 flex-fill">{{ 'labels.heading.Charges' | translate }}</h3>
<mat-divider class="flex-fill"></mat-divider>
<table class="flex-fill mat-elevation-z1" mat-table [dataSource]="sharesAccount.charges">
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.name' | translate }}</th>
<td mat-cell *matCellDef="let charge">
{{ charge.name + ', ' + charge.currency.displaySymbol }}
</td>
</ng-container>
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Type' | translate }}</th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateKey: 'catalogs' }}
</td>
</ng-container>
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Amount' | translate }}</th>
<td mat-cell *matCellDef="let charge">
{{ charge.amount || charge.amountOrPercentage }}
</td>
</ng-container>
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Collected On' | translate }}</th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateKey: 'catalogs' }}
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="chargesDisplayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: chargesDisplayedColumns"></tr>
</table>
</div>
@if (sharesAccount.charges.length) {
<div class="layout-row-wrap responsive-column flex-fill">
<h3 class="mat-h3 flex-fill">{{ 'labels.heading.Charges' | translate }}</h3>
<mat-divider class="flex-fill"></mat-divider>
<table class="flex-fill mat-elevation-z1" mat-table [dataSource]="sharesAccount.charges">
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.name' | translate }}</th>
<td mat-cell *matCellDef="let charge">
{{ charge.name + ', ' + charge.currency.displaySymbol }}
</td>
</ng-container>
<ng-container matColumnDef="chargeCalculationType">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Type' | translate }}</th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeCalculationType.value | translateKey: 'catalogs' }}
</td>
</ng-container>
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Amount' | translate }}</th>
<td mat-cell *matCellDef="let charge">
{{ charge.amount || charge.amountOrPercentage }}
</td>
</ng-container>
<ng-container matColumnDef="chargeTimeType">
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Collected On' | translate }}</th>
<td mat-cell *matCellDef="let charge">
{{ charge.chargeTimeType.value | translateKey: 'catalogs' }}
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="chargesDisplayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: chargesDisplayedColumns"></tr>
</table>
</div>
}
</div>
<div class="layout-row responsive-column align-center gap-2px margin-t">
@@ -18,16 +18,16 @@
<strong>{{ 'labels.commons.required' | translate }}</strong>
</mat-error>
</mat-form-field>
<span class="flex-48" *ngIf="currency">{{
calculateCurrenValue() | currency: currency.code : 'symbol-narrow' : '1.2-2'
}}</span>
@if (currency) {
<span class="flex-48">{{ calculateCurrenValue() | currency: currency.code : 'symbol-narrow' : '1.2-2' }}</span>
}
<mat-form-field class="flex-48">
<mat-label>{{ 'labels.inputs.Default Savings Account' | translate }}</mat-label>
<mat-select formControlName="savingsAccountId" required>
<mat-option *ngFor="let account of savingsAccountsData" [value]="account.id">
{{ account.accountNo }} - {{ account.savingsProductName }}
</mat-option>
@for (account of savingsAccountsData; track account) {
<mat-option [value]="account.id"> {{ account.accountNo }} - {{ account.savingsProductName }} </mat-option>
}
</mat-select>
<mat-error>
{{ 'labels.inputs.Default Savings Account' | translate }} {{ 'labels.commons.is' | translate }}
@@ -67,12 +67,14 @@
<mat-form-field class="flex-48">
<mat-label>{{ 'labels.inputs.Type' | translate }}</mat-label>
<mat-select formControlName="minimumActivePeriodFrequencyType">
<mat-option
*ngFor="let minimumActivePeriodFrequencyType of minimumActivePeriodFrequencyTypeData"
[value]="minimumActivePeriodFrequencyType.id"
>
{{ minimumActivePeriodFrequencyType.value | translateKey: 'catalogs' }}
</mat-option>
@for (
minimumActivePeriodFrequencyType of minimumActivePeriodFrequencyTypeData;
track minimumActivePeriodFrequencyType
) {
<mat-option [value]="minimumActivePeriodFrequencyType.id">
{{ minimumActivePeriodFrequencyType.value | translateKey: 'catalogs' }}
</mat-option>
}
</mat-select>
</mat-form-field>
@@ -86,12 +88,11 @@
<mat-form-field class="flex-48">
<mat-label>{{ 'labels.inputs.Type' | translate }}</mat-label>
<mat-select formControlName="lockinPeriodFrequencyType">
<mat-option
*ngFor="let lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData"
[value]="lockinPeriodFrequencyType.id"
>
{{ lockinPeriodFrequencyType.value | translateKey: 'catalogs' }}
</mat-option>
@for (lockinPeriodFrequencyType of lockinPeriodFrequencyTypeData; track lockinPeriodFrequencyType) {
<mat-option [value]="lockinPeriodFrequencyType.id">
{{ lockinPeriodFrequencyType.value | translateKey: 'catalogs' }}
</mat-option>
}
</mat-select>
</mat-form-field>
</div>
@@ -1,9 +1,9 @@
/** Angular Imports */
import { Component, OnChanges, OnInit, Input } from '@angular/core';
import { Component, OnChanges, OnInit, Input, inject } from '@angular/core';
import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
import { SettingsService } from 'app/settings/settings.service';
import { Currency } from 'app/shared/models/general.model';
import { NgIf, NgFor, CurrencyPipe } from '@angular/common';
import { CurrencyPipe } from '@angular/common';
import { MatCheckbox } from '@angular/material/checkbox';
import { MatStepperPrevious, MatStepperNext } from '@angular/material/stepper';
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
@@ -26,6 +26,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class SharesAccountTermsStepComponent implements OnChanges, OnInit {
private formBuilder = inject(UntypedFormBuilder);
private settingsService = inject(SettingsService);
/** Shares Account and Product Template */
@Input() sharesAccountProductTemplate: any;
/** [Optional] Shares Account Template */
@@ -52,10 +55,7 @@ export class SharesAccountTermsStepComponent implements OnChanges, OnInit {
* @param {FormBuilder} formBuilder Form Builder
* @param {SettingsService} settingsService Settings Service
*/
constructor(
private formBuilder: UntypedFormBuilder,
private settingsService: SettingsService
) {
constructor() {
this.createSharesAccountTermsForm();
}