Inject the GUI version in the server

Fixes #346

.github/workflows/angular_build.yml

@@ -7,7 +7,6 @@ on:
       - main
     paths:
       - "matchbox-frontend/**"
-      - "pom.xml" # Since we use the Maven version, also trigger the workflow when the version changes
 
 jobs:
   build-angular-and-commit:
@@ -31,27 +30,6 @@ jobs:
           cache: npm
           cache-dependency-path: matchbox-frontend/package-lock.json
 
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        # https://github.com/actions/setup-java#usage
-        with:
-          java-version: 21
-          distribution: adopt
-
-      - name: Set up Maven
-        uses: stCarolas/setup-maven@v5
-        with:
-          maven-version: 3.9.9
-
-      - name: Update the GUI version from the Maven project version
-        shell: bash
-        run: |
-          cd ..
-          VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
-          echo "The Maven project version is ${VERSION}"
-          cd ./matchbox-frontend
-          npm --no-git-tag-version --allow-same-version=true version "$VERSION"
-
       - name: Install dependencies
         # Use dependencies from the lock file, no unattended updates
         run: npm ci

docs/changelog.md

@@ -1,3 +1,7 @@
+Unreleased
+
+- No more GUI version mismatch [#346](https://github.com/ahdis/matchbox/issues/346)
+
 2025/02/05 Release 3.9.12
 
 - Update org.hl7.fhir.core to 6.5.7 

matchbox-frontend/src/app/app.component.ts

@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
 import { FhirConfigService } from './fhirConfig.service';
 import { TranslateService } from '@ngx-translate/core';
-import packageJson from '../../package.json';
 import {HashUrlRedirectionService} from "./util/hash-url-redirection-service";
 
 @Component({
@@ -11,7 +10,7 @@ import {HashUrlRedirectionService} from "./util/hash-url-redirection-service";
     standalone: false
 })
 export class AppComponent {
-  public version: string = packageJson.version;
+  public version: string = (window as any).MATCHBOX_VERSION;
 
   constructor(readonly translateService: TranslateService,
               readonly fhirConfigService: FhirConfigService,

matchbox-frontend/src/app/home/home.component.ts

@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import packageJson from '../../../package.json';
 
 @Component({
     selector: 'app-home',
@@ -8,5 +7,5 @@ import packageJson from '../../../package.json';
     standalone: false
 })
 export class HomeComponent {
-  public version: string = packageJson.version;
+  public version: string = (window as any).MATCHBOX_VERSION;
 }

matchbox-frontend/src/app/settings/settings.component.ts

@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import packageJson from '../../../package.json';
 
 @Component({
     selector: 'app-settings',
@@ -8,5 +7,5 @@ import packageJson from '../../../package.json';
     standalone: false
 })
 export class SettingsComponent {
-  public version: string = packageJson.version;
+  public version: string = (window as any).MATCHBOX_VERSION;
 }

matchbox-frontend/src/index.html

@@ -4,8 +4,9 @@
     <meta charset="utf-8" />
     <title>matchbox</title>
     <script>
-      // The server will update this variable when it serves this file (see MatchboxStaticResourceConfig)
+      // The server will update these variables when it serves this file (see MatchboxStaticResourceConfig)
       window.MATCHBOX_BASE_PATH = "/";
+      window.MATCHBOX_VERSION = "served-by-ng";
     </script>
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />

matchbox-frontend/tsconfig.json

@@ -12,7 +12,6 @@
     "baseUrl": ".",
     "module": "ES2022",
     "esModuleInterop": true,
-    "resolveJsonModule": true,
     "paths": {
       "*": [
         "node_modules/*",

matchbox-server/src/main/java/ch/ahdis/matchbox/config/MatchboxStaticResourceConfig.java

@@ -1,9 +1,9 @@
 package ch.ahdis.matchbox.config;
 
+import ch.ahdis.matchbox.engine.cli.VersionUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@@ -97,8 +97,11 @@ public Resource transform(final HttpServletRequest request,
 				String content = classPathResource.getContentAsString(StandardCharsets.UTF_8);
 
 				// Replace the base path of the server
-				content = content.replace("MATCHBOX_BASE_PATH = \"/\"",
-												  "MATCHBOX_BASE_PATH = \"%s\"".formatted(this.parent.baseServerPath));
+				content = content
+					.replace("MATCHBOX_BASE_PATH = \"/\"",
+								"MATCHBOX_BASE_PATH = \"%s\"".formatted(this.parent.baseServerPath))
+					.replace("MATCHBOX_VERSION = \"served-by-ng\"",
+								"MATCHBOX_VERSION = \"%s\"".formatted(VersionUtil.getVersion()));
 
 				return new TransformedResource(resource,
 														 content.getBytes(StandardCharsets.UTF_8));