changed names

Feature #14231

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

diff --git a/src/store/workflow-tree-picker/workflow-tree-picker-actions.ts b/src/store/workflow-tree-picker/workflow-tree-picker-actions.ts
index 6fd66ec1e8bf7c1ff39760de3cad19a3809b1964..5bc8076d64f015170fb62bba7f8f5ca99131cc08 100644 (file)
--- a/src/store/workflow-tree-picker/workflow-tree-picker-actions.ts
+++ b/src/store/workflow-tree-picker/workflow-tree-picker-actions.ts
@@ -6,7 +6,7 @@ import { unionize, ofType, UnionOf } from "~/common/unionize";
 
 import { TreePickerNode } from "./workflow-tree-picker";
 
-export const workflowTreePickerActions = unionize({
+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 }>(),
@@ -15,4 +15,4 @@ export const workflowTreePickerActions = unionize({
     RESET_TREE_PICKER: ofType<{ pickerId: string }>()
 });
 
-export type WorkflowTreePickerAction = UnionOf<typeof workflowTreePickerActions>;
+export type FileTreePickerAction = UnionOf<typeof fileTreePickerActions>;

diff --git a/src/store/workflow-tree-picker/workflow-tree-picker-reducer.ts b/src/store/workflow-tree-picker/workflow-tree-picker-reducer.ts
index a0c2d48661dd134ee045790cd73708dcb805e28b..c1fbaac8727de7e0c9906efab7cbd731992b8825 100644 (file)
--- a/src/store/workflow-tree-picker/workflow-tree-picker-reducer.ts
+++ b/src/store/workflow-tree-picker/workflow-tree-picker-reducer.ts
@@ -4,13 +4,13 @@
 
 import { createTree, setNodeValueWith, TreeNode, setNode, mapTreeValues, Tree } from "~/models/tree";
 import { TreePicker, TreePickerNode } from "./workflow-tree-picker";
-import { workflowTreePickerActions, WorkflowTreePickerAction } from "./workflow-tree-picker-actions";
+import { fileTreePickerActions, FileTreePickerAction } from "./workflow-tree-picker-actions";
 import { TreeItemStatus } from "~/components/tree/tree";
 import { compose } from "redux";
 import { getNode } from '~/models/tree';
 
-export const workflowTreePickerReducer = (state: TreePicker = {}, action: WorkflowTreePickerAction) =>
-    workflowTreePickerActions.match(action, {
+export const workflowTreePickerReducer = (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 }) =>

diff --git a/src/views-components/dialog-file-selection/dialog-file-selection.tsx b/src/views-components/dialog-file-selection/dialog-file-selection.tsx
index 6521e2be41abc9f5a32dcc2541ac1ec4eb6598e2..e7185c05606c3511eeca032de2c0b508af26524a 100644 (file)
--- a/src/views-components/dialog-file-selection/dialog-file-selection.tsx
+++ b/src/views-components/dialog-file-selection/dialog-file-selection.tsx
@@ -8,7 +8,7 @@ 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 { WorkflowTreePickerField } from '~/views-components/workflow-tree-picker/workflow-tree-picker';
+import { FileTreePickerField } from '~/views-components/file-tree-picker/file-tree-picker';
 
 type FileSelectionProps = WithDialogProps<{}> & InjectedFormProps<CollectionCreateFormDialogData>;
 
@@ -24,6 +24,6 @@ const FileSelectionFields = () =>
     <Field
         name='tree'
         validate={FILES_FIELD_VALIDATION}
-        component={WorkflowTreePickerField} />;
+        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
index 7c883cbf91800e54d7817e4d4e8937982c5aac51..4a3f2afeca29887e676912fdf78531159b412a81 100644 (file)
--- a/src/views-components/dialog-forms/file-selection-dialog.ts
+++ b/src/views-components/dialog-forms/file-selection-dialog.ts
@@ -14,6 +14,7 @@ export const FileSelectionDialog = compose(
     reduxForm({
         form: FILE_SELECTION,
         onSubmit: (data, dispatch) => {
+            console.log(data);
             dispatch(dialogActions.CLOSE_DIALOG({ id: FILE_SELECTION }));
             return data;
         }

diff --git a/src/views-components/workflow-tree-picker/workflow-tree-picker.tsx b/src/views-components/file-tree-picker/file-tree-picker.tsx
similarity index 77%
rename from src/views-components/workflow-tree-picker/workflow-tree-picker.tsx
rename to src/views-components/file-tree-picker/file-tree-picker.tsx
index a765f815eeb50e520cf3457cfc598c718f31c3b6..802928dc3f202c5458eae3caf355bd6755585ae3 100644 (file)
--- a/src/views-components/workflow-tree-picker/workflow-tree-picker.tsx
+++ b/src/views-components/file-tree-picker/file-tree-picker.tsx
@@ -6,10 +6,10 @@ import * as React from "react";
 import { Dispatch } from "redux";
 import { connect } from "react-redux";
 import { Typography } from "@material-ui/core";
-import { MainWorkflowTreePicker, MainWorkflowTreePickerProps } from "./main-workflow-tree-picker";
+import { MainFileTreePicker, MainFileTreePickerProps } from "./main-file-tree-picker";
 import { TreeItem, TreeItemStatus } from "~/components/tree/tree";
 import { ProjectResource } from "~/models/project";
-import { workflowTreePickerActions } from "~/store/workflow-tree-picker/workflow-tree-picker-actions";
+import { fileTreePickerActions } from "~/store/workflow-tree-picker/workflow-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";
@@ -21,14 +21,14 @@ 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 WorkflowTreePickerProps = Pick<MainWorkflowTreePickerProps, 'onContextMenu' | 'toggleItemActive' | 'toggleItemOpen'>;
+type FileTreePickerProps = Pick<MainFileTreePickerProps, 'onContextMenu' | 'toggleItemActive' | 'toggleItemOpen'>;
 
-const mapDispatchToProps = (dispatch: Dispatch, props: { onChange: (projectUuid: string) => void }): WorkflowTreePickerProps => ({
+const mapDispatchToProps = (dispatch: Dispatch, props: { onChange: (projectUuid: string) => void }): FileTreePickerProps => ({
     onContextMenu: () => { return; },
     toggleItemActive: (nodeId, status, pickerId) => {
         getNotSelectedTreePickerKind(pickerId)
-            .forEach(pickerId => dispatch(workflowTreePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId: '', pickerId })));
-        dispatch(workflowTreePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId }));
+            .forEach(pickerId => dispatch(fileTreePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId: '', pickerId })));
+        dispatch(fileTreePickerActions.TOGGLE_TREE_PICKER_NODE_SELECT({ nodeId, pickerId }));
 
         props.onChange(nodeId);
     },
@@ -48,7 +48,7 @@ const toggleItemOpen = (nodeId: string, status: TreeItemStatus, pickerId: string
                 // TODO: load sharedWithMe
             }
         } else {
-            dispatch(workflowTreePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId }));
+            dispatch(fileTreePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId }));
         }
     };
 
