Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
- cy.get('label').contains('Files').parent('div')
+ cy.get('label').contains('#main/foo').parent('div')
.within(() => {
cy.contains('baz');
cy.contains('bar');
});
.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);
.within(() => {
cy.contains(testCollection.name);
cy.contains(testCollection2.name);
const node = getNode(id)(picker);
if (node && 'kind' in node.value && node.value.kind === ResourceKind.COLLECTION) {
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);
const files = await services.collectionService.files(node.value.portableDataHash);
const tree = createCollectionFilesTree(files);
const sorted = sortFilesTree(tree);
.reduce((directories, { value }) =>
'kind' in value &&
value.kind === ResourceKind.COLLECTION &&
.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);
? directories.concat(value)
: directories, initialDirectories);
});
const orderedDirectories = formattedDirectories.reduce((dirs, formattedDir) => {
});
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;
return dir
? [...dirs, dir]
: dirs;
});
this.setFiles(files);
});
this.setFiles(files);