X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/54e00d0eac0a198ddebe3916c4e0b499e5bd33e3..badcb86fb7d0e2ab87c7dcef230072db2e2ae95e:/src/common/config.ts diff --git a/src/common/config.ts b/src/common/config.ts index 496b0b7889..1f668292c3 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -44,6 +44,7 @@ export interface ClusterConfigJSON { ArvadosDocsite: string; VocabularyURL: string; FileViewersConfigURL: string; + WelcomePageHTML: string; }; } @@ -60,6 +61,7 @@ export class Config { workbench2Url: string; vocabularyUrl: string; fileViewersConfigUrl: string; + clusterConfig: ClusterConfigJSON; } export const fetchConfig = () => { @@ -111,6 +113,7 @@ remove the entire ${varName} entry from ${WORKBENCH_CONFIG_URL}`); config.workbench2Url = clusterConfigJSON.Services.Workbench2.ExternalURL; config.workbenchUrl = clusterConfigJSON.Services.Workbench1.ExternalURL; config.keepWebServiceUrl = clusterConfigJSON.Services.WebDAV.ExternalURL; + config.clusterConfig = clusterConfigJSON; mapRemoteHosts(clusterConfigJSON, config); return { config, apiHost: workbenchConfig.API_HOST }; @@ -125,6 +128,25 @@ export const mapRemoteHosts = (clusterConfigJSON: ClusterConfigJSON, config: Con delete config.remoteHosts["*"]; }; +export const mockClusterConfigJSON = (config: Partial): ClusterConfigJSON => ({ + ClusterID: "", + RemoteClusters: {}, + Services: { + Controller: { ExternalURL: "" }, + Workbench1: { ExternalURL: "" }, + Workbench2: { ExternalURL: "" }, + Websocket: { ExternalURL: "" }, + WebDAV: { ExternalURL: "" }, + }, + Workbench: { + ArvadosDocsite: "", + VocabularyURL: "", + FileViewersConfigURL: "", + WelcomePageHTML: "", + }, + ...config +}); + export const mockConfig = (config: Partial): Config => ({ baseUrl: "", keepWebServiceUrl: "", @@ -135,7 +157,9 @@ export const mockConfig = (config: Partial): Config => ({ workbenchUrl: "", workbench2Url: "", vocabularyUrl: "", - fileViewersConfigUrl: "" + fileViewersConfigUrl: "", + clusterConfig: mockClusterConfigJSON({}), + ...config }); const getDefaultConfig = (): WorkbenchConfig => { @@ -157,4 +181,4 @@ const getDefaultConfig = (): WorkbenchConfig => { export const ARVADOS_API_PATH = "arvados/v1"; export const CLUSTER_CONFIG_URL = "arvados/v1/config"; -export const getClusterConfigURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/${CLUSTER_CONFIG_URL}?nocache=${(new Date()).getTime()}`; \ No newline at end of file +export const getClusterConfigURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/${CLUSTER_CONFIG_URL}?nocache=${(new Date()).getTime()}`;