From c97c326fc36a9690b7728bc4847a8cd2c4ef4c02 Mon Sep 17 00:00:00 2001
From: Matti Lupari <matti.lupari@gmail.com>
Date: Wed, 14 Aug 2024 11:43:47 +0300
Subject: [PATCH] CSCEXAM-000 Experminent with Vite build engine

---
 angular.json                    |  9 ++++-----
 app/system/AuditLogFilter.scala |  2 +-
 ui/src/proxy.conf.js            | 27 ++++++++++++++-------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/angular.json b/angular.json
index 07abc48e9..a467ea561 100644
--- a/angular.json
+++ b/angular.json
@@ -18,12 +18,12 @@
       "prefix": "xm",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:browser-esbuild",
           "options": {
             "outputPath": "dist/exam",
             "index": "ui/src/index.html",
             "main": "ui/src/main.ts",
-            "polyfills": "ui/src/polyfills.ts",
+            "polyfills": ["@angular/localize/init", "ui/src/polyfills.ts"],
             "tsConfig": "ui/tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": ["ui/src/favicon.ico", "ui/src/assets"],
@@ -60,7 +60,6 @@
             "development": {
               "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
               "sourceMap": true,
               "namedChunks": true
@@ -71,8 +70,8 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "proxyConfig": "ui/src/proxy.conf.js",
-            "buildTarget": "exam:build"
+            "buildTarget": "exam:build",
+            "proxyConfig": "ui/src/proxy.conf.js"
           },
           "configurations": {
             "production": {
diff --git a/app/system/AuditLogFilter.scala b/app/system/AuditLogFilter.scala
index acd464be9..e4d705fe3 100644
--- a/app/system/AuditLogFilter.scala
+++ b/app/system/AuditLogFilter.scala
@@ -17,7 +17,7 @@ class AuditLogFilter @Inject() (implicit val mat: Materializer, ec: ExecutionCon
   override def apply(next: RequestHeader => Future[Result])(rh: RequestHeader): Future[Result] =
     val (method, session, uri) = (rh.method, rh.session, rh.uri)
     // No point in logging asset requests. Also requests with bodies are handled down the line
-    if !uri.startsWith("/assets") && !rh.hasBody then
+    if Seq("app/", "integration/").exists(uri.tail.startsWith) && !rh.hasBody then
       val userString =
         if session.isEmpty || session.get("id").isEmpty then "user <NULL>"
         else
diff --git a/ui/src/proxy.conf.js b/ui/src/proxy.conf.js
index 22f867684..b34856370 100644
--- a/ui/src/proxy.conf.js
+++ b/ui/src/proxy.conf.js
@@ -3,16 +3,17 @@
 // SPDX-License-Identifier: EUPL-1.2
 
 const PROXY_CONFIG = {
-    "**": {
-      "target": "http://localhost:9000",
-      "secure": false,
-      "bypass": (req) => {
-        if (req.headers.accept && req.headers.accept.indexOf("html") !== -1) {
-          console.log("Skipping proxy for browser request.");
-          return "/index.html";
-        }
-      }
-    }
-  };
-  
-  module.exports = PROXY_CONFIG;
\ No newline at end of file
+    '/app/**': {
+        target: 'http://localhost:9000',
+        secure: false,
+        logLevel: 'debug',
+        bypass: (req) => {
+            if (req.headers.accept && req.headers.accept.indexOf('html') !== -1) {
+                console.log('Skipping proxy for browser request.');
+                return '/index.html';
+            }
+        },
+    },
+};
+
+module.exports = PROXY_CONFIG;