[ARVADOS-WORKBENCH2] created: 1.3.1-485-g98adeb29

[Git user]

        at  98adeb294aa8bf1c1691f70ab095d20a96c0d375 (commit)


commit 98adeb294aa8bf1c1691f70ab095d20a96c0d375
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed May 22 15:11:03 2019 -0400

    15255: Don't render fedtoken iframe if workbench2 config is missing.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/src/views/workbench/fed-login.tsx b/src/views/workbench/fed-login.tsx
index d09e6893..d77ddfb0 100644
--- a/src/views/workbench/fed-login.tsx
+++ b/src/views/workbench/fed-login.tsx
@@ -34,7 +34,7 @@ export const FedLogin = connect(mapStateToProps)(
             const [, tokenUuid, token] = apiToken.split("/");
             return <div id={"fedtoken-iframe-div"}>
                 {Object.keys(remoteHostsConfig)
-                    .map((k) => k !== localCluster &&
+                    .map((k) => k !== localCluster && remoteHostsConfig[k].workbench2Url &&
                         <iframe key={k} src={`${remoteHostsConfig[k].workbench2Url}/fedtoken?api_token=${getSaltedToken(k, tokenUuid, token)}`} style={{
                             height: 0,
                             width: 0,

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


hooks/post-receive
--