Parcourir la source

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

tigger il y a 3 mois
Parent
commit
3b18e243aa
5 fichiers modifiés avec 30 ajouts et 18 suppressions
  1. 15 15
      package.json
  2. 11 0
      src/app/app.component.ts
  3. 2 1
      src/config/config.json
  4. 1 1
      src/dependencies/angularlib
  5. 1 1
      src/dependencies/fis

+ 15 - 15
package.json

@@ -16,18 +16,18 @@
   },
   "private": true,
   "dependencies": {
-    "@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",
+    "@angular/animations": "^21.1.4",
+    "@angular/cdk": "^21.1.4",
+    "@angular/common": "^21.1.4",
+    "@angular/compiler": "^21.1.4",
+    "@angular/core": "^21.1.4",
+    "@angular/forms": "^21.1.4",
+    "@angular/material": "^21.1.4",
+    "@angular/material-moment-adapter": "^21.1.4",
+    "@angular/platform-browser": "^21.1.4",
+    "@angular/platform-browser-dynamic": "^21.1.4",
+    "@angular/router": "^21.1.4",
+    "@angular/service-worker": "^21.1.4",
     "@ngxs/devtools-plugin": "^20.1.0",
     "@ngxs/form-plugin": "^20.1.0",
     "@ngxs/storage-plugin": "^20.1.0",
@@ -43,9 +43,9 @@
     "zone.js": "^0.15.1"
   },
   "devDependencies": {
-    "@angular/build": "^21.1.2",
-    "@angular/cli": "^21.1.2",
-    "@angular/compiler-cli": "^21.1.2",
+    "@angular/build": "^21.1.4",
+    "@angular/cli": "^21.1.4",
+    "@angular/compiler-cli": "^21.1.4",
     "@types/jasmine": "~5.1.0",
     "jasmine-core": "~5.1.0",
     "karma": "~6.4.0",

+ 11 - 0
src/app/app.component.ts

@@ -25,6 +25,7 @@ import { NotificationService } from 'angularlib/notification/notification.servic
 import { env } from 'angularlib/environments/environment';
 import { TranslatePipe } from 'angularlib/labels/translate.pipe';
 import { ChatComponent } from 'angularlib/chat/chat.component';
+import * as confing from '../config/config.json';
 
 @Component({
     selector: 'app-root',
@@ -98,6 +99,16 @@ export class AppComponent extends BaseComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    // check if site is under maintenance
+    if (config?.maintenance?.active) {
+      this.cs.dialog.showWarningDialog({
+        title: 'Site Under Maintenance',
+        content: `FIS is currently under maintenance.<br/>This maintenance is expected to continue until ${config?.maintenance?.endDatetime}.<br/>Sorry for any inconvenience caused.`,
+        disableClose: true,
+        hideCloseButton: true
+      });
+    }
+
     this.router.events.pipe(untilDestroy(this),
     filter((event) => event instanceof RoutesRecognized),
     map((res:any) => {

+ 2 - 1
src/config/config.json

@@ -11,5 +11,6 @@
         "http":{"url":"https://n8n.ai.swopt.com/webhook/236a2ba2-b147-4119-86a8-ee3a5ab30f4f"}
     },
     "holidayCalendar": "https://api.swopt.com/data/h0/my/sar",
-    "sessionTimeoutDuration":1800000
+    "sessionTimeoutDuration":1800000,
+    "maintenance": {"active":true, "endDatetime":"2026-02-18 (WED) 12:00:00 AM"}
 }

+ 1 - 1
src/dependencies/angularlib

@@ -1 +1 @@
-Subproject commit ce3f724add4bc41e53884bbb3d45ab80b672c206
+Subproject commit 51c9214e54960bec50c8e6d426ea70ba6913ba75

+ 1 - 1
src/dependencies/fis

@@ -1 +1 @@
-Subproject commit b525895bc6c6430b39727ca7b1c3bff8487ae2e5
+Subproject commit 0abedf25b54a93039710f05238cc1fa565040825