projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18692: Initial frozen project implementation with tests
[arvados.git]
/
src
/
common
/
config.ts
diff --git
a/src/common/config.ts
b/src/common/config.ts
index 7a98fd4722a49cb49094f126b46620c741e72592..2518c95eda2e799a9156388f8f4d6f46a628203b 100644
(file)
--- a/
src/common/config.ts
+++ b/
src/common/config.ts
@@
-51,7
+51,6
@@
export interface ClusterConfigJSON {
};
Workbench: {
ArvadosDocsite: string;
};
Workbench: {
ArvadosDocsite: string;
- VocabularyURL: string;
FileViewersConfigURL: string;
WelcomePageHTML: string;
InactivePageHTML: string;
FileViewersConfigURL: string;
WelcomePageHTML: string;
InactivePageHTML: string;
@@
-89,7
+88,8
@@
export interface ClusterConfigJSON {
Value: string,
Protected?: boolean,
}
Value: string,
Protected?: boolean,
}
- }
+ },
+ TrustAllContent: boolean
};
Volumes: {
[key: string]: {
};
Volumes: {
[key: string]: {
@@
-138,7
+138,7
@@
export const buildConfig = (clusterConfig: ClusterConfigJSON): Config => {
};
export const getStorageClasses = (config: Config): string[] => {
};
export const getStorageClasses = (config: Config): string[] => {
- const classes: Set<string> = new Set();
+ const classes: Set<string> = new Set(
['default']
);
const volumes = config.clusterConfig.Volumes;
Object.keys(volumes).forEach(v => {
Object.keys(volumes[v].StorageClasses || {}).forEach(sc => {
const volumes = config.clusterConfig.Volumes;
Object.keys(volumes).forEach(v => {
Object.keys(volumes[v].StorageClasses || {}).forEach(sc => {
@@
-203,15
+203,10
@@
remove the entire ${varName} entry from ${WORKBENCH_CONFIG_URL}`);
}
config.fileViewersConfigUrl = fileViewerConfigUrl;
}
config.fileViewersConfigUrl = fileViewerConfigUrl;
- let vocabularyUrl;
if (workbenchConfig.VOCABULARY_URL !== undefined) {
if (workbenchConfig.VOCABULARY_URL !== undefined) {
- warnLocalConfig("VOCABULARY_URL");
- vocabularyUrl = workbenchConfig.VOCABULARY_URL;
- }
- else {
- vocabularyUrl = config.clusterConfig.Workbench.VocabularyURL || "/vocabulary-example.json";
+ console.warn(`A value for VOCABULARY_URL was found in ${WORKBENCH_CONFIG_URL}. It will be ignored as the cluster already provides its own endpoint, you can safely remove it.`)
}
}
- config.vocabularyUrl =
vocabularyUrl
;
+ config.vocabularyUrl =
getVocabularyURL(workbenchConfig.API_HOST)
;
return { config, apiHost: workbenchConfig.API_HOST };
});
return { config, apiHost: workbenchConfig.API_HOST };
});
@@
-239,7
+234,6
@@
export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
},
Workbench: {
ArvadosDocsite: "",
},
Workbench: {
ArvadosDocsite: "",
- VocabularyURL: "",
FileViewersConfigURL: "",
WelcomePageHTML: "",
InactivePageHTML: "",
FileViewersConfigURL: "",
WelcomePageHTML: "",
InactivePageHTML: "",
@@
-271,6
+265,7
@@
export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
},
Collections: {
ForwardSlashNameSubstitution: "",
},
Collections: {
ForwardSlashNameSubstitution: "",
+ TrustAllContent: false,
},
Volumes: {},
...config
},
Volumes: {},
...config
@@
-313,5
+308,7
@@
const getDefaultConfig = (): WorkbenchConfig => {
export const ARVADOS_API_PATH = "arvados/v1";
export const CLUSTER_CONFIG_PATH = "arvados/v1/config";
export const ARVADOS_API_PATH = "arvados/v1";
export const CLUSTER_CONFIG_PATH = "arvados/v1/config";
+export const VOCABULARY_PATH = "arvados/v1/vocabulary";
export const DISCOVERY_DOC_PATH = "discovery/v1/apis/arvados/v1/rest";
export const DISCOVERY_DOC_PATH = "discovery/v1/apis/arvados/v1/rest";
-export const getClusterConfigURL = (apiHost: string) => `${window.location.protocol}//${apiHost}/${CLUSTER_CONFIG_PATH}?nocache=${(new Date()).getTime()}`;
+export const getClusterConfigURL = (apiHost: string) => `https://${apiHost}/${CLUSTER_CONFIG_PATH}?nocache=${(new Date()).getTime()}`;
+export const getVocabularyURL = (apiHost: string) => `https://${apiHost}/${VOCABULARY_PATH}?nocache=${(new Date()).getTime()}`;