merge conflicts
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 2 Oct 2018 13:18:52 +0000 (15:18 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 2 Oct 2018 13:18:52 +0000 (15:18 +0200)
Feature #14231

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

15 files changed:
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
src/store/collections/collection-move-actions.ts
src/store/file-selection/file-selection-actions.ts [new file with mode: 0644]
src/store/file-tree-picker/file-tree-picker-actions.ts [new file with mode: 0644]
src/store/file-tree-picker/file-tree-picker-reducer.ts [new file with mode: 0644]
src/store/file-tree-picker/file-tree-picker.ts [new file with mode: 0644]
src/store/store.ts
src/store/workbench/workbench-actions.ts
src/views-components/dialog-file-selection/dialog-file-selection.tsx [new file with mode: 0644]
src/views-components/dialog-forms/file-selection-dialog.ts [new file with mode: 0644]
src/views-components/file-tree-picker/file-tree-picker.tsx [new file with mode: 0644]
src/views-components/file-tree-picker/main-file-tree-picker.ts [new file with mode: 0644]
src/views/login-panel/login-panel.tsx
src/views/workbench/workbench.tsx
src/views/workflow-panel/workflow-panel-view.tsx

index f214fd2f7b41297677efac451836bf09568eee1a..0460c977972059994e8d8b142bbbd528d388111d 100644 (file)
@@ -11,10 +11,8 @@ import { snackbarActions } from "../../snackbar/snackbar-actions";
 import { dialogActions } from '../../dialog/dialog-actions';
 import { getNodeValue } from "~/models/tree";
 import { filterCollectionFilesBySelection } from './collection-panel-files-state';
-import { startSubmit, initialize, stopSubmit, reset } from 'redux-form';
-import { getCommonResourceServiceError, CommonResourceServiceError } from "~/services/common-service/common-resource-service";
+import { startSubmit, stopSubmit, reset } from 'redux-form';
 import { getDialog } from "~/store/dialog/dialog-reducer";
-import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
 
 export const collectionPanelFilesAction = unionize({
     SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),
index 9bdc5523793a789a2df2b8329abe2b188117be5c..54508e139f2b2b35bdfb14fb0bdfe805c1c3847e 100644 (file)
@@ -8,7 +8,7 @@ import { startSubmit, stopSubmit, initialize } from 'redux-form';
 import { ServiceRepository } from '~/services/services';
 import { RootState } from '~/store/store';
 import { getCommonResourceServiceError, CommonResourceServiceError } from "~/services/common-service/common-resource-service";
-import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
+import { snackbarActions } from '~/store/snackbar/snackbar-actions';
 import { projectPanelActions } from '~/store/project-panel/project-panel-action';
 import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
 import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
@@ -32,11 +32,6 @@ export const moveCollection = (resource: MoveToFormDialogData) =>
             await services.collectionService.update(resource.uuid, { ...collection, ownerUuid: resource.ownerUuid });
             dispatch(projectPanelActions.REQUEST_ITEMS());
             dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_MOVE_FORM_NAME }));
