[ARVADOS-WORKBENCH2] updated: 1.3.1-486-gfdbec885

[Git user]

Summary of changes:
 src/views/workbench/fed-login.tsx | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

       via  fdbec885a5e37bd22c5e839bc4c6c0f6c7f3b76a (commit)
      from  98adeb294aa8bf1c1691f70ab095d20a96c0d375 (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 fdbec885a5e37bd22c5e839bc4c6c0f6c7f3b76a
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed May 22 15:33:29 2019 -0400

    15255: Log missing workbench2Url value to console.
    
    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 d77ddfb0..c64778a3 100644
--- a/src/views/workbench/fed-login.tsx
+++ b/src/views/workbench/fed-login.tsx
@@ -34,13 +34,21 @@ export const FedLogin = connect(mapStateToProps)(
             const [, tokenUuid, token] = apiToken.split("/");
             return <div id={"fedtoken-iframe-div"}>
                 {Object.keys(remoteHostsConfig)
-                    .map((k) => k !== localCluster && remoteHostsConfig[k].workbench2Url &&
-                        <iframe key={k} src={`${remoteHostsConfig[k].workbench2Url}/fedtoken?api_token=${getSaltedToken(k, tokenUuid, token)}`} style={{
+                    .map((k) => {
+                        if (k === localCluster) {
+                            return;
+                        }
+                        if (!remoteHostsConfig[k].workbench2Url) {
+                            console.log(`Cluster ${k} does not define workbench2Url.  Federated login / cross-site linking to ${k} is unavailable.  Tell the admin of ${k} to set Services->Workbench2->ExternalURL in config.yml.`);
+                            return;
+                        }
+                        return <iframe key={k} src={`${remoteHostsConfig[k].workbench2Url}/fedtoken?api_token=${getSaltedToken(k, tokenUuid, token)}`} style={{
                             height: 0,
                             width: 0,
                             visibility: "hidden"
                         }}
-                        />)}
+                        />;
+                    })}
             </div>;
         }
     });

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


hooks/post-receive
--