[Upd] Refactor parameter context -> basename

kbss-cvut · Mar 19, 2024 · b72c3d9 · b72c3d9
1 parent 4c490b4
commit b72c3d9
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.env.development.internal-auth b/.env.development.internal-auth
@@ -1,4 +1,4 @@
-FTA_FMEA_CONTEXT=''
+FTA_FMEA_BASENAME=''
 FTA_FMEA_API_URL=http://localhost:1235/fta-fmea/services/fta-fmea-server
 FTA_FMEA_ADMIN_REGISTRATION_ONLY=false
 FTA_FMEA_TITLE='Development FTA/FMEA Tool'
diff --git a/.env.development.noproxy b/.env.development.noproxy
@@ -1,4 +1,4 @@
-FTA_FMEA_CONTEXT=''
+FTA_FMEA_BASENAME=''
 FTA_FMEA_API_URL=http://localhost:9999
 FTA_FMEA_ADMIN_REGISTRATION_ONLY=false
 FTA_FMEA_TITLE='Development FTA/FMEA Tool'
diff --git a/.env.production b/.env.production
@@ -1,3 +1,3 @@
 FTA_FMEA_API_URL=https://kbss.felk.cvut.cz/fta-fmea-server
-FTA_FMEA_CONTEXT='/fta-fmea'
+FTA_FMEA_BASENAME='/fta-fmea'
 FTA_FMEA_ADMIN_REGISTRATION_ONLY=false
diff --git a/deploy/.docker/config.js.template b/deploy/.docker/config.js.template
@@ -1,6 +1,6 @@
 // Dynamic configuration
 window.__config__ = {
-  FTA_FMEA_CONTEXT:'${FTA_FMEA_CONTEXT}',
+  FTA_FMEA_BASENAME:'${FTA_FMEA_BASENAME}',
   FTA_FMEA_API_URL:'${FTA_FMEA_API_URL}',
   FTA_FMEA_ADMIN_REGISTRATION_ONLY:'${FTA_FMEA_ADMIN_REGISTRATION_ONLY}',
   FTA_FMEA_TITLE:'${FTA_FMEA_TITLE}'

diff --git a/deploy/.docker/docker-entrypoint.sh b/deploy/.docker/docker-entrypoint.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 set -eu
 
-envsubst '${FTA_FMEA_CONTEXT} ${FTA_FMEA_API_URL} ${FTA_FMEA_ADMIN_REGISTRATION_ONLY} ${FTA_FMEA_TITLE}' < /etc/nginx/config.js.template > /usr/share/nginx/html/config.js
+envsubst '${FTA_FMEA_BASENAME} ${FTA_FMEA_API_URL} ${FTA_FMEA_ADMIN_REGISTRATION_ONLY} ${FTA_FMEA_TITLE}' < /etc/nginx/config.js.template > /usr/share/nginx/html/config.js
 
 exec "$@"
diff --git a/deploy/internal-auth/docker-compose.yml b/deploy/internal-auth/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     environment:
       FTA_FMEA_API_URL: "${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}${FTA_FMEA_ROOT_PATH:-/fta-fmea}/services/fta-fmea-server"
       FTA_FMEA_ADMIN_REGISTRATION_ONLY: ${ADMIN_REGISTRATION_ONLY:-false}
-      FTA_FMEA_CONTEXT: "${FTA_FMEA_ROOT_PATH:-/fta-fmea}"
+      FTA_FMEA_BASENAME: "${FTA_FMEA_ROOT_PATH:-/fta-fmea}"
     expose:
       - "80"
     depends_on:

diff --git a/src/components/routes/AppRoutes.tsx b/src/components/routes/AppRoutes.tsx
@@ -24,7 +24,7 @@ export const appHistory = createHashHistory();
 const AppRoutes = () => {
   return (
     <LoggedUserProvider>
-      <BrowserRouter basename={ENVVariable.CONTEXT} /*history={appHistory}*/>
+      <BrowserRouter basename={ENVVariable.BASENAME} /*history={appHistory}*/>
         <Navigation>
           <Routes>
             {/*TODO: revisit routing, this is hotfix to support react-router v6*/}

diff --git a/src/utils/constants.tsx b/src/utils/constants.tsx
@@ -20,7 +20,7 @@ const getEnv = (name: string, defaultValue?: string): string => {
 
 export const ENVVariable = {
   API_URL: getEnv("FTA_FMEA_API_URL", "http://localhost:9999"),
-  CONTEXT: getEnv("FTA_FMEA_CONTEXT", ""),
+  BASENAME: getEnv("FTA_FMEA_BASENAME", ""),
   ADMIN_REGISTRATION_ONLY: getEnv("FTA_FMEA_ADMIN_REGISTRATION_ONLY", "false"),
   TITLE: getEnv("FTA_FMEA_TITLE", "FTA/FMEA"),
 };