-            dispatch(snackbarActions.OPEN_SNACKBAR({
-                message: 'Collection has been moved',
-                hideDuration: 2000,
-                kind: SnackbarKind.SUCCESS
-            }));
             dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_MOVE_FORM_NAME));
             return collection;
         } catch (e) {
diff --git a/src/store/file-selection/file-selection-actions.ts b/src/store/file-selection/file-selection-actions.ts
new file mode 100644 (file)
index 0000000..cfdc27b
--- /dev/null
@@ -0,0 +1,15 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { Dispatch } from "redux";
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
+
+export const FILE_SELECTION = 'fileSelection';
+
+export const openFileSelectionDialog = () =>
+    (dispatch: Dispatch) => {
+        dispatch<any>(resetPickerProjectTree());
+        dispatch(dialogActions.OPEN_DIALOG({ id: FILE_SELECTION, data: {} }));
+    };
\ No newline at end of file
diff --git a/src/store/file-tree-picker/file-tree-picker-actions.ts b/src/store/file-tree-picker/file-tree-picker-actions.ts
new file mode 100644 (file)
index 0000000..18d0f5f
--- /dev/null
@@ -0,0 +1,18 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { unionize, ofType, UnionOf } from "~/common/unionize";
+
+import { TreePickerNode } from "./file-tree-picker";
+
+export const fileTreePickerActions = unionize({
+    LOAD_TREE_PICKER_NODE: ofType<{ nodeId: string, pickerId: string }>(),
+    LOAD_TREE_PICKER_NODE_SUCCESS: ofType<{ nodeId: string, nodes: Array<TreePickerNode>, pickerId: string }>(),
+    TOGGLE_TREE_PICKER_NODE_COLLAPSE: ofType<{ nodeId: string, pickerId: string }>(),
+    TOGGLE_TREE_PICKER_NODE_SELECT: ofType<{ nodeId: string, pickerId: string }>(),
+    EXPAND_TREE_PICKER_NODES: ofType<{ nodeIds: string[], pickerId: string }>(),
+    RESET_TREE_PICKER: ofType<{ pickerId: string }>()
+});
+
+export type FileTreePickerAction = UnionOf<typeof fileTreePickerActions>;
diff --git a/src/store/file-tree-picker/file-tree-picker-reducer.ts b/src/store/file-tree-picker/file-tree-picker-reducer.ts
new file mode 100644 (file)
index 0000000..59e33a9
--- /dev/null
@@ -0,0 +1,73 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { createTree, setNodeValueWith, TreeNode, setNode, mapTreeValues, Tree } from "~/models/tree";
+import { TreePicker, TreePickerNode } from "./file-tree-picker";
+import { fileTreePickerActions, FileTreePickerAction } from "./file-tree-picker-actions";
+import { TreeItemStatus } from "~/components/tree/tree";
+import { compose } from "redux";
+import { getNode } from '~/models/tree';
+
+export const fileTreePickerReducer = (state: TreePicker = {}, action: FileTreePickerAction) =>
+    fileTreePickerActions.match(action, {
+        LOAD_TREE_PICKER_NODE: ({ nodeId, pickerId }) =>
+            updateOrCreatePicker(state, pickerId, setNodeValueWith(setPending)(nodeId)),
+        LOAD_TREE_PICKER_NODE_SUCCESS: ({ nodeId, nodes, pickerId }) =>
+            updateOrCreatePicker(state, pickerId, compose(receiveNodes(nodes)(nodeId), setNodeValueWith(setLoaded)(nodeId))),
+        TOGGLE_TREE_PICKER_NODE_COLLAPSE: ({ nodeId, pickerId }) =>
+            updateOrCreatePicker(state, pickerId, setNodeValueWith(toggleCollapse)(nodeId)),
+        TOGGLE_TREE_PICKER_NODE_SELECT: ({ nodeId, pickerId }) =>
+            updateOrCreatePicker(state, pickerId, mapTreeValues(toggleSelect(nodeId))),
+        RESET_TREE_PICKER: ({ pickerId }) =>
+            updateOrCreatePicker(state, pickerId, createTree),
+        EXPAND_TREE_PICKER_NODES: ({ pickerId, nodeIds }) =>
+            updateOrCreatePicker(state, pickerId, mapTreeValues(expand(nodeIds))),
+        default: () => state
+    });
+
+const updateOrCreatePicker = (state: TreePicker, pickerId: string, func: (value: Tree<TreePickerNode>) => Tree<TreePickerNode>) => {
+    const picker = state[pickerId] || createTree();
+    const updatedPicker = func(picker);
+    return { ...state, [pickerId]: updatedPicker };
+};
+
+const expand = (ids: string[]) => (node: TreePickerNode): TreePickerNode =>
+    ids.some(id => id === node.nodeId)
+        ? { ...node, collapsed: false }
+        : node;
+
+const setPending = (value: TreePickerNode): TreePickerNode =>
+    ({ ...value, status: TreeItemStatus.PENDING });
+
+const setLoaded = (value: TreePickerNode): TreePickerNode =>
+    ({ ...value, status: TreeItemStatus.LOADED });
+
+const toggleCollapse = (value: TreePickerNode): TreePickerNode =>
+    ({ ...value, collapsed: !value.collapsed });
+
+const toggleSelect = (nodeId: string) => (value: TreePickerNode): TreePickerNode =>
+    value.nodeId === nodeId
+        ? ({ ...value, selected: !value.selected })
+        : ({ ...value, selected: false });
+
+const receiveNodes = (nodes: Array<TreePickerNode>) => (parent: string) => (state: Tree<TreePickerNode>) => {
+    const parentNode = getNode(parent)(state);
+    let newState = state;
+    if (parentNode) {
+        newState = setNode({ ...parentNode, children: [] })(state);
+    }
+    return nodes.reduce((tree, node) => {
+        const oldNode = getNode(node.nodeId)(state) || { value: {} };
+        const newNode = createTreeNode(parent)(node);
+        const value = { ...oldNode.value, ...newNode.value };
+        return setNode({ ...newNode, value })(tree);
+    }, newState);
+};
+
+const createTreeNode = (parent: string) => (node: TreePickerNode): TreeNode<TreePickerNode> => ({
+    children: [],
+    id: node.nodeId,
+    parent,
+    value: node
+});
diff --git a/src/store/file-tree-picker/file-tree-picker.ts b/src/store/file-tree-picker/file-tree-picker.ts
new file mode 100644 (file)
index 0000000..259a4b8
--- /dev/null
@@ -0,0 +1,25 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { Tree } from "~/models/tree";
+import { TreeItemStatus } from "~/components/tree/tree";
+
+export type TreePicker = { [key: string]: Tree<TreePickerNode> };
+
+export interface TreePickerNode<Value = any> {
+    nodeId: string;
+    value: Value;
+    selected: boolean;
+    collapsed: boolean;
+    status: TreeItemStatus;
+}
+
+export const createTreePickerNode = (data: { nodeId: string, value: any }) => ({
+    ...data,
+    selected: false,
+    collapsed: true,
+    status: TreeItemStatus.INITIAL
+});
+
+export const getTreePicker = <Value = {}>(id: string) => (state: TreePicker): Tree<TreePickerNode<Value>> | undefined => state[id];
\ No newline at end of file
index 21e5029a0338bd1e56512e4c0d977db3a72ec552..4c08a39c4b4a394ba1a8cde77249ab90c49bf7f1 100644 (file)
@@ -38,6 +38,7 @@ import { progressIndicatorReducer } from './progress-indicator/progress-indicato
 import { runProcessPanelReducer } from '~/store/run-process-panel/run-process-panel-reducer';
 import { WorkflowMiddlewareService } from './workflow-panel/workflow-middleware-service';
 import { WORKFLOW_PANEL_ID } from './workflow-panel/workflow-panel-actions';
+import { fileTreePickerReducer } from './file-tree-picker/file-tree-picker-reducer';
 
 const composeEnhancers =
     (process.env.NODE_ENV === 'development' &&
@@ -99,5 +100,6 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({
     fileUploader: fileUploaderReducer,
     processPanel: processPanelReducer,
     progressIndicator: progressIndicatorReducer,
+    fileTreePicker: fileTreePickerReducer,
     runProcessPanel: runProcessPanelReducer
 });
index 56e3401d5ae0e56af72463992689e9bd17323bd5..bc2a9ed688a5100f3695c0c141e1ca7917d45104 100644 (file)
@@ -48,6 +48,7 @@ import { GroupContentsResource } from '~/services/groups-service/groups-service'
 import { unionize, ofType, UnionOf, MatchCases } from '~/common/unionize';
 import { loadRunProcessPanel } from '~/store/run-process-panel/run-process-panel-actions';
 import { loadCollectionFiles } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions';
+import { SnackbarKind } from '~/store/snackbar/snackbar-actions';
 import { collectionPanelActions } from "~/store/collection-panel/collection-panel-action";
 import { CollectionResource } from "~/models/collection";
 
@@ -267,7 +268,7 @@ export const moveCollection = (data: MoveToFormDialogData) =>
             const collection = await dispatch<any>(collectionMoveActions.moveCollection(data));
             dispatch<any>(updateResources([collection]));
             dispatch<any>(reloadProjectMatchingUuid([collection.ownerUuid]));
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved.', hideDuration: 2000 }));
+            dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved.', hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
         } catch (e) {
             dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 }));
         }
