Merge pull request #19 from CNAG-Biomedical-Informatics/filepond-dele…

…te-triggers-reupload Filepond delete triggers reupload
CNAG-Biomedical-Informatics · Dec 12, 2023 · d59232f · d59232f
2 parents 943c892 + 4c60026
commit d59232f
Show file tree

Hide file tree

Showing 16 changed files with 157 additions and 183 deletions.
diff --git a/convertPheno_client/index.html b/convertPheno_client/index.html
@@ -20,6 +20,7 @@
       window.REACT_APP_SECURITY = "{{VITE_SECURITY}}";
       window.REACT_APP_API_URL = "{{VITE_API_URL}}";
       window.REACT_APP_KC_CONFIG = "{{VITE_KC_CONFIG}}";
+      window.REACT_APP_FILEPOND_TIMEOUT = "{{VITE_FILEPOND_TIMEOUT}}";
       window.REACT_APP_MATOMO_URL = "{{MATOMO_TAG_MANAGER_URL}}";
     </script>
     <script type="module" src="/src/main.tsx"></script>

diff --git a/convertPheno_client/package.json b/convertPheno_client/package.json
@@ -22,7 +22,6 @@
     "filepond-plugin-file-validate-type": "^1.2.8",
     "keycloak-js": "^23.0.1",
     "react": "^18.2.0",
-    "react-bootstrap": "^2.9.1",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.2.0",

diff --git a/convertPheno_client/pnpm-lock.yaml b/convertPheno_client/pnpm-lock.yaml
diff --git a/convertPheno_client/replace_env_vars.sh b/convertPheno_client/replace_env_vars.sh
@@ -18,8 +18,8 @@ echo $MATOMO_TAG_MANAGER_URL
 echo "=== DEBUG: End of check if env variables are set ==="
 
 # Define the placeholders and their corresponding environment variables
-PLACEHOLDERS="{{VITE_SECURITY}} {{VITE_API_URL}} {{VITE_KC_CONFIG}} {{MATOMO_TAG_MANAGER_URL}}"
-ENV_VARS="VITE_SECURITY VITE_API_URL VITE_KC_CONFIG MATOMO_TAG_MANAGER_URL"
+PLACEHOLDERS="{{VITE_SECURITY}} {{VITE_API_URL}} {{VITE_KC_CONFIG}} {{VITE_FILEPOND_TIMEOUT}} {{MATOMO_TAG_MANAGER_URL}}"
+ENV_VARS="VITE_SECURITY VITE_API_URL VITE_KC_CONFIG VITE_FILEPOND_TIMEOUT MATOMO_TAG_MANAGER_URL"
 
 # Replace the placeholders with the environment variable values
 for placeholder in $PLACEHOLDERS; do