Merge branch 'main' into node/22

Author: yeikel

api/src/main/java/io/kafbat/ui/util/StaticFileWebFilter.java

@@ -1,6 +1,7 @@
 package io.kafbat.ui.util;
 
 import java.io.IOException;
+import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.buffer.DataBufferFactory;
@@ -15,6 +16,7 @@
 import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;
 
+@Slf4j
 public class StaticFileWebFilter implements WebFilter {
 
   private static final String INDEX_HTML = "/static/index.html";
@@ -29,6 +31,12 @@ public StaticFileWebFilter() {
   public StaticFileWebFilter(String path, ClassPathResource resource) {
     this.matcher = ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, path);
 
+    if (!resource.exists()) {
+      log.warn("Resource [{}] does not exist. Frontend might not be available.", resource.getPath());
+      contents = "Missing index.html. Make sure the app has been built with a correct (prod) profile.";
+      return;
+    }
+
     try {
       this.contents = ResourceUtil.readAsString(resource);
     } catch (IOException e) {

api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java

@@ -37,10 +37,7 @@ public abstract class AbstractIntegrationTest {
   public static final String LOCAL = "local";
   public static final String SECOND_LOCAL = "secondLocal";
 
-  private static final boolean IS_ARM =
-      System.getProperty("os.arch").contains("arm") || System.getProperty("os.arch").contains("aarch64");
-
-  private static final String CONFLUENT_PLATFORM_VERSION = IS_ARM ? "7.8.0.arm64" : "7.8.0";
+  private static final String CONFLUENT_PLATFORM_VERSION = "7.8.0";
 
   public static final KafkaContainer kafka = new KafkaContainer(
       DockerImageName.parse("confluentinc/cp-kafka").withTag(CONFLUENT_PLATFORM_VERSION))

frontend/package.json

@@ -104,7 +104,7 @@
   },
   "engines": {
     "node": "^22.12.0",
-    "pnpm": "9.15.0"
+    "pnpm": "^9.15.0"
   },
   "pnpm": {
     "overrides": {

pom.xml

@@ -55,7 +55,7 @@
         <junit.version>5.11.2</junit.version>
         <mockito.version>5.14.2</mockito.version>
         <okhttp3.mockwebserver.version>4.12.0</okhttp3.mockwebserver.version>
-        <testcontainers.version>1.20.2</testcontainers.version>
+        <testcontainers.version>1.20.4</testcontainers.version>
 
         <!-- Frontend dependency versions -->
         <node.version>v22.12.0</node.version>