projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14393-improve-autoselect
[arvados.git]
/
src
/
common
/
config.ts
diff --git
a/src/common/config.ts
b/src/common/config.ts
index 1ab73294b01bc9c742c8b52d17bb1c418d080dc9..b7b89bd9e4930100188725b7f117f67abf076587 100644
(file)
--- a/
src/common/config.ts
+++ b/
src/common/config.ts
@@
-49,6
+49,7
@@
export interface Config {
version: string;
websocketUrl: string;
workbenchUrl: string;
version: string;
websocketUrl: string;
workbenchUrl: string;
+ vocabularyUrl: string;
}
export const fetchConfig = () => {
}
export const fetchConfig = () => {
@@
-58,7
+59,11
@@
export const fetchConfig = () => {
.catch(() => Promise.resolve(getDefaultConfig()))
.then(config => Axios
.get<Config>(getDiscoveryURL(config.API_HOST))
.catch(() => Promise.resolve(getDefaultConfig()))
.then(config => Axios
.get<Config>(getDiscoveryURL(config.API_HOST))
- .then(response => ({ config: response.data, apiHost: config.API_HOST })));
+ .then(response => ({
+ // TODO: After tests delete `|| '/vocabulary-example.json'`
+ config: {...response.data, vocabularyUrl: config.VOCABULARY_URL || '/vocabulary-example.json' },
+ apiHost: config.API_HOST,
+ })));
};
};
@@
-105,15
+110,18
@@
export const mockConfig = (config: Partial<Config>): Config => ({
version: '',
websocketUrl: '',
workbenchUrl: '',
version: '',
websocketUrl: '',
workbenchUrl: '',
+ vocabularyUrl: '',
...config
});
interface ConfigJSON {
API_HOST: string;
...config
});
interface ConfigJSON {
API_HOST: string;
+ VOCABULARY_URL: string;
}
const getDefaultConfig = (): ConfigJSON => ({
API_HOST: process.env.REACT_APP_ARVADOS_API_HOST || "",
}
const getDefaultConfig = (): ConfigJSON => ({
API_HOST: process.env.REACT_APP_ARVADOS_API_HOST || "",
+ VOCABULARY_URL: "",
});
const getDiscoveryURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/discovery/v1/apis/arvados/v1/rest`;
});
const getDiscoveryURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/discovery/v1/apis/arvados/v1/rest`;