From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Mon, 10 Sep 2018 07:39:14 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Tag: 1.3.0~105^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/0d6ec80f58aa00e9542f4c69cba872016baa14d6

Merge branch 'master'

Feature #14149

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

0d6ec80f58aa00e9542f4c69cba872016baa14d6
diff --cc src/index.tsx
index e982b454,8ab089a8..a76a86ac
--- a/src/index.tsx
+++ b/src/index.tsx
@@@ -35,7 -35,7 +35,8 @@@ import { ServiceRepository } from '~/se
  import { initWebSocket } from '~/websocket/websocket';
  import { Config } from '~/common/config';
  import { addRouteChangeHandlers } from './routes/route-change-handlers';
 +import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions';
+ import { processResourceActionSet } from './views-components/context-menu/action-sets/process-resource-action-set';
  
  const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
  const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
diff --cc src/views/workbench/workbench.tsx
index a166473e,f202b698..4d231a0c
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -36,12 -39,11 +37,11 @@@ import { MoveProjectDialog } from '~/vi
  import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
  import { FilesUploadCollectionDialog } from '~/views-components/dialog-forms/files-upload-collection-dialog';
  import { PartialCopyCollectionDialog } from '~/views-components/dialog-forms/partial-copy-collection-dialog';
- 
  import { TrashPanel } from "~/views/trash-panel/trash-panel";
 +import { MainContentBar } from '../../views-components/main-content-bar/main-content-bar';
 +import { Grid } from '@material-ui/core';
  
 -const APP_BAR_HEIGHT = 100;
 -
 -type CssRules = 'root' | 'appBar' | 'content' | 'contentWrapper';
 +type CssRules = 'root' | 'contentWrapper' | 'content' | 'appBar';
  
  const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
      root: {
@@@ -93,82 -120,99 +93,83 @@@ export const Workbench = withStyles(sty
              };
  
              render() {
 -                const { classes, user } = this.props;
 -                return (
 -                    <div className={classes.root}>
 -                        <div className={classes.appBar}>
 +                return <>
 +                    <Grid
 +                        container
 +                        direction="column"
 +                        className={this.props.classes.root}>
 +                        <Grid className={this.props.classes.appBar}>
                              <MainAppBar
 -                                breadcrumbs={Breadcrumbs}
                                  searchText={this.state.searchText}
                                  user={this.props.user}
 -                                menuItems={this.state.menuItems}
 -                                buildInfo={this.props.buildInfo}
 -                                {...this.mainAppBarActions} />
 -                        </div>
 -                        {user && <SidePanel />}
 -                        <main className={classes.contentWrapper}>
 -                            <div className={classes.content}>
 -                                <Switch>
 -                                    <Route path={Routes.PROJECTS} component={ProjectPanel} />
 -                                    <Route path={Routes.COLLECTIONS} component={CollectionPanel} />
 -                                    <Route path={Routes.FAVORITES} component={FavoritePanel} />
 -                                    <Route path={Routes.PROCESSES} component={ProcessPanel} />
 -                                    <Route path={Routes.TRASH} component={TrashPanel} />
 -                                    <Route path={Routes.PROCESS_LOGS} component={ProcessLogPanel} />
 -                                </Switch>
 -                            </div>
 -                            {user && <DetailsPanel />}
 -                        </main>
 -                        <ContextMenu />
 -                        <Snackbar />
 -                        <CreateProjectDialog />
 -                        <CreateCollectionDialog />
 -                        <RenameFileDialog />
 -                        <PartialCopyCollectionDialog />
 -                        <FileRemoveDialog />
 -                        <CopyCollectionDialog />
 -                        <FileRemoveDialog />
 -                        <MultipleFilesRemoveDialog />
 -                        <UpdateCollectionDialog />
 -                        <FilesUploadCollectionDialog />
 -                        <UpdateProjectDialog />
 -                        <MoveCollectionDialog />
 -                        <MoveProcessDialog />
 -                        <MoveProjectDialog />
 -                        <CurrentTokenDialog
 -                            currentToken={this.props.currentToken}
 -                            open={this.state.isCurrentTokenDialogOpen}
 -                            handleClose={this.toggleCurrentTokenModal} />
 -                    </div>
 -                );
 +                                onSearch={this.onSearch}
 +                                buildInfo={this.props.buildInfo} />
 +                        </Grid>
 +                        {this.props.user &&
 +                            <Grid
 +                                container
 +                                item
 +                                xs
 +                                alignItems="stretch"
 +                                wrap="nowrap">
 +                                <Grid item>
 +                                    <SidePanel />
 +                                </Grid>
 +                                <Grid
 +                                    container
 +                                    item
 +                                    xs
 +                                    component="main"
 +                                    direction="column"
 +                                    className={this.props.classes.contentWrapper}>
 +                                    <Grid item>
 +                                        <MainContentBar />
 +                                    </Grid>
 +                                    <Grid item xs className={this.props.classes.content}>
 +                                        <Switch>
 +                                            <Route path={Routes.PROJECTS} component={ProjectPanel} />
 +                                            <Route path={Routes.COLLECTIONS} component={CollectionPanel} />
 +                                            <Route path={Routes.FAVORITES} component={FavoritePanel} />
 +                                            <Route path={Routes.PROCESSES} component={ProcessPanel} />
 +                                            <Route path={Routes.TRASH} component={TrashPanel} />
 +                                            <Route path={Routes.PROCESS_LOGS} component={ProcessLogPanel} />
 +                                        </Switch>
 +                                    </Grid>
 +                                </Grid>
 +                                <Grid item>
 +                                    <DetailsPanel />
 +                                </Grid>
 +                            </Grid>}
 +                    </Grid>
 +                    <ContextMenu />
 +                    <Snackbar />
 +                    <CreateProjectDialog />
 +                    <CreateCollectionDialog />
 +                    <RenameFileDialog />
 +                    <PartialCopyCollectionDialog />
 +                    <FileRemoveDialog />
 +                    <CopyCollectionDialog />
 +                    <FileRemoveDialog />
 +                    <MultipleFilesRemoveDialog />
 +                    <UpdateCollectionDialog />
 +                    <FilesUploadCollectionDialog />
 +                    <UpdateProjectDialog />
 +                    <MoveCollectionDialog />
++                    <MoveProcessDialog />
 +                    <MoveProjectDialog />
 +                    <CurrentTokenDialog />
 +                </>;
              }
  
 -            mainAppBarActions: MainAppBarActionProps = {
 -                onSearch: searchText => {
 -                    this.setState({ searchText });
 -                    this.props.dispatch(push(`/search?q=${searchText}`));
 -                },
 -                onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action(),
 -                onDetailsPanelToggle: () => {
 -                    this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
 -                },
 -            };
 +            onSearch = (searchText: string) => {
 +                this.setState({ searchText });
 +                this.props.dispatch(push(`/search?q=${searchText}`));
 +            }
  
 -            toggleCurrentTokenModal = () => {
 -                this.setState({ isCurrentTokenDialogOpen: !this.state.isCurrentTokenDialogOpen });
 +            toggleDetailsPanel = () => {
 +                this.props.dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
              }
 +
          }
      )
  );