projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15166-size-between-icons-on-workflow-panel-is-too-wide'
[arvados-workbench2.git]
/
src
/
common
/
config.ts
diff --git
a/src/common/config.ts
b/src/common/config.ts
index db67ed8dceec9fc06837945cba4a820682a642af..71b7774c5fa8d765818b7ce611f6e4bfa1805c11 100644
(file)
--- a/
src/common/config.ts
+++ b/
src/common/config.ts
@@
-35,7
+35,9
@@
export interface Config {
packageVersion: string;
parameters: {};
protocol: string;
packageVersion: string;
parameters: {};
protocol: string;
- remoteHosts: string;
+ remoteHosts: {
+ [key: string]: string
+ };
remoteHostsViaDNS: boolean;
resources: {};
revision: string;
remoteHostsViaDNS: boolean;
resources: {};
revision: string;
@@
-49,6
+51,7
@@
export interface Config {
version: string;
websocketUrl: string;
workbenchUrl: string;
version: string;
websocketUrl: string;
workbenchUrl: string;
+ workbench2Url?: string;
vocabularyUrl: string;
fileViewersConfigUrl: string;
}
vocabularyUrl: string;
fileViewersConfigUrl: string;
}
@@
-102,7
+105,7
@@
export const mockConfig = (config: Partial<Config>): Config => ({
packageVersion: '',
parameters: {},
protocol: '',
packageVersion: '',
parameters: {},
protocol: '',
- remoteHosts:
''
,
+ remoteHosts:
{}
,
remoteHostsViaDNS: false,
resources: {},
revision: '',
remoteHostsViaDNS: false,
resources: {},
revision: '',
@@
-133,4
+136,5
@@
const getDefaultConfig = (): ConfigJSON => ({
FILE_VIEWERS_CONFIG_URL: "",
});
FILE_VIEWERS_CONFIG_URL: "",
});
-const getDiscoveryURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/discovery/v1/apis/arvados/v1/rest`;
+export const DISCOVERY_URL = 'discovery/v1/apis/arvados/v1/rest';
+export const getDiscoveryURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/${DISCOVERY_URL}?nocache=${(new Date()).getTime()}`;