@@ -62,20 +62,18 @@ enum TreePickerId {
     FAVORITES = 'Favorites'
 }
 
-export const WorkflowTreePicker = connect(undefined, mapDispatchToProps)((props: WorkflowTreePickerProps) =>
+export const WorkflowTreePicker = connect(undefined, mapDispatchToProps)((props: FileTreePickerProps) =>
     <div style={{ display: 'flex', flexDirection: 'column' }}>
         <div style={{ flexGrow: 1, overflow: 'auto' }}>
-            <MainWorkflowTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.PROJECTS} />
-            <MainWorkflowTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.SHARED_WITH_ME} />
-            <MainWorkflowTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.FAVORITES} />
+            <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) => {
-        console.log(nodeId);
-        console.log(extractUuidKind(nodeId));
-        dispatch(workflowTreePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.PROJECTS }));
+        dispatch(fileTreePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.PROJECTS }));
 
         const ownerUuid = nodeId.length === 0 ? services.authService.getUuid() || '' : nodeId;
 
@@ -84,6 +82,7 @@ export const loadProjectTreePicker = (nodeId: string) =>
             .addEqual('ownerUuid', ownerUuid)
             .getFilters();
 
+            // TODO: loadfiles from collections
         const { items } = (extractUuidKind(nodeId) === ResourceKind.COLLECTION)
             ? dispatch<any>(loadCollectionFiles(nodeId))
             : await services.groupsService.contents(ownerUuid, { filters });
@@ -96,12 +95,12 @@ export const loadFavoriteTreePicker = (nodeId: string) =>
         const parentId = services.authService.getUuid() || '';
 
         if (nodeId === '') {
-            dispatch(workflowTreePickerActions.LOAD_TREE_PICKER_NODE({ nodeId: parentId, pickerId: TreePickerId.FAVORITES }));
+            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(workflowTreePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.FAVORITES }));
+            dispatch(fileTreePickerActions.LOAD_TREE_PICKER_NODE({ nodeId, pickerId: TreePickerId.FAVORITES }));
             const filters = new FilterBuilder()
                 .addEqual('ownerUuid', nodeId)
                 .getFilters();
