projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' of git.arvados.org:arvados-workbench2 into 16073-process-io-panels
[arvados-workbench2.git]
/
src
/
common
/
config.ts
diff --git
a/src/common/config.ts
b/src/common/config.ts
index 56f7c4884b19542ee057b937b5ff420809477a9e..574445df09b05f5f47a8b0b57fc190352a8e1237 100644
(file)
--- a/
src/common/config.ts
+++ b/
src/common/config.ts
@@
-13,6
+13,9
@@
interface WorkbenchConfig {
}
export interface ClusterConfigJSON {
}
export interface ClusterConfigJSON {
+ API: {
+ UnfreezeProjectRequiresAdmin: boolean
+ },
ClusterID: string;
RemoteClusters: {
[key: string]: {
ClusterID: string;
RemoteClusters: {
[key: string]: {
@@
-50,8
+53,8
@@
export interface ClusterConfigJSON {
}
};
Workbench: {
}
};
Workbench: {
+ DisableSharingURLsUI: boolean;
ArvadosDocsite: string;
ArvadosDocsite: string;
- VocabularyURL: string;
FileViewersConfigURL: string;
WelcomePageHTML: string;
InactivePageHTML: string;
FileViewersConfigURL: string;
WelcomePageHTML: string;
InactivePageHTML: string;
@@
-204,15
+207,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 };
});
@@
-227,6
+225,9
@@
export const mapRemoteHosts = (clusterConfigJSON: ClusterConfigJSON, config: Con
};
export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): ClusterConfigJSON => ({
};
export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): ClusterConfigJSON => ({
+ API: {
+ UnfreezeProjectRequiresAdmin: false,
+ },
ClusterID: "",
RemoteClusters: {},
Services: {
ClusterID: "",
RemoteClusters: {},
Services: {
@@
-239,8
+240,8
@@
export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
WebShell: { ExternalURL: "" },
},
Workbench: {
WebShell: { ExternalURL: "" },
},
Workbench: {
+ DisableSharingURLsUI: false,
ArvadosDocsite: "",
ArvadosDocsite: "",
- VocabularyURL: "",
FileViewersConfigURL: "",
WelcomePageHTML: "",
InactivePageHTML: "",
FileViewersConfigURL: "",
WelcomePageHTML: "",
InactivePageHTML: "",
@@
-315,5
+316,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()}`;