Handle portable data hashes in files

Feature #13862

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --git a/src/services/collection-service/collection-service-files-response.ts b/src/services/collection-service/collection-service-files-response.ts
index a4b527a23ab4f1d442d2bd2840f6dc7085cc9970..1a4f990c9ebf916530de3bec91feb9f3c78ce58b 100644 (file)
--- a/src/services/collection-service/collection-service-files-response.ts
+++ b/src/services/collection-service/collection-service-files-response.ts
@@ -26,7 +26,7 @@ export const sortFilesTree = (tree: Tree<CollectionDirectory | CollectionFile>)
 };
 
 export const extractFilesData = (document: Document) => {
-    const collectionUrlPrefix = /\/c=([0-9a-zA-Z\-]*)/;
+    const collectionUrlPrefix = /\/c=([^\/]*)/;
     return Array
         .from(document.getElementsByTagName('D:response'))
         .slice(1) // omit first element which is collection itself

diff --git a/src/store/tree-picker/tree-picker-actions.ts b/src/store/tree-picker/tree-picker-actions.ts
index 06f73c3407c7eec40d62cc6b0d45e50912e13ae8..9ca6184acd1b2410a4015d0672965fb9c25350d9 100644 (file)
--- a/src/store/tree-picker/tree-picker-actions.ts
+++ b/src/store/tree-picker/tree-picker-actions.ts
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { unionize, ofType, UnionOf } from "~/common/unionize";
-import { TreeNode, initTreeNode, getNodeDescendants, getNodeDescendantsIds, getNodeValue, TreeNodeStatus } from '~/models/tree';
+import { TreeNode, initTreeNode, getNodeDescendants, getNodeDescendantsIds, getNodeValue, TreeNodeStatus, getNode } from '~/models/tree';
 import { Dispatch } from 'redux';
 import { RootState } from '~/store/store';
 import { ServiceRepository } from '~/services/services';
@@ -12,6 +12,8 @@ import { pipe } from 'lodash/fp';
 import { ResourceKind } from '~/models/resource';
 import { GroupContentsResource } from '../../services/groups-service/groups-service';
 import { CollectionDirectory, CollectionFile } from '../../models/collection-file';
+import { getTreePicker } from './tree-picker';
+import { ProjectsTreePickerItem } from '~/views-components/projects-tree-picker/generic-projects-tree-picker';
 
 export const treePickerActions = unionize({
     LOAD_TREE_PICKER_NODE: ofType<{ id: string, pickerId: string }>(),
@@ -31,13 +33,13 @@ export const getProjectsTreePickerIds = (pickerId: string) => ({
     shared: `${pickerId}_shared`,
     favorites: `${pickerId}_favorites`,
 });
-export const initProjectsTreePicker = (pickerId: string) => 
-async (dispatch: Dispatch, _: () => RootState, services: ServiceRepository) => {
-    const {home, shared, favorites} = getProjectsTreePickerIds(pickerId);
-    dispatch<any>(initUserProject(home));
-    dispatch<any>(initSharedProject(shared));
-    dispatch<any>(initFavoritesProject(favorites));
-};
+export const initProjectsTreePicker = (pickerId: string) =>
+    async (dispatch: Dispatch, _: () => RootState, services: ServiceRepository) => {
+        const { home, shared, favorites } = getProjectsTreePickerIds(pickerId);
+        dispatch<any>(initUserProject(home));
+        dispatch<any>(initSharedProject(shared));
+        dispatch<any>(initFavoritesProject(favorites));
+    };
 
 interface ReceiveTreePickerDataParams<T> {
     data: T[];
@@ -95,22 +97,30 @@ export const loadProject = (params: LoadProjectParams) =>
     };
 
 export const loadCollection = (id: string, pickerId: string) =>
-    async (dispatch: Dispatch, _: () => RootState, services: ServiceRepository) => {
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id, pickerId }));
 
-        const files = await services.collectionService.files(id);
-        const data = getNodeDescendants('')(files).map(node => node.value);
-
-        dispatch<any>(receiveTreePickerData<CollectionDirectory | CollectionFile>({
-            id,
-            pickerId,
-            data,
-            extractNodeData: value => ({
-                id: value.id,
-                status: TreeNodeStatus.LOADED,
-                value,
-            }),
-        }));
+        const picker = getTreePicker<ProjectsTreePickerItem>(pickerId)(getState().treePicker);
+        if (picker) {
+
+            const node = getNode(id)(picker);
+            if (node && 'kind' in node.value && node.value.kind === ResourceKind.COLLECTION) {
+
+                const files = await services.collectionService.files(node.value.portableDataHash);
+                const data = getNodeDescendants('')(files).map(node => node.value);
+
+                dispatch<any>(receiveTreePickerData<CollectionDirectory | CollectionFile>({
+                    id,
+                    pickerId,
+                    data,
+                    extractNodeData: value => ({
+                        id: value.id,
+                        status: TreeNodeStatus.LOADED,
+                        value,
+                    }),
+                }));
+            }
+        }
     };
 
 

diff --git a/src/views/run-process-panel/inputs/file-input.tsx b/src/views/run-process-panel/inputs/file-input.tsx
index 140a9d031cb7f7f90dcc6f02166cf50dd756883b..468a9c81df4c7108d294945858eeff93d2b8e40b 100644 (file)
--- a/src/views/run-process-panel/inputs/file-input.tsx
+++ b/src/views/run-process-panel/inputs/file-input.tsx
@@ -29,10 +29,10 @@ export const FileInput = ({ input }: FileInputProps) =>
         name={input.id}
         commandInput={input}
         component={FileInputComponent}
-        format={(value?: File) => value ? value.location : ''}
+        format={(value?: File) => value ? value.basename : ''}
         parse={(file: CollectionFile): File => ({
             class: CWLType.FILE,
-            location: `keep:${getFileFullPath(file)}`,
+            location: `keep:${file.id}`,
             basename: file.name,
         })}
         validate={[