cy.createGroup(adminUser.token, {
name: `my-shared-writable-project ${Math.floor(Math.random() * 999999)}`,
group_class: 'project',
- }).as('mySharedProject1').then(function (mySharedProject1) {
+ }).as('mySharedWritableProject').then(function (mySharedWritableProject) {
cy.contains('Refresh').click();
- cy.get('main').contains(mySharedProject1.name).rightclick();
+ cy.get('main').contains(mySharedWritableProject.name).rightclick();
cy.get('[data-cy=context-menu]').within(() => {
cy.contains('Share').click();
});
cy.get('@selectPermissions').click();
cy.contains('Write').click();
cy.get('.sharing-dialog').as('sharingDialog');
- cy.get('@sharingDialog').find('input').first().type(activeUser.user.email);
+ cy.get('[data-cy=invite-people-field]').find('input').type(activeUser.user.email);
cy.get('[role=tooltip]').click();
- cy.get('@sharingDialog').find('button').last().click();
+ cy.get('@sharingDialog').contains('Save').click();
});
cy.createGroup(adminUser.token, {
name: `my-shared-readonly-project ${Math.floor(Math.random() * 999999)}`,
group_class: 'project',
- }).as('mySharedProject2').then(function (mySharedProject2) {
+ }).as('mySharedReadonlyProject').then(function (mySharedReadonlyProject) {
cy.contains('Refresh').click();
- cy.get('main').contains(mySharedProject2.name).rightclick();
+ cy.get('main').contains(mySharedReadonlyProject.name).rightclick();
cy.get('[data-cy=context-menu]').within(() => {
cy.contains('Share').click();
});
cy.get('.sharing-dialog').as('sharingDialog');
- cy.get('@sharingDialog').find('input').first().type(activeUser.user.email);
+ cy.get('[data-cy=invite-people-field]').find('input').type(activeUser.user.email);
cy.get('[role=tooltip]').click();
- cy.get('@sharingDialog').find('button').last().click();
+ cy.get('@sharingDialog').contains('Save').click();
});
cy.createGroup(activeUser.token, {
})
.as('testCollection');
- cy.getAll('@mySharedProject1', '@mySharedProject2', '@myProject1', '@testCollection')
- .then(function ([mySharedProject1, mySharedProject2, myProject1, testCollection]) {
+ cy.getAll('@mySharedWritableProject', '@mySharedReadonlyProject', '@myProject1', '@testCollection')
+ .then(function ([mySharedWritableProject, mySharedReadonlyProject, myProject1, testCollection]) {
cy.loginAs(activeUser);
cy.contains('Shared with me').click();
- cy.get('main').contains(mySharedProject1.name).rightclick();
+ cy.get('main').contains(mySharedWritableProject.name).rightclick();
cy.get('[data-cy=context-menu]').within(() => {
cy.contains('Add to favorites').click();
});
- cy.get('main').contains(mySharedProject2.name).rightclick();
+ cy.get('main').contains(mySharedReadonlyProject.name).rightclick();
cy.get('[data-cy=context-menu]').within(() => {
cy.contains('Add to favorites').click();
});
});
cy.get('[data-cy=form-dialog]').within(function () {
- cy.get('ul').last().find('i').click();
+ cy.get('[data-cy=projects-tree-favourites-tree-pciker]').find('i').click();
cy.contains(myProject1.name);
- cy.contains(mySharedProject1.name);
- cy.get('ul').last()
- .should('not.contain', mySharedProject2.name);
+ cy.contains(mySharedWritableProject.name);
+ cy.get('[data-cy=projects-tree-favourites-tree-pciker]')
+ .should('not.contain', mySharedReadonlyProject.name);
+ cy.contains(mySharedWritableProject.name).click();
+ cy.get('[data-cy=form-submit-btn]').click();
});
+
+ cy.doSearch(`${mySharedWritableProject.uuid}`);
+ cy.get('main').contains(testCollection.name);
+ });
+ });
+
+ it('can copy selected into the collection', () => {
+ cy.loginAs(activeUser);
+
+ cy.createCollection(adminUser.token, {
+ name: `Test source collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid,
+ manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
+ })
+ .as('testSourceCollection');
+
+ cy.createCollection(adminUser.token, {
+ name: `Test target collection ${Math.floor(Math.random() * 999999)}`,
+ owner_uuid: activeUser.user.uuid
+ })
+ .as('testTargetCollection');
+
+ cy.getAll('@testSourceCollection', '@testTargetCollection')
+ .then(function ([testSourceCollection, testTargetCollection]) {
+ cy.loginAs(activeUser);
+
+ cy.get('.layout-pane-primary')
+ .contains('Projects').click();
+
+ cy.get('main').contains(testTargetCollection.name).rightclick();
+ cy.get('[data-cy=context-menu]').within(() => {
+ cy.contains('Add to favorites').click();
+ });
+
+ cy.get('main').contains(testSourceCollection.name).click();
+ cy.get('[data-cy=collection-files-panel]').contains('bar');
+ cy.get('[data-cy=collection-files-panel]').find('input[type=checkbox]').click();
+ cy.get('[data-cy=collection-files-panel-options-btn]').click();
+ cy.get('[data-cy=context-menu]')
+ .contains('Copy selected into the collection').click();
+
+ cy.get('[data-cy=projects-tree-favourites-tree-pciker]')
+ .find('i')
+ .click();
+
+ cy.get('[data-cy=projects-tree-favourites-tree-pciker]')
+ .contains(testTargetCollection.name)
+ .click();
+
+ cy.get('[data-cy=form-submit-btn]').click();
+
+ cy.get('.layout-pane-primary')
+ .contains('Projects').click();
+
+ cy.get('main').contains(testTargetCollection.name).click();
+
+ cy.get('[data-cy=collection-files-panel]').contains('bar');
});
});
});
\ No newline at end of file
dispatch(startSubmit(COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION));
const state = getState();
const currentCollection = state.collectionPanel.item;
+
+ if (currentCollection && !currentCollection.manifestText) {
+ const fetchedCurrentCollection = await services.collectionService.get(currentCollection.uuid);
+ currentCollection.manifestText = fetchedCurrentCollection.manifestText;
+ currentCollection.unsignedManifestText = fetchedCurrentCollection.unsignedManifestText;
+ }
+
if (currentCollection) {
try {
dispatch(progressIndicatorActions.START_WORKING(COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION));
}
});
const diffPathToRemove = _.difference(paths, pathsToRemove);
- await services.collectionService.deleteFiles(selectedCollection.uuid, pathsToRemove);
+ await services.collectionService.deleteFiles(selectedCollection.uuid, pathsToRemove.map(path => path.replace(currentCollection.uuid, collectionUuid)));
const collectionWithDeletedFiles = await services.collectionService.get(collectionUuid);
- await services.collectionService.update(collectionUuid, { manifestText: `${collectionWithDeletedFiles.manifestText}${currentCollection.manifestText ? currentCollection.manifestText : currentCollection.unsignedManifestText}` });
- await services.collectionService.deleteFiles(collectionWithDeletedFiles.uuid, diffPathToRemove);
+ await services.collectionService.update(collectionUuid, { manifestText: `${collectionWithDeletedFiles.manifestText}${(currentCollection.manifestText ? currentCollection.manifestText : currentCollection.unsignedManifestText) || ''}` });
+ await services.collectionService.deleteFiles(collectionWithDeletedFiles.uuid, diffPathToRemove.map(path => path.replace(currentCollection.uuid, collectionUuid)));
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION }));
dispatch(snackbarActions.OPEN_SNACKBAR({
message: 'Files has been copied to selected collection.',