diff --git a/src/views-components/dialog-file-selection/dialog-file-selection.tsx b/src/views-components/dialog-file-selection/dialog-file-selection.tsx
new file mode 100644 (file)
index 0000000..e7185c0
--- /dev/null
@@ -0,0 +1,29 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from 'react';
+import { InjectedFormProps, Field } from 'redux-form';
+import { WithDialogProps } from '~/store/dialog/with-dialog';
+import { CollectionCreateFormDialogData } from '~/store/collections/collection-create-actions';
+import { FormDialog } from '~/components/form-dialog/form-dialog';
+import { require } from '~/validators/require';
+import { FileTreePickerField } from '~/views-components/file-tree-picker/file-tree-picker';
+
+type FileSelectionProps = WithDialogProps<{}> & InjectedFormProps<CollectionCreateFormDialogData>;
+
+export const DialogFileSelection = (props: FileSelectionProps) =>
+    <FormDialog
+        dialogTitle='Choose a file'
+        formFields={FileSelectionFields}
+        submitLabel='Ok'
+        {...props}
+    />;
+
+const FileSelectionFields = () =>
+    <Field
+        name='tree'
+        validate={FILES_FIELD_VALIDATION}
+        component={FileTreePickerField} />;
+
+const FILES_FIELD_VALIDATION = [require];
\ No newline at end of file
diff --git a/src/views-components/dialog-forms/file-selection-dialog.ts b/src/views-components/dialog-forms/file-selection-dialog.ts
new file mode 100644 (file)
index 0000000..4a3f2af
--- /dev/null
@@ -0,0 +1,22 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { compose } from "redux";
+import { reduxForm } from 'redux-form';
+import { withDialog } from "~/store/dialog/with-dialog";
+import { FILE_SELECTION } from '~/store/file-selection/file-selection-actions';
+import { DialogFileSelection } from '~/views-components/dialog-file-selection/dialog-file-selection';
+import { dialogActions } from '~/store/dialog/dialog-actions';
+
+export const FileSelectionDialog = compose(
+    withDialog(FILE_SELECTION),
+    reduxForm({
+        form: FILE_SELECTION,
+        onSubmit: (data, dispatch) => {
+            console.log(data);
+            dispatch(dialogActions.CLOSE_DIALOG({ id: FILE_SELECTION }));
+            return data;
+        }
+    })
+)(DialogFileSelection);
\ No newline at end of file
diff --git a/src/views-components/file-tree-picker/file-tree-picker.tsx b/src/views-components/file-tree-picker/file-tree-picker.tsx
new file mode 100644 (file)
index 0000000..129cb75
--- /dev/null
@@ -0,0 +1,173 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from "react";
+import { Dispatch } from "redux";
+import { connect } from "react-redux";
+import { Typography } from "@material-ui/core";
+import { MainFileTreePicker, MainFileTreePickerProps } from "./main-file-tree-picker";
+import { TreeItem, TreeItemStatus } from "~/components/tree/tree";
+import { ProjectResource } from "~/models/project";
+import { fileTreePickerActions } from "~/store/file-tree-picker/file-tree-picker-actions";
+import { ListItemTextIcon } from "~/components/list-item-text-icon/list-item-text-icon";
+import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon, CollectionIcon } from '~/components/icon/icon';
+import { createTreePickerNode } from "~/store/tree-picker/tree-picker";
+import { RootState } from "~/store/store";
+import { ServiceRepository } from "~/services/services";
+import { FilterBuilder } from "~/services/api/filter-builder";
+import { WrappedFieldProps } from 'redux-form';
+import { ResourceKind, extractUuidKind } from '~/models/resource';
+import { GroupContentsResource } from '~/services/groups-service/groups-service';
+import { loadCollectionFiles } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions';
+
+type FileTreePickerProps = Pick<MainFileTreePickerProps, 'onContextMenu' | 'toggleItemActive' | 'toggleItemOpen'>;
+
+const mapDispatchToProps = (dispatch: Dispatch, props: { onChange: (projectUuid: string) => void }): FileTreePickerProps => ({
+    onContextMenu: () => { return; },
+    toggleItemActive: (nodeId, status, pickerId) => {
+        getNotSelectedTreePickerKind(pickerId)
+            .forEach(pickerId => dispatch(fileTreePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId: '', pickerId })));
+        dispatch(fileTreePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId }));
+
+        props.onChange(nodeId);
+    },
+    toggleItemOpen: (nodeId, status, pickerId) => {
+        dispatch<any>(toggleItemOpen(nodeId, status, pickerId));
+    }
+});
+
+const toggleItemOpen = (nodeId: string, status: TreeItemStatus, pickerId: string) =>
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        if (status === TreeItemStatus.INITIAL) {
+            if (pickerId === TreePickerId.PROJECTS) {
+                dispatch<any>(loadProjectTreePicker(nodeId));
+            } else if (pickerId === TreePickerId.FAVORITES) {
+                dispatch<any>(loadFavoriteTreePicker(nodeId === services.authService.getUuid() ? '' : nodeId));
+            } else {
+                // TODO: load sharedWithMe
+            }
+        } else {
+            dispatch(fileTreePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId }));
+        }
+    };
+
+const getNotSelectedTreePickerKind = (pickerId: string) => {
+    return [TreePickerId.PROJECTS, TreePickerId.FAVORITES, TreePickerId.SHARED_WITH_ME].filter(nodeId => nodeId !== pickerId);
+};
+
+enum TreePickerId {
+    PROJECTS = 'Projects',
+    SHARED_WITH_ME = 'Shared with me',
+    FAVORITES = 'Favorites'
+}
+
+export const FileTreePicker = connect(undefined, mapDispatchToProps)((props: FileTreePickerProps) =>
+    <div style={{ display: 'flex', flexDirection: 'column' }}>
+        <div style={{ flexGrow: 1, overflow: 'auto' }}>
+            <MainFileTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.PROJECTS} />
+            <MainFileTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.SHARED_WITH_ME} />
+            <MainFileTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.FAVORITES} />
+        </div>
+    </div>);
+
+export const loadProjectTreePicker = (nodeId: string) =>
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        dispatch(fileTreePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.PROJECTS }));
+
+        const ownerUuid = nodeId.length === 0 ? services.authService.getUuid() || '' : nodeId;
+
+        const filters = new FilterBuilder()
+            .addIsA("uuid", [ResourceKind.PROJECT, ResourceKind.COLLECTION])
+            .addEqual('ownerUuid', ownerUuid)
+            .getFilters();
+
+            // TODO: loadfiles from collections
+        const { items } = (extractUuidKind(nodeId) === ResourceKind.COLLECTION)
+            ? dispatch<any>(loadCollectionFiles(nodeId))
+            : await services.groupsService.contents(ownerUuid, { filters });
+
+        await dispatch<any>(receiveTreePickerData(nodeId, items, TreePickerId.PROJECTS));
+    };
+
+export const loadFavoriteTreePicker = (nodeId: string) =>
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const parentId = services.authService.getUuid() || '';
+
+        if (nodeId === '') {
+            dispatch(fileTreePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: parentId, pickerId: TreePickerId.FAVORITES }));
+            const { items } = await services.favoriteService.list(parentId);
+
+            dispatch<any>(receiveTreePickerData(parentId, items as ProjectResource[], TreePickerId.FAVORITES));
+        } else {
+            dispatch(fileTreePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.FAVORITES }));
+            const filters = new FilterBuilder()
+                .addEqual('ownerUuid', nodeId)
+                .getFilters();
+
+                const { items } = (extractUuidKind(nodeId) === ResourceKind.COLLECTION)
+                ? dispatch<any>(loadCollectionFiles(nodeId))
+                : await services.groupsService.contents(parentId, { filters });
+
+
+            dispatch<any>(receiveTreePickerData(nodeId, items, TreePickerId.FAVORITES));
+        }
+    };
+
+const getProjectPickerIcon = (item: TreeItem<ProjectResource>) => {
+    switch (item.data.name) {
+        case TreePickerId.FAVORITES:
+            return FavoriteIcon;
+        case TreePickerId.PROJECTS:
+            return ProjectsIcon;
+        case TreePickerId.SHARED_WITH_ME:
+            return ShareMeIcon;
+        default:
+            return getResourceIcon(item);
+    }
+};
+
+const getResourceIcon = (item: TreeItem<GroupContentsResource>) => {
+    switch (item.data.kind) {
+        case ResourceKind.COLLECTION:
+            return CollectionIcon;
+        case ResourceKind.PROJECT:
+            return ProjectIcon;
+        default:
+            return ProjectIcon;
+    }
+};
+
+const renderTreeItem = (item: TreeItem<ProjectResource>) =>
+    <ListItemTextIcon
+        icon={getProjectPickerIcon(item)}
+        name={item.data.name}
+        isActive={item.active}
+        hasMargin={true} />;
+
+
+export const receiveTreePickerData = (nodeId: string, items: GroupContentsResource[] = [], pickerId: string) =>
+    (dispatch: Dispatch) => {
+        dispatch(fileTreePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
+            nodeId,
+            nodes: items.map(item => createTreePickerNode({ nodeId: item.uuid, value: item })),
+            pickerId,
+        }));
+
+        dispatch(fileTreePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId }));
+    };
+
+export const FileTreePickerField = (props: WrappedFieldProps) =>
+    <div style={{ height: '200px', display: 'flex', flexDirection: 'column' }}>
+        <FileTreePicker onChange={handleChange(props)} />
+        {props.meta.dirty && props.meta.error &&
+            <Typography variant='caption' color='error'>
+                {props.meta.error}
+            </Typography>}
+    </div>;
+
+const handleChange = (props: WrappedFieldProps) => (value: string) =>
+    props.input.value === value
+        ? props.input.onChange('')
+        : props.input.onChange(value);
+
diff --git a/src/views-components/file-tree-picker/main-file-tree-picker.ts b/src/views-components/file-tree-picker/main-file-tree-picker.ts
new file mode 100644 (file)
index 0000000..dc52ea6
--- /dev/null
@@ -0,0 +1,57 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { connect } from "react-redux";
+import { Tree, TreeProps, TreeItem, TreeItemStatus } from "~/components/tree/tree";
+import { RootState } from "~/store/store";
+import { createTreePickerNode, TreePickerNode } from "~/store/file-tree-picker/file-tree-picker";
+import { getNodeValue, getNodeChildrenIds, Tree as Ttree, createTree } from "~/models/tree";
+import { Dispatch } from "redux";
+
+export interface MainFileTreePickerProps {
+    pickerId: string;
+    onContextMenu: (event: React.MouseEvent<HTMLElement>, nodeId: string, pickerId: string) => void;
+    toggleItemOpen: (nodeId: string, status: TreeItemStatus, pickerId: string) => void;
+    toggleItemActive: (nodeId: string, status: TreeItemStatus, pickerId: string) => void;
+}
+
+const memoizedMapStateToProps = () => {
+    let prevTree: Ttree<TreePickerNode>;
+    let mappedProps: Pick<TreeProps<any>, 'items'>;
+    return (state: RootState, props: MainFileTreePickerProps): Pick<TreeProps<any>, 'items'> => {
+        const tree = state.treePicker[props.pickerId] || createTree();
+        if(tree !== prevTree){
+            prevTree = tree;
+            mappedProps = {
+                items: getNodeChildrenIds('')(tree)
+                    .map(treePickerToTreeItems(tree))
+            };
+        }
+        return mappedProps;
+    };
+};
+
+const mapDispatchToProps = (dispatch: Dispatch, props: MainFileTreePickerProps): Pick<TreeProps<any>, 'onContextMenu' | 'toggleItemOpen' | 'toggleItemActive'> => ({
+    onContextMenu: (event, item) => props.onContextMenu(event, item.id, props.pickerId),
+    toggleItemActive: (id, status) => props.toggleItemActive(id, status, props.pickerId),
+    toggleItemOpen: (id, status) => props.toggleItemOpen(id, status, props.pickerId)
+});
+
+export const MainFileTreePicker = connect(memoizedMapStateToProps(), mapDispatchToProps)(Tree);
+
+const treePickerToTreeItems = (tree: Ttree<TreePickerNode>) =>
+    (id: string): TreeItem<any> => {
+        const node: TreePickerNode = getNodeValue(id)(tree) || createTreePickerNode({ nodeId: '', value: 'InvalidNode' });
+        const items = getNodeChildrenIds(node.nodeId)(tree)
+            .map(treePickerToTreeItems(tree));
+        return {
+            active: node.selected,
+            data: node.value,
+            id: node.nodeId,
+            items: items.length > 0 ? items : undefined,
+            open: !node.collapsed,
+            status: node.status
+        };
+    };
+
index 2928a94ef00265a0dc9c0c3391bb73778be3a4f0..6a9210acad79f58288f2fc9448903af750c79f10 100644 (file)
@@ -55,7 +55,7 @@ export const LoginPanel = withStyles(styles)(connect()(
     <Grid container direction="column" item xs alignItems="center" justify="center" className={classes.root}>
         <Grid item className={classes.container}>
             <Typography variant="title" align="center" className={classes.title}>
-                Welcome to the Arvados Wrokbench
+                Welcome to the Arvados Workbench
             </Typography>
             <Typography variant="body1" className={classes.content}>
                 The "Log in" button below will show you a Google sign-in page.
index fe09564392027bf76feadbaedeab48b9aac3891c..553afa4d09c3751ac5a4a8da871c0fb3eae149fd 100644 (file)
@@ -41,6 +41,7 @@ import { SharedWithMePanel } from '~/views/shared-with-me-panel/shared-with-me-p
 import { RunProcessPanel } from '~/views/run-process-panel/run-process-panel';
 import SplitterLayout from 'react-splitter-layout';
 import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel';
+import { FileSelectionDialog } from '~/views-components/dialog-forms/file-selection-dialog';
 
 type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
 
@@ -114,6 +115,7 @@ export const WorkbenchPanel =
             <CurrentTokenDialog />
             <FileRemoveDialog />
             <FileRemoveDialog />
+            <FileSelectionDialog />
             <FilesUploadCollectionDialog />
             <MoveCollectionDialog />
             <MoveProcessDialog />
index c49ec88dc7ac11996df4e20efae1f8420444c0f7..57654bc85b12aa0b4ea0abf15aec3a09d9cd524d 100644 (file)
@@ -118,10 +118,11 @@ export const WorkflowPanelView = (props: WorkflowPanelProps) => {
                 onRowClick={props.handleRowClick}
                 onRowDoubleClick={props.handleRowDoubleClick}
                 contextMenuColumn={false}
+                onContextMenu={e => e}
                 dataTableDefaultView={<DataTableDefaultView icon={WorkflowIcon} />} />
         </Grid>
         <Grid item xs={6}>
-            <Paper>
+            <Paper style={{ height: '100%' }}>
                 <WorkflowDetailsCard workflow={props.workflow} />
             </Paper>
         </Grid>