CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Upgrading to Angular 20:

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/notifications-tray/notifications-tray.component.html
+20 -23
View File
@@ -13,29 +13,26 @@
</button>
<mat-menu class="mifosx-notifications-menu" #notificationsMenu="matMenu" [overlapTrigger]="false">
<div *ngIf="unreadNotifications.length === 0" class="layout-column align-center-center no-notifications">
<mat-icon class="no-notifications-icon">
<span class="material-icons">{{ 'labels.menus.Notifications' | translate }}</span>
</mat-icon>
<p>{{ 'labels.text.No notifications' | translate }}</p>
</div>
@if (unreadNotifications.length === 0) {
<div class="layout-column align-center-center no-notifications">
<mat-icon class="no-notifications-icon">
<span class="material-icons">{{ 'labels.menus.Notifications' | translate }}</span>
</mat-icon>
<p>{{ 'labels.text.No notifications' | translate }}</p>
</div>
}
<button
mat-menu-item
class="unread"
*ngFor="let notification of unreadNotifications"
[routerLink]="[routeMap[notification.objectType], notification.objectId]"
>
{{ notification.content }}*<br />
<span class="time">[{{ notification.createdAt }}]</span>
</button>
@for (notification of unreadNotifications; track notification) {
<button mat-menu-item class="unread" [routerLink]="[routeMap[notification.objectType], notification.objectId]">
{{ notification.content }}*<br />
<span class="time">[{{ notification.createdAt }}]</span>
</button>
}
<button
mat-menu-item
*ngFor="let notification of displayedReadNotifications"
[routerLink]="[routeMap[notification.objectType], notification.objectId]"
>
{{ notification.content }}<br />
<span class="time">[{{ notification.createdAt }}]</span>
</button>
@for (notification of displayedReadNotifications; track notification) {
<button mat-menu-item [routerLink]="[routeMap[notification.objectType], notification.objectId]">
{{ notification.content }}<br />
<span class="time">[{{ notification.createdAt }}]</span>
</button>
}
</mat-menu>
src/app/shared/notifications-tray/notifications-tray.component.ts
+6 -3
View File
@@ -1,5 +1,5 @@
/** Angular Imports */
import { Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
import { Component, OnInit, OnDestroy, ViewEncapsulation, inject } from '@angular/core';
/** RxJS Imports */
import { forkJoin } from 'rxjs';
@@ -36,6 +36,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
]
})
export class NotificationsTrayComponent implements OnInit, OnDestroy {
notificationsService = inject(NotificationsService);
/** Wait time between API status calls 60 seg */
waitTime = environment.waitTimeForNotifications || 60;
/** Read Notifications */
@@ -67,10 +69,11 @@ export class NotificationsTrayComponent implements OnInit, OnDestroy {
/**
* @param {NotificationsService} notificationsService Notifications Service
*/
constructor(public notificationsService: NotificationsService) {
constructor() {
forkJoin([
this.notificationsService.getNotifications(true, 9),
this.notificationsService.getNotifications(false, 9)]).subscribe((response: any[]) => {
this.notificationsService.getNotifications(false, 9)
]).subscribe((response: any[]) => {
this.readNotifications = response[0].pageItems;
this.unreadNotifications = response[1].pageItems;
this.setNotifications();