[ARVADOS-WORKBENCH2] updated: 1.4.1-89-ga1cfba8c

Git user git at public.curoverse.com
Tue Nov 5 15:23:34 UTC 2019


Summary of changes:
 src/store/auth/auth-action.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

       via  a1cfba8c2407131a8c5d6c21dc741d6319f8648a (commit)
      from  63bcd4762a60500b6a445b16b33ea31533fdf25d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a1cfba8c2407131a8c5d6c21dc741d6319f8648a
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Nov 5 10:23:15 2019 -0500

    15736: Don't redundantly load local config
    
    Somehow missed this in the last commit

diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts
index bfec39be..e394d62d 100644
--- a/src/store/auth/auth-action.ts
+++ b/src/store/auth/auth-action.ts
@@ -85,16 +85,18 @@ const init = (config: Config) => (dispatch: Dispatch, getState: () => RootState,
             if (err.response) {
                 // Bad token
                 if (err.response.status === 401) {
-                    logout()(dispatch, getState, services);
+                    dispatch<any>(logout());
                 }
             }
         });
     }
     Object.keys(config.remoteHosts).map((k) => {
-        Axios.get<ClusterConfigJSON>(getClusterConfigURL(config.remoteHosts[k]))
-            .then(response => {
-                dispatch(authActions.REMOTE_CLUSTER_CONFIG({ config: buildConfig(response.data) }));
-            });
+        if (k !== config.uuidPrefix) {
+            Axios.get<ClusterConfigJSON>(getClusterConfigURL(config.remoteHosts[k]))
+                .then(response => {
+                    dispatch(authActions.REMOTE_CLUSTER_CONFIG({ config: buildConfig(response.data) }));
+                });
+        }
     });
 };
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list