Browse Source

Merge branch 'master' of https://git.swopt.com/swopt/fisapp-ui into swopt-eLeave

tigger 4 tháng trước cách đây
mục cha
commit
0d1da14503

+ 3 - 2
README.md

@@ -1,7 +1,8 @@
-# New FISApp UI (since 2024)
+# New FISApp UI
 Code repository for FISApp UI project.    
 Demo Site: [Financial Information System](https://fist.swopt.com)    
-**requires NodeJS version ^18.19.1 || ^20.11.1 || >=22.0.0**
+Current Angular Version: ^21.1.2    
+**requires NodeJS version ^20.19.0 || ^22.12.0 || ^24.0.0   
 
 ## Getting Started
 After cloning this project, checkout your project to the `dev` branch by running `git checkout origin/dev`.        

+ 19 - 18
package.json

@@ -1,6 +1,6 @@
 {
   "name": "fisapp-ui",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --port 4200",
@@ -16,35 +16,36 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^20.1.3",
-    "@angular/cdk": "^20.1.3",
-    "@angular/common": "^20.1.3",
-    "@angular/compiler": "^20.1.3",
-    "@angular/core": "^20.1.3",
-    "@angular/forms": "^20.1.3",
-    "@angular/material": "^20.1.3",
-    "@angular/material-moment-adapter": "^20.1.3",
-    "@angular/platform-browser": "^20.1.3",
-    "@angular/platform-browser-dynamic": "^20.1.3",
-    "@angular/router": "^20.1.3",
-    "@angular/service-worker": "^20.1.3",
+    "@angular/animations": "^21.1.2",
+    "@angular/cdk": "^21.1.2",
+    "@angular/common": "^21.1.2",
+    "@angular/compiler": "^21.1.2",
+    "@angular/core": "^21.1.2",
+    "@angular/forms": "^21.1.2",
+    "@angular/material": "^21.1.2",
+    "@angular/material-moment-adapter": "^21.1.2",
+    "@angular/platform-browser": "^21.1.2",
+    "@angular/platform-browser-dynamic": "^21.1.2",
+    "@angular/router": "^21.1.2",
+    "@angular/service-worker": "^21.1.2",
     "@ngxs/devtools-plugin": "^20.1.0",
     "@ngxs/form-plugin": "^20.1.0",
     "@ngxs/storage-plugin": "^20.1.0",
     "@ngxs/store": "^20.1.0",
+    "@primeuix/themes": "^2.0.3",
     "angularlib": "file:src/dependencies/angularlib",
     "dp-ui": "file:src/dependencies/dp-ui",
     "fis": "file:src/dependencies/fis",
     "fis-commons": "https://cdn.swopt.com/npm/fis-commons",
-    "primeng": "^17.18.15",
+    "primeng": "^21.1.1",
     "rxjs": "~7.8.0",
     "tslib": "^2.8.1",
     "zone.js": "^0.15.1"
   },
   "devDependencies": {
-    "@angular/build": "^20.1.3",
-    "@angular/cli": "^20.1.3",
-    "@angular/compiler-cli": "^20.1.3",
+    "@angular/build": "^21.1.2",
+    "@angular/cli": "^21.1.2",
+    "@angular/compiler-cli": "^21.1.2",
     "@types/jasmine": "~5.1.0",
     "jasmine-core": "~5.1.0",
     "karma": "~6.4.0",
@@ -52,6 +53,6 @@
     "karma-coverage": "~2.2.0",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.8.3"
+    "typescript": "~5.9.3"
   }
 }

+ 1 - 1
src/app/app.component.ts

@@ -92,7 +92,7 @@ export class AppComponent extends BaseComponent implements OnInit {
   }
 
   @HostListener('window:mousedown')
-  private refreshTimeout() {
+  refreshTimeout() {
     this.stopTimeout$.next(null);
     this.startTimeout$.next(null);
   }

+ 3 - 0
src/assets/realease_notes.md

@@ -1,4 +1,7 @@
 # Financial Information System (FIS)
+### ver. 1.3.0
+Updated to Angular version 21.1.2    
+various debug and enhancements    
 
 ### ver. 1.2.0
 Updated to Angular version 20.1.3

+ 1 - 1
src/config/config.json

@@ -8,7 +8,7 @@
         }
     },
     "chat":{
-        "http":{"url":"https://n8n.swopt.com/webhook/236a2ba2-b147-4119-86a8-ee3a5ab30f4f"}
+        "http":{"url":"https://n8n.ai.swopt.com/webhook/236a2ba2-b147-4119-86a8-ee3a5ab30f4f"}
     },
     "holidayCalendar": "https://api.swopt.com/data/h0/my/sar",
     "sessionTimeoutDuration":1800000

+ 1 - 1
src/config/info.json

@@ -7,5 +7,5 @@
     "support":{
         "email":"support@softwareoptima.com"
     },
-    "version":"1.2.0"
+    "version":"1.3.0"
 }

+ 1 - 1
src/dependencies/angularlib

@@ -1 +1 @@
-Subproject commit 4971b24fe485cade5b72edf366b1939c9b68c090
+Subproject commit 93e290268e433caa82793dc1b2dfb0076d10c32d

+ 1 - 1
src/dependencies/fis

@@ -1 +1 @@
-Subproject commit 97675fa16bfbb36d78de5d01007622045e23e3c0
+Subproject commit bdb30bc41d6258e441c9c01432c8553fca7c4ae6

+ 2 - 1
src/main.ts

@@ -1,6 +1,7 @@
+import { provideZoneChangeDetection } from "@angular/core";
 import { bootstrapApplication } from '@angular/platform-browser';
 import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';
 
-bootstrapApplication(AppComponent, appConfig)
+bootstrapApplication(AppComponent, {...appConfig, providers: [provideZoneChangeDetection(), ...appConfig.providers]})
   .catch((err) => console.error(err));

+ 1 - 5
tsconfig.json

@@ -19,16 +19,12 @@
     "sourceMap": true,
     "declaration": false,
     "experimentalDecorators": true,
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "importHelpers": true,
     "target": "ES2022",
     "module": "ES2022",
     "useDefineForClassFields": false,
     "resolveJsonModule": true,
-    "lib": [
-      "ES2022",
-      "dom"
-    ],
     "baseUrl": "./",
     "paths": {
       "fis-commons/*": [