[ARVADOS-WORKBENCH2] updated: 1.2.0-374-g12fbb73

Git user git at public.curoverse.com
Thu Sep 13 06:08:10 EDT 2018


Summary of changes:
 src/components/code-snippet/code-snippet.tsx       |  11 +-
 .../default-code-snippet/default-code-snippet.tsx  |   6 +-
 src/components/icon/icon.tsx                       |   2 +
 src/services/api/filter-builder.test.ts            |   8 +-
 src/services/api/filter-builder.ts                 |  14 ++-
 src/store/context-menu/context-menu-actions.ts     |   9 +-
 src/store/processes/process-command-actions.ts     |  27 +++++
 src/store/processes/process-update-actions.ts      |  54 ++++++++++
 .../trash-panel/trash-panel-middleware-service.ts  |   6 +-
 src/store/workbench/workbench-actions.ts           |  19 +++-
 src/validators/validators.tsx                      |   2 +
 .../context-menu/action-sets/process-action-set.ts |   8 +-
 .../action-sets/process-resource-action-set.ts     |   5 +-
 .../dialog-forms/update-process-dialog.ts          |  20 ++++
 .../dialog-update/dialog-process-update.tsx        |  24 +++++
 .../form-fields/process-form-fields.tsx            |  15 +++
 .../process-command-dialog.tsx                     |  46 ++++++++
 .../side-panel-button/side-panel-button.tsx        | 120 +++++++++++++++++++++
 src/views-components/side-panel/side-panel.tsx     |   8 +-
 .../process-log-panel/process-log-code-snippet.tsx |  25 +++--
 .../process-log-panel/process-log-main-card.tsx    |  49 +++++----
 .../process-log-panel/process-log-panel-root.tsx   |   5 +-
 src/views/process-log-panel/process-log-panel.tsx  |   8 +-
 src/views/process-panel/process-panel-root.tsx     |  10 +-
 src/views/process-panel/process-panel.tsx          |   4 +-
 src/views/process-panel/process-subprocesses.tsx   |   6 +-
 src/views/project-panel/project-panel.tsx          |  25 +----
 src/views/trash-panel/trash-panel.tsx              |   5 -
 src/views/workbench/workbench.tsx                  |  60 +++++------
 29 files changed, 459 insertions(+), 142 deletions(-)
 create mode 100644 src/store/processes/process-command-actions.ts
 create mode 100644 src/store/processes/process-update-actions.ts
 create mode 100644 src/views-components/dialog-forms/update-process-dialog.ts
 create mode 100644 src/views-components/dialog-update/dialog-process-update.tsx
 create mode 100644 src/views-components/form-fields/process-form-fields.tsx
 create mode 100644 src/views-components/process-command-dialog/process-command-dialog.tsx
 create mode 100644 src/views-components/side-panel-button/side-panel-button.tsx

       via  12fbb73269d10424383cdbd712201498cc8d013a (commit)
       via  29280b2ea824414bb703ac8b63cf3f90f72aea62 (commit)
       via  78fd0936352c6f50f06bd0c6f9973bccc1ac0d51 (commit)
       via  8fb1b7d964d128c28ddf0208e1a488f46136d501 (commit)
       via  a899e5b123e98cf4e7c211ef2137dceb2510946f (commit)
       via  f79c7407429a38dfe3c274e886983d8e3ea0fdaa (commit)
       via  3263f15e7742236185e2b8e5203d1becc8bfdcf1 (commit)
       via  85e475c8001d2d4a0b12aa854923ed3eef416066 (commit)
       via  89efe3a344e0850cf7e401142d2a838cbc825ffb (commit)
       via  1102aee7bf5d72c344f065e68ad3dc3038e9ca4a (commit)
       via  ecfa844eeff535078ca59f8baa0915052932338c (commit)
       via  151c8c646b7fd78fc9ca2b8174eae11bce67873f (commit)
       via  4f1696f1ad1544981a6492071bd168c7dd34f839 (commit)
       via  1534032e710b57106297576edb28e84b652a76f0 (commit)
       via  a64738bc0cc2dde8b7183bcefe2320ae9cc50ed9 (commit)
       via  8ff3c558698ed01fbca057ff876935470c358e65 (commit)
       via  4752bffbcf5d0e1fc16f4bb2e7934c348834dd9c (commit)
       via  eb2560b06f58e029b63a169a6809ba514ceab072 (commit)
      from  3853f85e670483e3afa3a15101ea391cac2ba8ec (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 12fbb73269d10424383cdbd712201498cc8d013a
Merge: 3853f85 29280b2
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Thu Sep 13 12:08:01 2018 +0200

    merge master
    
    Feature #14186
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --cc src/views/workbench/workbench.tsx
index e5d26a2,db38957..a24a8c9
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -39,11 -40,11 +40,12 @@@ import { MoveCollectionDialog } from '~
  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 { MainContentBar } from '~/views-components/main-content-bar/main-content-bar';
  import { Grid } from '@material-ui/core';
 +import { WorkbenchProgress } from '~/views-components/progress/workbench-progress';
+ import { ProcessCommandDialog } from '~/views-components/process-command-dialog/process-command-dialog';
  
- type CssRules = 'root' | 'contentWrapper' | 'content' | 'appBar';
+ type CssRules = 'root' | 'asidePanel' | 'contentWrapper' | 'content' | 'appBar';
  
  const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
      root: {
@@@ -108,27 -110,15 +111,16 @@@ export const Workbench = withStyles(sty
                                  buildInfo={this.props.buildInfo} />
                          </Grid>
                          {this.props.user &&
-                             <Grid
-                                 container
-                                 item
-                                 xs
-                                 alignItems="stretch"
-                                 wrap="nowrap">
-                                 <Grid item>
+                             <Grid container item xs alignItems="stretch" wrap="nowrap">
+                                 <Grid container item xs component='aside' direction='column' className={classes.asidePanel}>
                                      <SidePanel />
                                  </Grid>
-                                 <Grid
-                                     container
-                                     item
-                                     xs
-                                     component="main"
-                                     direction="column"
-                                     className={this.props.classes.contentWrapper}>
+                                 <Grid container item xs component="main" direction="column" className={classes.contentWrapper}>
                                      <Grid item>
 +                                        <WorkbenchProgress />
                                          <MainContentBar />
                                      </Grid>
-                                     <Grid item xs className={this.props.classes.content}>
+                                     <Grid item xs className={classes.content}>
                                          <Switch>
                                              <Route path={Routes.PROJECTS} component={ProjectPanel} />
                                              <Route path={Routes.COLLECTIONS} component={CollectionPanel} />

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list