17595: Fixed selection based on hash

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js
index e49d8b30af06decf54fa336e46bdadc77f93ce5d..6750650dc2789d66257463e4b37c9bbcf0e4fc70 100644 (file)
--- a/cypress/integration/favorites.spec.js
+++ b/cypress/integration/favorites.spec.js
@@ -288,13 +288,13 @@ describe('Favorites tests', function () {
                             });
                     });
 
-                cy.get('label').contains('Files').parent('div')
+                cy.get('label').contains('#main/foo').parent('div')
                     .within(() => {
                         cy.contains('baz');
                         cy.contains('bar');
                     });
 
-                cy.get('label').contains('Collections').parent('div')
+                cy.get('label').contains('#main/bar').parent('div')
                     .within(() => {
                         cy.contains(testCollection.name);
                         cy.contains(testCollection2.name);

diff --git a/src/store/tree-picker/tree-picker-actions.ts b/src/store/tree-picker/tree-picker-actions.ts
index 5d12b419ebe898e2666131e9d5bb85b4adcb98b0..5157394d16a317f6348791c0c276863dba49e070 100644 (file)
--- a/src/store/tree-picker/tree-picker-actions.ts
+++ b/src/store/tree-picker/tree-picker-actions.ts
@@ -149,7 +149,6 @@ export const loadCollection = (id: string, pickerId: string) =>
 
             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 tree = createCollectionFilesTree(files);
                 const sorted = sortFilesTree(tree);

diff --git a/src/views/run-process-panel/inputs/directory-array-input.tsx b/src/views/run-process-panel/inputs/directory-array-input.tsx
index 2b4826c01ad9b6f7af39a7f829b656bdbbce709a..2949d07ef0aeaea7928bc3c1187b7980104c3fd2 100644 (file)
--- a/src/views/run-process-panel/inputs/directory-array-input.tsx
+++ b/src/views/run-process-panel/inputs/directory-array-input.tsx
@@ -160,7 +160,7 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
                 .reduce((directories, { value }) =>
                     'kind' in value &&
                         value.kind === ResourceKind.COLLECTION &&
-                        formattedDirectories.find(({ portableDataHash }) => value.portableDataHash === portableDataHash)
+                        formattedDirectories.find(({ portableDataHash, name }) => value.portableDataHash === portableDataHash && value.name === name)
                         ? directories.concat(value)
                         : directories, initialDirectories);
 
@@ -182,7 +182,7 @@ const DirectoryArrayInputComponent = connect(mapStateToProps)(
             });
 
             const orderedDirectories = formattedDirectories.reduce((dirs, formattedDir) => {
-                const dir = directories.find(({ portableDataHash }) => portableDataHash === formattedDir.portableDataHash);
+                const dir = directories.find(({ portableDataHash, name }) => portableDataHash === formattedDir.portableDataHash && name === formattedDir.name);
                 return dir
                     ? [...dirs, dir]
                     : dirs;

diff --git a/src/views/run-process-panel/inputs/file-array-input.tsx b/src/views/run-process-panel/inputs/file-array-input.tsx
index 173e6b5e91be64e577c631a216b94b63f25223f7..953100139541d574a958012f4bf27f342c590109 100644 (file)
--- a/src/views/run-process-panel/inputs/file-array-input.tsx
+++ b/src/views/run-process-panel/inputs/file-array-input.tsx
@@ -170,7 +170,6 @@ const FileArrayInputComponent = connect(mapStateToProps)(
             });
 
             this.setFiles(files);
-
         }
 
         refreshFiles = () => {