X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f4ed762732e8f5d2f7c4c08d5efbe92d4bce7f16..4476731a9ec985c5abd97da453978af0dfa4406b:/src/views/workbench/workbench.tsx?ds=sidebyside
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 38de88b3..856a626c 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -23,12 +23,12 @@ import { ItemMode, setProjectItem } from "~/store/navigation/navigation-action";
import { projectActions } from "~/store/project/project-action";
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';
@@ -37,21 +37,24 @@ import { favoritePanelActions } from '~/store/favorite-panel/favorite-panel-acti
import { CollectionPanel } from '../collection-panel/collection-panel';
import { loadCollection, loadCollectionTags } from '~/store/collection-panel/collection-panel-action';
import { getCollectionUrl } from '~/models/collection';
-import { COLLECTION_CREATE_FORM_NAME, openCreateModal } from '~/store/collections/collection-create-actions';
+
+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 { UpdateProjectDialog } from '~/views-components/update-project-dialog/update-project-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 { 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 { ProjectCopyDialog } from '~/views-components/project-copy-project-dialog/project-copy-project-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;
const APP_BAR_HEIGHT = 100;
@@ -236,6 +239,7 @@ export const Workbench = withStyles(styles)(
+
{user && }
@@ -246,9 +250,8 @@ export const Workbench = withStyles(styles)(
-
-
+
@@ -263,6 +266,20 @@ export const Workbench = withStyles(styles)(
);
}
+ renderProcessPanel = (props: RouteComponentProps<{ id: string }>) => {
+ return a;
+ }}
+ onContextMenu={(event, item) => {
+ this.openContextMenu(event, {
+ uuid: 'item.uuid',
+ name: 'item.name',
+ description: 'item.description',
+ kind: ContextMenuKind.PROCESS
+ });
+ }}
+ {...props} />
+
renderCollectionPanel = (props: RouteComponentProps<{ id: string }>) => {
this.props.dispatch(loadCollection(collectionId));
@@ -379,13 +396,13 @@ export const Workbench = withStyles(styles)(
}
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(openProjectCreateDialog(itemUuid));
}
handleCollectionCreationDialogOpen = (itemUuid: string) => {
this.props.dispatch(reset(COLLECTION_CREATE_FORM_NAME));
- this.props.dispatch(openCreateModal());
+ this.props.dispatch(openCollectionCreateDialog(itemUuid));
}
openContextMenu = (event: React.MouseEvent, resource: { name: string; uuid: string; description?: string; kind: ContextMenuKind; }) => {