Merge branch 'master' into 14129-inputs-modal-new
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Thu, 8 Nov 2018 13:35:02 +0000 (14:35 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Thu, 8 Nov 2018 13:35:02 +0000 (14:35 +0100)
refs #14129

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

1  2 
src/views-components/context-menu/action-sets/process-action-set.ts
src/views/process-panel/process-information-card.tsx
src/views/workbench/workbench.tsx

index 32d78e30c0c79f6b4bc66fe358dc5b6a7b702449,f1b21bf44df42b3c28a3ed6753afbe43bf3f5c80..5db50dd50d85a86f61cdc94d9b05c0b65415c2da
@@@ -18,7 -18,6 +18,7 @@@ import { openProcessCommandDialog } fro
  import { detailsPanelActions } from '~/store/details-panel/details-panel-action';
  import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions";
  import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
 +import { openProcessInputDialog } from "~/store/processes/process-input-actions";
  
  export const processActionSet: ContextMenuActionSet = [[
      {
              dispatch<any>(openSharingDialog(uuid));
          }
      },
-     {
-         icon: MoveToIcon,
-         name: "Move to",
-         execute: (dispatch, resource) => {
-             dispatch<any>(openMoveProcessDialog(resource));
-         }
-     },
      {
          component: ToggleFavoriteAction,
          execute: (dispatch, resource) => {
              });
          }
      },
+     {
+         icon: MoveToIcon,
+         name: "Move to",
+         execute: (dispatch, resource) => {
+             dispatch<any>(openMoveProcessDialog(resource));
+         }
+     },
      {
          icon: CopyIcon,
          name: "Copy to project",
@@@ -68,7 -67,7 +68,7 @@@
          icon: InputIcon,
          name: "Inputs",
          execute: (dispatch, resource) => {
 -            // add code
 +            dispatch<any>(openProcessInputDialog(resource.uuid));
          }
      },
      {
              dispatch<any>(openProcessCommandDialog(resource.uuid));
          }
      },
-     {
-         icon: DetailsIcon,
-         name: "View details",
-         execute: dispatch => {
-             dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
-         }
-     },
      {
          icon: LogIcon,
          name: "Log",
          }
      },
      {
-         icon: ProvenanceGraphIcon,
-         name: "Provenance graph",
-         execute: (dispatch, resource) => {
-             // add code
+         icon: DetailsIcon,
+         name: "View details",
+         execute: dispatch => {
+             dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
          }
      },
+     // {
+     //     icon: ProvenanceGraphIcon,
+     //     name: "Provenance graph",
+     //     execute: (dispatch, resource) => {
+     //         // add code
+     //     }
+     // },
      {
          icon: AdvancedIcon,
          name: "Advanced",
          execute: (dispatch, resource) => {
              dispatch<any>(openAdvancedTabDialog(resource.uuid));
          }
-     },
-     {
-         icon: RemoveIcon,
-         name: "Remove",
-         execute: (dispatch, resource) => {
-             // add code
-         }
      }
+     // {
+     //     icon: RemoveIcon,
+     //     name: "Remove",
+     //     execute: (dispatch, resource) => {
+     //         // add code
+     //     }
+     // }
  ]];
index 56c1a0e52aa5d1da7b35b5e08ff3ea57f031ab0e,7fcabcbb094f279580b08f8afe01406ede0af290..e5d15e729d6d32b26f07e934d7a2fbb854c87b5d
@@@ -68,14 -68,14 +68,14 @@@ const styles: StyleRulesCallback<CssRul
  export interface ProcessInformationCardDataProps {
      process: Process;
      onContextMenu: (event: React.MouseEvent<HTMLElement>) => void;
 +    openProcessInputDialog: (uuid: string) => void;
  }
  
  type ProcessInformationCardProps = ProcessInformationCardDataProps & WithStyles<CssRules, true>;
  
  export const ProcessInformationCard = withStyles(styles, { withTheme: true })(
 -    ({ classes, process, onContextMenu, theme }: ProcessInformationCardProps) =>
 +    ({ classes, process, onContextMenu, theme, openProcessInputDialog }: ProcessInformationCardProps) =>
          <Card className={classes.card}>
 -        {console.log(process)}
              <CardHeader
                  classes={{
                      content: classes.title,
@@@ -87,7 -87,7 +87,7 @@@
                          <Chip label={getProcessStatus(process)}
                              className={classes.chip}
                              style={{ backgroundColor: getProcessStatusColor(getProcessStatus(process), theme as ArvadosTheme) }} />
-                         <Tooltip title="More options">
+                         <Tooltip title="More options" disableFocusListener>
                              <IconButton
                                  aria-label="More options"
                                  onClick={event => onContextMenu(event)}>
                      </Grid>
                      <Grid item xs={6}>
                          <DetailsAttribute classLabel={classes.link} label='Outputs' />
 -                        <DetailsAttribute classLabel={classes.link} label='Inputs' />
 +                        <span onClick={() => openProcessInputDialog(process.containerRequest.uuid)}>
 +                            <DetailsAttribute classLabel={classes.link} label='Inputs' />
 +                        </span>
                      </Grid>
                  </Grid>
              </CardContent>
index 9566945ffd131d1f4813a6ffaa52ab66059534f7,9ae1018857d2080ca83f06dffa3ae584e6e713b9..947e2b39c6930ffdd97844554146498394416505
@@@ -44,7 -44,6 +44,7 @@@ import { WorkflowPanel } from '~/views/
  import { SearchResultsPanel } from '~/views/search-results-panel/search-results-panel';
  import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog';
  import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog';
 +import { ProcessInputDialog } from '~/views-components/process-input-dialog/process-input-dialog';
  
  type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
  
@@@ -78,12 -77,23 +78,23 @@@ const styles: StyleRulesCallback<CssRul
  
  type WorkbenchPanelProps = WithStyles<CssRules>;
  
+ const defaultSplitterSize = 90;
+ const getSplitterInitialSize = () => {
+     const splitterSize = localStorage.getItem('splitterSize');
+     return splitterSize ? Number(splitterSize) : defaultSplitterSize;
+ };
+ const saveSplitterSize = (size: number) => localStorage.setItem('splitterSize', size.toString());
  export const WorkbenchPanel =
      withStyles(styles)(({ classes }: WorkbenchPanelProps) =>
          <Grid container item xs className={classes.root}>
              <Grid container item xs className={classes.container}>
                  <SplitterLayout customClassName={classes.splitter} percentage={true}
-                     primaryIndex={0} primaryMinSize={10} secondaryInitialSize={90} secondaryMinSize={40}>
+                                 primaryIndex={0} primaryMinSize={10}
+                                 secondaryInitialSize={getSplitterInitialSize()} secondaryMinSize={40}
+                                 onSecondaryPaneSizeChange={saveSplitterSize}>
                      <Grid container item xs component='aside' direction='column' className={classes.asidePanel}>
                          <SidePanel />
                      </Grid>
              <MultipleFilesRemoveDialog />
              <PartialCopyCollectionDialog />
              <ProcessCommandDialog />
 +            <ProcessInputDialog />
              <RenameFileDialog />
              <RichTextEditorDialog />
              <SharingDialog />
              <UpdateProcessDialog />
              <UpdateProjectDialog />
          </Grid>
-     );
+     );