@@ -149,16 +148,16 @@ const renderTreeItem = (item: TreeItem<ProjectResource>) =>
 
 export const receiveTreePickerData = (nodeId: string, items: GroupContentsResource[] = [], pickerId: string) =>
     (dispatch: Dispatch) => {
-        dispatch(workflowTreePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
+        dispatch(fileTreePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
             nodeId,
             nodes: items.map(item => createTreePickerNode({ nodeId: item.uuid, value: item })),
             pickerId,
         }));
 
-        dispatch(workflowTreePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId }));
+        dispatch(fileTreePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ nodeId, pickerId }));
     };
 
-export const WorkflowTreePickerField = (props: WrappedFieldProps) =>
+export const FileTreePickerField = (props: WrappedFieldProps) =>
     <div style={{ height: '200px', display: 'flex', flexDirection: 'column' }}>
         <WorkflowTreePicker onChange={handleChange(props)} />
         {props.meta.dirty && props.meta.error &&

diff --git a/src/views-components/workflow-tree-picker/main-workflow-tree-picker.ts b/src/views-components/file-tree-picker/main-file-tree-picker.ts
similarity index 83%
rename from src/views-components/workflow-tree-picker/main-workflow-tree-picker.ts
rename to src/views-components/file-tree-picker/main-file-tree-picker.ts
index 4868160a6c81159fde6c12ba7ca67d2d2c8cc7fd..065a6d6405a56565d9e33c8863599799b2ed8dec 100644 (file)
--- a/src/views-components/workflow-tree-picker/main-workflow-tree-picker.ts
+++ b/src/views-components/file-tree-picker/main-file-tree-picker.ts
@@ -9,7 +9,7 @@ import { createTreePickerNode, TreePickerNode } from "~/store/workflow-tree-pick
 import { getNodeValue, getNodeChildrenIds, Tree as Ttree, createTree } from "~/models/tree";
 import { Dispatch } from "redux";
 
-export interface MainWorkflowTreePickerProps {
+export interface MainFileTreePickerProps {
     pickerId: string;
     onContextMenu: (event: React.MouseEvent<HTMLElement>, nodeId: string, pickerId: string) => void;
     toggleItemOpen: (nodeId: string, status: TreeItemStatus, pickerId: string) => void;
@@ -19,7 +19,7 @@ export interface MainWorkflowTreePickerProps {
 const memoizedMapStateToProps = () => {
     let prevTree: Ttree<TreePickerNode>;
     let mappedProps: Pick<TreeProps<any>, 'items'>;
-    return (state: RootState, props: MainWorkflowTreePickerProps): 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;
@@ -32,13 +32,13 @@ const memoizedMapStateToProps = () => {
     };
 };
 
-const mapDispatchToProps = (dispatch: Dispatch, props: MainWorkflowTreePickerProps): Pick<TreeProps<any>, 'onContextMenu' | 'toggleItemOpen' | 'toggleItemActive'> => ({
+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 MainWorkflowTreePicker = connect(memoizedMapStateToProps(), mapDispatchToProps)(Tree);
+export const MainFileTreePicker = connect(memoizedMapStateToProps(), mapDispatchToProps)(Tree);
 
 const treePickerToTreeItems = (tree: Ttree<TreePickerNode>) =>
     (id: string): TreeItem<any> => {

diff --git a/src/views/workflow-panel/workflow-panel-view.tsx b/src/views/workflow-panel/workflow-panel-view.tsx
index ec91f3c7174fdc1ae8d6f754c1c45c4e9842c247..8d21f33588be7c6d85fdbde995064e13c2c21127 100644 (file)
--- a/src/views/workflow-panel/workflow-panel-view.tsx
+++ b/src/views/workflow-panel/workflow-panel-view.tsx
@@ -103,7 +103,7 @@ export const workflowPanelColumns: DataColumns<string, WorkflowPanelFilter> = [
     }
 ];
 
-export const WorkflowPanelView = ({...props}) => {
+export const WorkflowPanelView = ({ ...props }) => {
     return <Grid container spacing={16}>
         <Grid item xs={6}>
             <DataExplorer
@@ -111,11 +111,11 @@ export const WorkflowPanelView = ({...props}) => {
                 onRowClick={props.handleRowClick}
                 onRowDoubleClick={props.handleRowDoubleClick}
                 contextMenuColumn={false}
-                onContextMenu={e=>e}
+                onContextMenu={e => e}
                 dataTableDefaultView={<DataTableDefaultView icon={WorkflowIcon} />} />
         </Grid>
         <Grid item xs={6}>
-            <Paper>
+            <Paper style={{ height: '100%' }}>
                 <WorkflowDetailsCard />
             </Paper>
         </Grid>