fix api endpoints over env

PRODYNA · Apr 6, 2022 · 615b358 · 615b358
1 parent d527064
commit 615b358
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/deployment-sample/mifune-local/docker-compose.yaml b/deployment-sample/mifune-local/docker-compose.yaml
@@ -18,6 +18,6 @@ services:
       - "../../server/server/src/test/resources/samples/bom/:/model/:z"
     environment:
       QUARKUS_PROFILE: "local"
-      MIFUNE_ROOT_PATH_API: "http://localhost:8080/api/"
-      MIFUNE_ROOT_PATH_UI: "http://localhost:8080/ui/"
+      MIFUNE_ROOT_PATH_API: "http://localhost:8080"
+      MIFUNE_ROOT_PATH_UI: "http://localhost:8080"
       QUARKUS_NEO4J_URI: "bolt://neo4j:7687"
diff --git a/ui/src/env/Environments.ts b/ui/src/env/Environments.ts
@@ -1,4 +1,5 @@
 export enum ENV {
   API_SERVER = 'API_SERVER',
-  BASE_PATH = 'BASE_PATH',
+  ROOT_URL = 'ROOT_URL',
+  LOGIN_REQUIRED = 'LOGIN_REQUIRED',
 }
diff --git a/ui/src/helpers/EventSourceHelper.ts b/ui/src/helpers/EventSourceHelper.ts
@@ -14,7 +14,7 @@ const header = (): Record<string, unknown> => {
 
 export const cleanDatabase = (): EventSourcePolyfill => {
   return new EventSourcePolyfill(
-    `${localStorage.getItem(ENV.API_SERVER)}apocalypse`,
+    `${localStorage.getItem(ENV.API_SERVER)}/api/apocalypse`,
     {
       headers: header(),
       heartbeatTimeout: 2000,
@@ -24,7 +24,7 @@ export const cleanDatabase = (): EventSourcePolyfill => {
 
 export const importSource = (): EventSourcePolyfill => {
   return new EventSourcePolyfill(
-    `${localStorage.getItem(ENV.API_SERVER)}graph/domain/fn/statistics`,
+    `${localStorage.getItem(ENV.API_SERVER)}/api/graph/domain/fn/statistics`,
     {
       headers: header(),
       heartbeatTimeout: 15000,
@@ -34,7 +34,7 @@ export const importSource = (): EventSourcePolyfill => {
 
 export const graphStats = (): EventSourcePolyfill => {
   return new EventSourcePolyfill(
-    `${localStorage.getItem(ENV.API_SERVER)}graph/stats`,
+    `${localStorage.getItem(ENV.API_SERVER)}/api/graph/stats`,
     {
       headers: header(),
       heartbeatTimeout: 2000,

diff --git a/ui/src/openapi/axios-config.ts b/ui/src/openapi/axios-config.ts
@@ -3,7 +3,7 @@ import { ENV } from '../env/Environments'
 import { Configuration } from '../services'
 
 const AXIOS_CONFIG = (): Configuration => {
-  const basePath = 'http://localhost:8080'
+  const basePath = localStorage.getItem(ENV.API_SERVER) ?? undefined
   const apiKey = undefined
   const username = undefined
   const password = undefined