From 1739b7bc6b6602cdfbaca0f5fe899c9e6fd7fe1f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kuty=C5=82a?= Date: Thu, 13 May 2021 21:07:46 +0200 Subject: [PATCH] 17595: Fixed selection based on hash MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła --- cypress/integration/favorites.spec.js | 4 ++-- src/store/tree-picker/tree-picker-actions.ts | 1 - src/views/run-process-panel/inputs/directory-array-input.tsx | 4 ++-- src/views/run-process-panel/inputs/file-array-input.tsx | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js index e49d8b30..6750650d 100644 --- 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 5d12b419..5157394d 100644 --- 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 2b4826c0..2949d07e 100644 --- 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 173e6b5e..95310013 100644 --- 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 = () => { -- 2.30.2