Merge branch '15728-property-filter' refs #15728

[arvados.git] / src / common / config.ts

diff --git a/src/common/config.ts b/src/common/config.ts
index 8f182324afc008944c68b278ea9f5c420283b537..e5f7b1c6d70e2a163c6dd29a11e393d9c6c04b28 100644 (file)
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -46,6 +46,10 @@ export interface ClusterConfigJSON {
         FileViewersConfigURL: string;
         WelcomePageHTML: string;
         InactivePageHTML: string;
+        SiteName: string;
+    };
+    Login: {
+        LoginCluster: string;
     };
 }
 
@@ -62,6 +66,7 @@ export class Config {
     workbench2Url: string;
     vocabularyUrl: string;
     fileViewersConfigUrl: string;
+    loginCluster: string;
     clusterConfig: ClusterConfigJSON;
 }
 
@@ -114,6 +119,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.loginCluster = clusterConfigJSON.Login.LoginCluster;
                 config.clusterConfig = clusterConfigJSON;
                 mapRemoteHosts(clusterConfigJSON, config);
 
@@ -145,6 +151,10 @@ export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
         FileViewersConfigURL: "",
         WelcomePageHTML: "",
         InactivePageHTML: "",
+        SiteName: "",
+    },
+    Login: {
+        LoginCluster: "",
     },
     ...config
 });
@@ -160,6 +170,7 @@ export const mockConfig = (config: Partial<Config>): Config => ({
     workbench2Url: "",
     vocabularyUrl: "",
     fileViewersConfigUrl: "",
+    loginCluster: "",
     clusterConfig: mockClusterConfigJSON({}),
     ...config
 });