[ARVADOS-WORKBENCH2] updated: 1.2.0-426-gda9179a

[Git user]

Summary of changes:
 public/arvados_logo.png                            | Bin 0 -> 52702 bytes
 .../progress-indicator-reducer.ts                  |   4 +
 src/store/workbench/workbench-actions.ts           | 110 +++++++++++++--------
 src/views/main-panel/main-panel.tsx                |  36 ++++---
 src/views/workbench/workbench-loading-screen.tsx   |  32 ++++++
 5 files changed, 125 insertions(+), 57 deletions(-)
 create mode 100644 public/arvados_logo.png
 create mode 100644 src/views/workbench/workbench-loading-screen.tsx

       via  da9179a2e43be0cb19910ef689cd922457f84744 (commit)
       via  259b0d754cf5b7f5f0f3763e4468934406d8f001 (commit)
       via  2f449b9eaded9e047c163102f6c9dd0306da42b0 (commit)
       via  6f52701f994470b46f62020269e9614b65bb52c8 (commit)
       via  4ecec1c730f1a3fcfd5082cdc14250d39dac199c (commit)
      from  e02a51f2799aaab5cdd0194dc9363e31592d4209 (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 da9179a2e43be0cb19910ef689cd922457f84744
Merge: e02a51f 259b0d7
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date:   Thu Sep 20 14:09:18 2018 +0200

    Merge branch 'master' into 13935-login-page-and-main-panel
    
    refs #13935
    
    Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>

diff --cc src/views/main-panel/main-panel.tsx
index 22455c3,0000000..297a621
mode 100644,000000..100644
--- a/src/views/main-panel/main-panel.tsx
+++ b/src/views/main-panel/main-panel.tsx
@@@ -1,78 -1,0 +1,84 @@@
 +// Copyright (C) The Arvados Authors. All rights reserved.
 +//
 +// SPDX-License-Identifier: AGPL-3.0
 +
 +import * as React from 'react';
 +import { connect, DispatchProp } from 'react-redux';
 +import { push } from 'react-router-redux';
 +import { LinearProgress, Grid } from '@material-ui/core';
 +import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
 +import { ArvadosTheme } from '~/common/custom-theme';
- import { isSystemWorking } from '~/store/progress-indicator/progress-indicator-reducer';
 +import { RootState } from '~/store/store';
 +import { User } from '~/models/user';
 +import { WorkbenchPanel } from '~/views/workbench/workbench';
 +import { LoginPanel } from '~/views/login-panel/login-panel';
 +import { MainAppBar } from '~/views-components/main-app-bar/main-app-bar';
++import { isSystemWorking } from '~/store/progress-indicator/progress-indicator-reducer';
++import { isWorkbenchLoading } from '../../store/workbench/workbench-actions';
++import { WorkbenchLoadingScreen } from '~/views/workbench/workbench-loading-screen';
 +
 +type CssRules = 'root';
 +
 +const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
 +    root: {
 +        overflow: 'hidden',
 +        width: '100vw',
 +        height: '100vh'
 +    }
 +});
 +
 +interface MainPanelDataProps {
 +    user?: User;
 +    working: boolean;
++    loading: boolean;
 +}
 +
 +interface MainPanelGeneralProps {
 +    buildInfo: string;
 +}
 +
 +interface MainPanelState {
 +    searchText: string;
 +}
 +
 +type MainPanelProps = MainPanelDataProps & MainPanelGeneralProps & DispatchProp<any> & WithStyles<CssRules>;
 +
 +export const MainPanel = withStyles(styles)(
 +    connect<MainPanelDataProps>(
 +        (state: RootState) => ({
 +            user: state.auth.user,
-             working: isSystemWorking(state.progressIndicator)
++            working: isSystemWorking(state.progressIndicator),
++            loading: isWorkbenchLoading(state)
 +        })
 +    )(
 +        class extends React.Component<MainPanelProps, MainPanelState> {
 +            state = {
 +                searchText: "",
 +            };
 +
 +            render() {
-                 const { classes, user, buildInfo, working } = this.props;
++                const { classes, user, buildInfo, working, loading } = this.props;
 +                const { searchText } = this.state;
-                 return <>
-                     <MainAppBar
-                         searchText={searchText}
-                         user={user}
-                         onSearch={this.onSearch}
-                         buildInfo={buildInfo}>
-                         {working ? <LinearProgress color="secondary" /> : null}
-                     </MainAppBar>
-                     <Grid container direction="column" className={classes.root}>
-                         {user ? <WorkbenchPanel /> : <LoginPanel />}
-                     </Grid>
-                 </>;
++                return loading
++                    ? <WorkbenchLoadingScreen />
++                    : <>
++                        <MainAppBar
++                            searchText={searchText}
++                            user={user}
++                            onSearch={this.onSearch}
++                            buildInfo={buildInfo}>
++                            {working ? <LinearProgress color="secondary" /> : null}
++                        </MainAppBar>
++                        <Grid container direction="column" className={classes.root}>
++                            {user ? <WorkbenchPanel /> : <LoginPanel />}
++                        </Grid>
++                    </>;
 +            }
 +
 +            onSearch = (searchText: string) => {
 +                this.setState({ searchText });
 +                this.props.dispatch(push(`/search?q=${searchText}`));
 +            }
 +        }
 +    )
 +);

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


hooks/post-receive
--