Merge branch '14013-upload-collection-files-using-webdav'

[arvados-workbench2.git] / src / common / config.ts

diff --git a/src/common/config.ts b/src/common/config.ts
index 775b11452ac370450c89976c5cb88f2fd0883afd..759a20158f9f8cafac459cd4ee2213f36c00890d 100644 (file)
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -2,29 +2,36 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import Axios from "../../node_modules/axios";
+import Axios from "axios";
 
 export const CONFIG_URL = process.env.REACT_APP_ARVADOS_CONFIG_URL || "/config.json";
 
 export interface Config {
-    API_HOST: string;
+    apiHost: string;
+    keepWebHost: string;
 }
 
 export const fetchConfig = () => {
     return Axios
-        .get<Config>(CONFIG_URL + "?nocache=" + (new Date()).getTime())
+        .get<ConfigJSON>(CONFIG_URL + "?nocache=" + (new Date()).getTime())
         .then(response => response.data)
         .catch(() => Promise.resolve(getDefaultConfig()))
         .then(mapConfig);
 };
 
-const mapConfig = (config: Config): Config => ({
-    ...config,
-    API_HOST: addProtocol(config.API_HOST)
+interface ConfigJSON {
+    API_HOST: string;
+    KEEP_WEB_HOST: string;
+}
+
+const mapConfig = (config: ConfigJSON): Config => ({
+    apiHost: addProtocol(config.API_HOST),
+    keepWebHost: addProtocol(config.KEEP_WEB_HOST)
 });
 
-const getDefaultConfig = (): Config => ({
-    API_HOST: process.env.REACT_APP_ARVADOS_API_HOST || ""
+const getDefaultConfig = (): ConfigJSON => ({
+    API_HOST: process.env.REACT_APP_ARVADOS_API_HOST || "",
+    KEEP_WEB_HOST: process.env.REACT_APP_ARVADOS_KEEP_WEB_HOST || ""
 });
 
 const addProtocol = (url: string) => `${window.location.protocol}//${url}`;