[ARVADOS-WORKBENCH2] updated: 1.4.1-71-gba71587f

Git user git at public.curoverse.com
Mon Oct 28 16:01:43 UTC 2019


Summary of changes:
 src/common/config.ts                               |   9 +
 src/services/auth-service/auth-service.ts          |  14 +-
 src/store/auth/auth-action-session.ts              |   1 +
 src/store/auth/auth-action.test.ts                 |  15 +-
 src/store/auth/auth-action.ts                      |  14 +-
 src/store/auth/auth-reducer.test.ts                |   3 +
 src/store/auth/auth-reducer.ts                     |   8 +-
 .../link-account-panel-actions.ts                  |  30 +--
 src/views-components/data-explorer/renderers.tsx   |  22 +-
 .../main-app-bar/anonymous-menu.tsx                |   2 +-
 .../link-account-panel/link-account-panel-root.tsx | 228 +++++++++++----------
 .../link-account-panel/link-account-panel.tsx      |   7 +-
 src/views/login-panel/login-panel.tsx              |  15 +-
 .../search-results-panel-view.tsx                  |  53 +++--
 .../site-manager-panel/site-manager-panel-root.tsx |  31 +--
 .../site-manager-panel/site-manager-panel.tsx      |   3 +-
 src/views/workbench/fed-login.tsx                  |   4 +-
 17 files changed, 275 insertions(+), 184 deletions(-)

       via  ba71587fc2058276b9b70c342b990aa6508690a9 (commit)
       via  e5551bf01ddaff04ca0494013b7bab1a0978f7d1 (commit)
       via  fd4b10d0bd74546ebac751287b256ad32452a7b1 (commit)
       via  b70fb34feb137d347f1e9e9a85163981fe888622 (commit)
       via  5adf51b5e01fdc72fd51c82ad05bf07fd55f519f (commit)
       via  df4133dde10614e53a41b16a5c6062c3d1777059 (commit)
       via  0ac34fb81d10d664c7b7994612504f989d1c3d29 (commit)
       via  589629e80967dc1f318561fbe6a4174e1da231a6 (commit)
       via  a8223b83cc9ae48174718d124a38a504d5312651 (commit)
       via  a34ed98858d0a43904715e62a09d6de118073701 (commit)
       via  cfeff7ff252c475975587a740e25ee419a515d3c (commit)
       via  634d3b05179258468f53427356b5218d97257072 (commit)
       via  bfd0188773272d62ac8b9196c3a445d83a5719aa (commit)
       via  d866a8ad7d9d8f48c761fa7ea8ea96b17cbfdb2f (commit)
       via  640e9ba2d458a1bdaadea09dfe2c92816601709d (commit)
       via  29c0944feb7932889a5b6fcaf208eef9f5864a29 (commit)
       via  04446cedce14583b0ad11f6f0d989bf834a27d04 (commit)
      from  5df95741b820e18db893c8ce1fac67b921b7fafc (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 ba71587fc2058276b9b70c342b990aa6508690a9
Merge: 5df95741 e5551bf0
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Oct 28 12:01:23 2019 -0400

    Merge branch '15530-wb2-logincluster' refs #15530
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit e5551bf01ddaff04ca0494013b7bab1a0978f7d1
Merge: fd4b10d0 5df95741
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Oct 28 11:52:17 2019 -0400

    Merge branch 'master' into 15530-wb2-logincluster
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --cc src/common/config.ts
index 3dc34ce5,1f668292..758a77ba
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@@ -44,10 -44,8 +44,11 @@@ export interface ClusterConfigJSON 
          ArvadosDocsite: string;
          VocabularyURL: string;
          FileViewersConfigURL: string;
+         WelcomePageHTML: string;
      };
 +    Login: {
 +        LoginCluster: string;
 +    };
  }
  
  export class Config {
@@@ -63,7 -61,7 +64,8 @@@
      workbench2Url: string;
      vocabularyUrl: string;
      fileViewersConfigUrl: string;
 +    loginCluster: string;
+     clusterConfig: ClusterConfigJSON;
  }
  
  export const fetchConfig = () => {
@@@ -115,7 -113,7 +117,8 @@@ remove the entire ${varName} entry fro
                  config.workbench2Url = clusterConfigJSON.Services.Workbench2.ExternalURL;
                  config.workbenchUrl = clusterConfigJSON.Services.Workbench1.ExternalURL;
                  config.keepWebServiceUrl = clusterConfigJSON.Services.WebDAV.ExternalURL;
 +                config.loginCluster = clusterConfigJSON.Login.LoginCluster;
+                 config.clusterConfig = clusterConfigJSON;
                  mapRemoteHosts(clusterConfigJSON, config);
  
                  return { config, apiHost: workbenchConfig.API_HOST };
@@@ -130,6 -128,25 +133,28 @@@ export const mapRemoteHosts = (clusterC
      delete config.remoteHosts["*"];
  };
  
+ export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): ClusterConfigJSON => ({
+     ClusterID: "",
+     RemoteClusters: {},
+     Services: {
+         Controller: { ExternalURL: "" },
+         Workbench1: { ExternalURL: "" },
+         Workbench2: { ExternalURL: "" },
+         Websocket: { ExternalURL: "" },
+         WebDAV: { ExternalURL: "" },
+     },
+     Workbench: {
+         ArvadosDocsite: "",
+         VocabularyURL: "",
+         FileViewersConfigURL: "",
+         WelcomePageHTML: "",
+     },
++    Login: {
++        LoginCluster: "",
++    },
+     ...config
+ });
+ 
  export const mockConfig = (config: Partial<Config>): Config => ({
      baseUrl: "",
      keepWebServiceUrl: "",
@@@ -141,7 -158,8 +166,9 @@@
      workbench2Url: "",
      vocabularyUrl: "",
      fileViewersConfigUrl: "",
-     loginCluster: ""
++    loginCluster: "",
+     clusterConfig: mockClusterConfigJSON({}),
+     ...config
  });
  
  const getDefaultConfig = (): WorkbenchConfig => {
diff --cc src/views/login-panel/login-panel.tsx
index cca4027d,afc35f71..293026c3
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@@ -53,7 -51,7 +51,8 @@@ type LoginPanelProps = DispatchProp<any
      remoteHosts: { [key: string]: string },
      homeCluster: string,
      uuidPrefix: string,
-     loginCluster: string
++    loginCluster: string,
+     welcomePage: string
  };
  
  export const LoginPanel = withStyles(styles)(
@@@ -61,30 -59,16 +60,18 @@@
          remoteHosts: state.auth.remoteHosts,
          homeCluster: state.auth.homeCluster,
          uuidPrefix: state.auth.localCluster,
-         loginCluster: state.auth.loginCluster
-     }))(({ classes, dispatch, remoteHosts, homeCluster, uuidPrefix, loginCluster }: LoginPanelProps) =>
++        loginCluster: state.auth.loginCluster,
+         welcomePage: state.config.clusterConfig.Workbench.WelcomePageHTML
 -    }))(({ classes, dispatch, remoteHosts, homeCluster, uuidPrefix, welcomePage }: LoginPanelProps) =>
++    }))(({ classes, dispatch, remoteHosts, homeCluster, uuidPrefix, loginCluster, welcomePage }: LoginPanelProps) =>
          <Grid container justify="center" alignItems="center"
              className={classes.root}
              style={{ marginTop: 56, overflowY: "auto", height: "100%" }}>
              <Grid item className={classes.container}>
-                 <Typography variant='h6' align="center" className={classes.title}>
-                     Welcome to the Arvados Workbench
- 		</Typography>
-                 <Typography className={classes.content}>
-                     The "Log in" button below will show you a Google sign-in page.
-                     After you assure Google that you want to log in here with your Google account, you will be redirected back here to Arvados Workbench.
- 		</Typography>
-                 <Typography className={classes.content}>
-                     If you have never used Arvados Workbench before, logging in for the first time will automatically create a new account.
- 		</Typography>
-                 <Typography variant='body1' className={classNames(classes.content, classes.content__bolder)}>
-                     IMPORTANT: Please keep in mind to store exploratory data only but not any information used for clinical decision making.
- 		</Typography>
-                 <Typography className={classes.content}>
-                     Arvados Workbench uses your name and email address only for identification, and does not retrieve any other personal information from Google.
- 		</Typography>
- 
+                 <Typography>
+                     <div dangerouslySetInnerHTML={{ __html: welcomePage }} style={{ margin: "1em" }} />
+                 </Typography>
 -                {Object.keys(remoteHosts).length > 1 &&
 +                {Object.keys(remoteHosts).length > 1 && loginCluster === "" &&
++
                      <Typography component="div" align="right">
                          <label>Please select the cluster that hosts your user account:</label>
                          <Select native value={homeCluster} style={{ margin: "1em" }}
@@@ -95,10 -79,10 +82,10 @@@
  
                  <Typography component="div" align="right">
                      <Button variant="contained" color="primary" style={{ margin: "1em" }} className={classes.button}
 -                        onClick={() => dispatch(login(uuidPrefix, homeCluster, remoteHosts))}>
 -                        Log in to {uuidPrefix}
 -                        {uuidPrefix !== homeCluster &&
 -                            <span> with user from {homeCluster}</span>}
 +                        onClick={() => dispatch(login(uuidPrefix, homeCluster, loginCluster, remoteHosts))}>
 +                        Log in
-                         {uuidPrefix !== homeCluster && loginCluster !== homeCluster &&
++			{uuidPrefix !== homeCluster && loginCluster !== homeCluster &&
 +                            <span> to {uuidPrefix} with user from {homeCluster}</span>}
                      </Button>
                  </Typography>
              </Grid>

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list