From 48ffb76a4d39c3d496001fa70fc50e17e50b99f3 Mon Sep 17 00:00:00 2001 From: Arkadii Chumachenko Date: Fri, 16 Feb 2024 12:28:14 +0000 Subject: [PATCH 1/2] PLTF-1110: explicit static path --- .../provectus/kafka/ui/controller/StaticController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java index 72138c8010c..7ea474a8b17 100644 --- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java +++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/controller/StaticController.java @@ -23,6 +23,9 @@ public class StaticController { @Value("classpath:static/manifest.json") private Resource manifestFile; + @Value("#{environment.STATIC_PATH}") + private String staticPath; + private final AtomicReference renderedIndexFile = new AtomicReference<>(); private final AtomicReference renderedManifestFile = new AtomicReference<>(); @@ -39,7 +42,11 @@ public Mono> getManifest(ServerWebExchange exchange) { public String getRenderedFile(ServerWebExchange exchange, AtomicReference renderedFile, Resource file) { String rendered = renderedFile.get(); if (rendered == null) { - rendered = buildFile(file, exchange.getRequest().getPath().contextPath().value()); + String contextPath = staticPath; + if (contextPath == null) { + contextPath = exchange.getRequest().getPath().contextPath().value(); + } + rendered = buildFile(file, contextPath); if (renderedFile.compareAndSet(null, rendered)) { return rendered; } else { From e33924b4526d4243a32188c72dabc5c59610a8fc Mon Sep 17 00:00:00 2001 From: Arkadii Chumachenko Date: Fri, 16 Feb 2024 12:30:13 +0000 Subject: [PATCH 2/2] PLTF-1110: rm codeowners --- .github/CODEOWNERS | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index cd94e7a297b..00000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,18 +0,0 @@ -* @Haarolean - - -# BACKEND -/pom.xml @provectus/kafka-backend - -/kafka-ui-contract/ @provectus/kafka-backend - -/kafka-ui-api/ @provectus/kafka-backend - -# FRONTEND -/kafka-ui-react-app/ @provectus/kafka-frontend - -# TESTS -/kafka-ui-e2e-checks/ @provectus/kafka-qa - -# INFRA -/.github/workflows/ @provectus/kafka-devops