[ARVADOS-WORKBENCH2] updated: 1.2.0-338-gff74ff7
Git user
git at public.curoverse.com
Mon Sep 10 03:39:48 EDT 2018
Summary of changes:
src/common/config.ts | 6 +-
src/components/code-snippet/code-snippet.tsx | 2 +-
.../default-code-snippet/default-code-snippet.tsx | 2 +-
src/index.tsx | 4 +-
.../current-token-dialog-actions.tsx | 26 +++
.../current-token-dialog/current-token-dialog.tsx | 99 +++++-----
.../details-panel/details-panel.tsx | 33 ++--
src/views-components/main-app-bar/account-menu.tsx | 37 ++++
.../main-app-bar/anonymous-menu.tsx | 16 ++
src/views-components/main-app-bar/help-menu.tsx | 10 +-
.../main-app-bar/main-app-bar.test.tsx | 104 ----------
src/views-components/main-app-bar/main-app-bar.tsx | 129 ++++---------
.../main-app-bar/notifications-menu.tsx | 23 +++
.../main-content-bar/main-content-bar.tsx | 32 ++++
src/views-components/side-panel/side-panel.tsx | 23 +--
src/views/workbench/workbench.tsx | 209 ++++++++-------------
16 files changed, 344 insertions(+), 411 deletions(-)
create mode 100644 src/store/current-token-dialog/current-token-dialog-actions.tsx
create mode 100644 src/views-components/main-app-bar/account-menu.tsx
create mode 100644 src/views-components/main-app-bar/anonymous-menu.tsx
delete mode 100644 src/views-components/main-app-bar/main-app-bar.test.tsx
create mode 100644 src/views-components/main-app-bar/notifications-menu.tsx
create mode 100644 src/views-components/main-content-bar/main-content-bar.tsx
via ff74ff70ced6e15e0c70735bbd54ca7acadb6185 (commit)
via 0d6ec80f58aa00e9542f4c69cba872016baa14d6 (commit)
via 2f876eb97698de8825c0a3fe95ed57e5e00584a7 (commit)
via eaad304f732e9194380786be8805cdbf355d6c46 (commit)
via 16881157c9e5097ab8d6107a68abeb3e8d8f6d83 (commit)
via 84befca1b91fc8feeb3258e86ac1a981d47ef914 (commit)
via d171dc7d61d9ab3d952bb5038b2d47dbeaaa8ba2 (commit)
via 23b0c2abcd8913e6518f21c2c6a399751455cda0 (commit)
via 32a1e3897561f23b792d67af49c3c3e332f1ea47 (commit)
via de26557e0542c8a003fddc11831cb3646bf5512f (commit)
via e6079cd17a140bb75d4b104161902d487823aa36 (commit)
via 335bd7cfdc7f978089613a3f4a991f05229c1365 (commit)
via bae676cf6c9130ec6ef9708b86343024d11034b2 (commit)
via cee5fc55b8b13217ac9aa540d74375a59afbb49a (commit)
from a950096809e19f48ec006651227222d60e4fa86c (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 ff74ff70ced6e15e0c70735bbd54ca7acadb6185
Merge: a950096 0d6ec80
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Sep 10 09:39:28 2018 +0200
Merge branch '14149-change-app-bar-layout'
refs #14149
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
commit 0d6ec80f58aa00e9542f4c69cba872016baa14d6
Merge: 2f876eb a950096
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Mon Sep 10 09:39:14 2018 +0200
Merge branch 'master'
Feature #14149
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --cc src/index.tsx
index e982b45,8ab089a..a76a86a
--- 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 a166473,f202b69..4d231a0
--- 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());
}
+
}
)
);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list