From 9dba704e6e39056af0ec49a64cb2151b2f4321d0 Mon Sep 17 00:00:00 2001 From: Eric Biagiotti Date: Tue, 30 Jul 2019 17:01:17 -0400 Subject: [PATCH] 14813: Fixes remote cluster config state Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti --- src/common/config.ts | 2 -- src/store/auth/auth-action.ts | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/config.ts b/src/common/config.ts index 044d7aa9..975928e3 100644 --- a/src/common/config.ts +++ b/src/common/config.ts @@ -110,8 +110,6 @@ Please use the centralized configuration instead. See more at ${docsite}admin/co config.keepWebServiceUrl = clusterConfigJSON.Services.WebDAV.ExternalURL; mapRemoteHosts(clusterConfigJSON, config); - console.log(config); - return { config, apiHost: workbenchConfig.API_HOST }; }) ); diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts index 6356eaa8..b889adf5 100644 --- a/src/store/auth/auth-action.ts +++ b/src/store/auth/auth-action.ts @@ -91,6 +91,7 @@ const init = (config: Config) => (dispatch: Dispatch, getState: () => RootState, Axios.get(getClusterConfigURL(config.remoteHosts[k])) .then(response => { const remoteConfig = new Config(); + remoteConfig.uuidPrefix = response.data.ClusterID; remoteConfig.workbench2Url = response.data.Services.Workbench2.ExternalURL; mapRemoteHosts(response.data, remoteConfig); dispatch(authActions.REMOTE_CLUSTER_CONFIG({ config: remoteConfig})); -- 2.30.2