X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e62c661a8de391ae269a0170901c6b0290970620..6ddbc50bc04b9bedce3f54cf69660fc819fce67a:/src/common/config.ts diff --git a/src/common/config.ts b/src/common/config.ts index 23faaf91..28d4855b 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -23,6 +23,9 @@ export interface ClusterConfigJSON { Scheme: string } }; + Mail?: { + SupportEmailAddress: string; + }; Services: { Controller: { ExternalURL: string @@ -53,34 +56,71 @@ export interface ClusterConfigJSON { WelcomePageHTML: string; InactivePageHTML: string; SSHHelpPageHTML: string; + SSHHelpHostSuffix: string; SiteName: string; + IdleTimeout: string; }; Login: { LoginCluster: string; + Google: { + Enable: boolean; + } + LDAP: { + Enable: boolean; + } + OpenIDConnect: { + Enable: boolean; + } + PAM: { + Enable: boolean; + } + SSO: { + Enable: boolean; + } + Test: { + Enable: boolean; + } }; Collections: { ForwardSlashNameSubstitution: string; + ManagedProperties?: { + [key: string]: { + Function: string, + Value: string, + Protected?: boolean, + } + } + }; + Volumes: { + [key: string]: { + StorageClasses: { + [key: string]: boolean; + } + } }; } export class Config { - baseUrl: string; - keepWebServiceUrl: string; - remoteHosts: { + baseUrl!: string; + keepWebServiceUrl!: string; + keepWebInlineServiceUrl!: string; + remoteHosts!: { [key: string]: string }; - rootUrl: string; - uuidPrefix: string; - websocketUrl: string; - workbenchUrl: string; - workbench2Url: string; - vocabularyUrl: string; - fileViewersConfigUrl: string; - loginCluster: string; - clusterConfig: ClusterConfigJSON; + rootUrl!: string; + uuidPrefix!: string; + websocketUrl!: string; + workbenchUrl!: string; + workbench2Url!: string; + vocabularyUrl!: string; + fileViewersConfigUrl!: string; + loginCluster!: string; + clusterConfig!: ClusterConfigJSON; + apiRevision!: number; } -export const buildConfig = (clusterConfigJSON: ClusterConfigJSON): Config => { +export const buildConfig = (clusterConfig: ClusterConfigJSON): Config => { + const clusterConfigJSON = removeTrailingSlashes(clusterConfig); const config = new Config(); config.rootUrl = clusterConfigJSON.Services.Controller.ExternalURL; config.baseUrl = `${config.rootUrl}/${ARVADOS_API_PATH}`; @@ -89,12 +129,48 @@ export const buildConfig = (clusterConfigJSON: ClusterConfigJSON): Config => { config.workbench2Url = clusterConfigJSON.Services.Workbench2.ExternalURL; config.workbenchUrl = clusterConfigJSON.Services.Workbench1.ExternalURL; config.keepWebServiceUrl = clusterConfigJSON.Services.WebDAVDownload.ExternalURL; + config.keepWebInlineServiceUrl = clusterConfigJSON.Services.WebDAV.ExternalURL; config.loginCluster = clusterConfigJSON.Login.LoginCluster; config.clusterConfig = clusterConfigJSON; + config.apiRevision = 0; mapRemoteHosts(clusterConfigJSON, config); return config; }; +export const getStorageClasses = (config: Config): string[] => { + const classes: Set = new Set(['default']); + const volumes = config.clusterConfig.Volumes; + Object.keys(volumes).forEach(v => { + Object.keys(volumes[v].StorageClasses || {}).forEach(sc => { + if (volumes[v].StorageClasses[sc]) { + classes.add(sc); + } + }); + }); + return Array.from(classes); +}; + +const getApiRevision = async (apiUrl: string) => { + try { + const dd = (await Axios.get(`${apiUrl}/${DISCOVERY_DOC_PATH}`)).data; + return parseInt(dd.revision, 10) || 0; + } catch { + console.warn("Unable to get API Revision number, defaulting to zero. Some features may not work properly."); + return 0; + } +}; + +const removeTrailingSlashes = (config: ClusterConfigJSON): ClusterConfigJSON => { + const svcs: any = {}; + Object.keys(config.Services).forEach((s) => { + svcs[s] = config.Services[s]; + if (svcs[s].hasOwnProperty('ExternalURL')) { + svcs[s].ExternalURL = svcs[s].ExternalURL.replace(/\/+$/, ''); + } + }); + return { ...config, Services: svcs }; +}; + export const fetchConfig = () => { return Axios .get(WORKBENCH_CONFIG_URL + "?nocache=" + (new Date()).getTime()) @@ -107,9 +183,9 @@ export const fetchConfig = () => { if (workbenchConfig.API_HOST === undefined) { throw new Error(`Unable to start Workbench. API_HOST is undefined in ${WORKBENCH_CONFIG_URL} or the environment.`); } - return Axios.get(getClusterConfigURL(workbenchConfig.API_HOST)).then(response => { - const clusterConfigJSON = response.data; - const config = buildConfig(clusterConfigJSON); + return Axios.get(getClusterConfigURL(workbenchConfig.API_HOST)).then(async response => { + const apiRevision = await getApiRevision(response.data.Services.Controller.ExternalURL.replace(/\/+$/, '')); + const config = { ...buildConfig(response.data), apiRevision }; const warnLocalConfig = (varName: string) => console.warn( `A value for ${varName} was found in ${WORKBENCH_CONFIG_URL}. To use the Arvados centralized configuration instead, \ remove the entire ${varName} entry from ${WORKBENCH_CONFIG_URL}`); @@ -123,7 +199,7 @@ remove the entire ${varName} entry from ${WORKBENCH_CONFIG_URL}`); fileViewerConfigUrl = workbenchConfig.FILE_VIEWERS_CONFIG_URL; } else { - fileViewerConfigUrl = clusterConfigJSON.Workbench.FileViewersConfigURL || "/file-viewers-example.json"; + fileViewerConfigUrl = config.clusterConfig.Workbench.FileViewersConfigURL || "/file-viewers-example.json"; } config.fileViewersConfigUrl = fileViewerConfigUrl; @@ -133,7 +209,7 @@ remove the entire ${varName} entry from ${WORKBENCH_CONFIG_URL}`); vocabularyUrl = workbenchConfig.VOCABULARY_URL; } else { - vocabularyUrl = clusterConfigJSON.Workbench.VocabularyURL || "/vocabulary-example.json"; + vocabularyUrl = config.clusterConfig.Workbench.VocabularyURL || "/vocabulary-example.json"; } config.vocabularyUrl = vocabularyUrl; @@ -168,20 +244,42 @@ export const mockClusterConfigJSON = (config: Partial): Clust WelcomePageHTML: "", InactivePageHTML: "", SSHHelpPageHTML: "", + SSHHelpHostSuffix: "", SiteName: "", + IdleTimeout: "0s", }, Login: { LoginCluster: "", + Google: { + Enable: false, + }, + LDAP: { + Enable: false, + }, + OpenIDConnect: { + Enable: false, + }, + PAM: { + Enable: false, + }, + SSO: { + Enable: false, + }, + Test: { + Enable: false, + }, }, Collections: { ForwardSlashNameSubstitution: "", }, + Volumes: {}, ...config }); export const mockConfig = (config: Partial): Config => ({ baseUrl: "", keepWebServiceUrl: "", + keepWebInlineServiceUrl: "", remoteHosts: {}, rootUrl: "", uuidPrefix: "", @@ -192,6 +290,7 @@ export const mockConfig = (config: Partial): Config => ({ fileViewersConfigUrl: "", loginCluster: "", clusterConfig: mockClusterConfigJSON({}), + apiRevision: 0, ...config });