projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[arvados.git]
/
src
/
common
/
config.ts
diff --git
a/src/common/config.ts
b/src/common/config.ts
index 250c806c69641cbf9a63cde243075bd234a88177..492328d986e55e3d6d2101d96f1d82f095a5690d 100644
(file)
--- a/
src/common/config.ts
+++ b/
src/common/config.ts
@@
-7,7
+7,8
@@
import Axios from "axios";
export const CONFIG_URL = process.env.REACT_APP_ARVADOS_CONFIG_URL || "/config.json";
export interface Config {
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 = () => {
}
export const fetchConfig = () => {
@@
-20,11
+21,13
@@
export const fetchConfig = () => {
const mapConfig = (config: Config): Config => ({
...config,
const mapConfig = (config: Config): Config => ({
...config,
- API_HOST: addProtocol(config.API_HOST)
+ apiHost: addProtocol(config.apiHost),
+ keepWebHost: addProtocol(config.keepWebHost)
});
const getDefaultConfig = (): Config => ({
});
const getDefaultConfig = (): Config => ({
- API_HOST: process.env.REACT_APP_ARVADOS_API_HOST || ""
+ apiHost: process.env.REACT_APP_ARVADOS_API_HOST || "",
+ keepWebHost: process.env.REACT_APP_ARVADOS_KEEP_WEB_HOST || ""
});
const addProtocol = (url: string) => `${window.location.protocol}//${url}`;
});
const addProtocol = (url: string) => `${window.location.protocol}//${url}`;