Merge branch 'master' into 13858-process-view-information-card
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 27 Aug 2018 11:52:38 +0000 (13:52 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 27 Aug 2018 11:52:38 +0000 (13:52 +0200)
refs #13858

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

1  2 
src/views/workbench/workbench.tsx

index 7b9701ad4678fcd72b68678db2634ec3846520d9,973788b70663412ae465059b66c8442daf341255..4640323f0923b863fd3f5e24a3754a4b9d522982
@@@ -21,39 -21,39 +21,40 @@@ import { sidePanelActions } from '~/sto
  import { SidePanel, SidePanelItem } from '~/components/side-panel/side-panel';
  import { ItemMode, setProjectItem } from "~/store/navigation/navigation-action";
  import { projectActions } from "~/store/project/project-action";
- import { collectionCreateActions } from '~/store/collections/creator/collection-creator-action';
- import { ProjectPanel } from "~/views/project-panel/project-panel";
  import { DetailsPanel } from '~/views-components/details-panel/details-panel';
  import { ArvadosTheme } from '~/common/custom-theme';
- import { CreateProjectDialog } from "~/views-components/create-project-dialog/create-project-dialog";
  
  import { detailsPanelActions, loadDetails } from "~/store/details-panel/details-panel-action";
  import { contextMenuActions } from "~/store/context-menu/context-menu-actions";
  import { ProjectResource } from '~/models/project';
  import { ResourceKind } from '~/models/resource';
 +import { ProcessPanel } from '~/views/process-panel/process-panel';
  import { ContextMenu, ContextMenuKind } from "~/views-components/context-menu/context-menu";
  import { FavoritePanel } from "../favorite-panel/favorite-panel";
  import { CurrentTokenDialog } from '~/views-components/current-token-dialog/current-token-dialog';
  import { Snackbar } from '~/views-components/snackbar/snackbar';
  import { favoritePanelActions } from '~/store/favorite-panel/favorite-panel-action';
- import { CreateCollectionDialog } from '~/views-components/create-collection-dialog/create-collection-dialog';
  import { CollectionPanel } from '../collection-panel/collection-panel';
  import { loadCollection, loadCollectionTags } from '~/store/collection-panel/collection-panel-action';
  import { getCollectionUrl } from '~/models/collection';
- import { UpdateCollectionDialog } from '~/views-components/update-collection-dialog/update-collection-dialog.';
- import { UpdateProjectDialog } from '~/views-components/update-project-dialog/update-project-dialog';
+ import { PROJECT_CREATE_FORM_NAME, openProjectCreateDialog } from '~/store/projects/project-create-actions';
+ import { COLLECTION_CREATE_FORM_NAME, openCollectionCreateDialog } from '~/store/collections/collection-create-actions';
+ import { CreateCollectionDialog } from '~/views-components/dialog-forms/create-collection-dialog';
+ import { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-dialog';
+ import { CreateProjectDialog } from '~/views-components/dialog-forms/create-project-dialog';
+ import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
+ import { ProjectPanel } from "~/views/project-panel/project-panel";
  import { AuthService } from "~/services/auth-service/auth-service";
  import { RenameFileDialog } from '~/views-components/rename-file-dialog/rename-file-dialog';
  import { FileRemoveDialog } from '~/views-components/file-remove-dialog/file-remove-dialog';
  import { MultipleFilesRemoveDialog } from '~/views-components/file-remove-dialog/multiple-files-remove-dialog';
  import { DialogCollectionCreateWithSelectedFile } from '~/views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected';
- import { COLLECTION_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-collection-create';
- import { PROJECT_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-project-create';
  import { UploadCollectionFilesDialog } from '~/views-components/upload-collection-files-dialog/upload-collection-files-dialog';
- import { CollectionPartialCopyDialog } from '../../views-components/collection-partial-copy-dialog/collection-partial-copy-dialog';
- import { MoveProjectDialog } from '~/views-components/move-project-dialog/move-project-dialog';
- import { MoveCollectionDialog } from '~/views-components/move-collection-dialog/move-collection-dialog';
+ import { CollectionPartialCopyDialog } from '~/views-components/collection-partial-copy-dialog/collection-partial-copy-dialog';
+ import { MoveProjectDialog } from '~/views-components/dialog-forms/move-project-dialog';
+ import { MoveCollectionDialog } from '~/views-components/dialog-forms/move-collection-dialog';
  import { CopyCollectionDialog } from '~/views-components/dialog-forms/copy-collection-dialog';
  
  const DRAWER_WITDH = 240;
@@@ -239,7 -239,6 +240,7 @@@ export const Workbench = withStyles(sty
                                      <Route path="/projects/:id" render={this.renderProjectPanel} />
                                      <Route path="/favorites" render={this.renderFavoritePanel} />
                                      <Route path="/collections/:id" render={this.renderCollectionPanel} />
 +                                    <Route path="/process/:id" render={this.renderProcessPanel} />
                                  </Switch>
                              </div>
                              {user && <DetailsPanel />}
                  );
              }
  
 +            renderProcessPanel = (props: RouteComponentProps<{ id: string }>) => <ProcessPanel
 +                onItemRouteChange={(processId) => {
 +                    return <span>a</span>;
 +                }}
 +                onContextMenu={(event, item) => {
 +                    this.openContextMenu(event, {
 +                        uuid: item.uuid,
 +                        name: item.name,
 +                        description: item.description,
 +                        kind: ContextMenuKind.COLLECTION
 +                    });
 +                }}
 +                {...props} />
 +
              renderCollectionPanel = (props: RouteComponentProps<{ id: string }>) => <CollectionPanel
                  onItemRouteChange={(collectionId) => {
                      this.props.dispatch<any>(loadCollection(collectionId));
              }
  
              handleProjectCreationDialogOpen = (itemUuid: string) => {
-                 this.props.dispatch(reset(PROJECT_CREATE_DIALOG));
-                 this.props.dispatch(projectActions.OPEN_PROJECT_CREATOR({ ownerUuid: itemUuid }));
+                 this.props.dispatch(reset(PROJECT_CREATE_FORM_NAME));
+                 this.props.dispatch<any>(openProjectCreateDialog(itemUuid));
              }
  
              handleCollectionCreationDialogOpen = (itemUuid: string) => {
-                 this.props.dispatch(reset(COLLECTION_CREATE_DIALOG));
-                 this.props.dispatch(collectionCreateActions.OPEN_COLLECTION_CREATOR({ ownerUuid: itemUuid }));
+                 this.props.dispatch(reset(COLLECTION_CREATE_FORM_NAME));
+                 this.props.dispatch<any>(openCollectionCreateDialog(itemUuid));
              }
  
              openContextMenu = (event: React.MouseEvent<HTMLElement>, resource: { name: string; uuid: string; description?: string; kind: ContextMenuKind; }) => {