14813: Fixes remote cluster config state

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/src/common/config.ts b/src/common/config.ts
index 044d7aa9405ebbd40f13d5bee609c36ccf0b0212..975928e35a40919af274119983540dda606f636d 100644 (file)
--- 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);
 
                 config.keepWebServiceUrl =  clusterConfigJSON.Services.WebDAV.ExternalURL;
                 mapRemoteHosts(clusterConfigJSON, config);
 

-                console.log(config);
-

                 return { config, apiHost: workbenchConfig.API_HOST };
             })
         );
                 return { config, apiHost: workbenchConfig.API_HOST };
             })
         );

diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts
index 6356eaa8bdc9e5b8771feacb7ea2c26241842002..b889adf571113494f32fee49843ebeabe527f5a9 100644 (file)
--- 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<ClusterConfigJSON>(getClusterConfigURL(config.remoteHosts[k]))
             .then(response => {
                 const remoteConfig = new Config();
         Axios.get<ClusterConfigJSON>(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}));
                 remoteConfig.workbench2Url = response.data.Services.Workbench2.ExternalURL;
                 mapRemoteHosts(response.data, remoteConfig);
                 dispatch(authActions.REMOTE_CLUSTER_CONFIG({ config: remoteConfig}));