[ARVADOS-WORKBENCH2] updated: 2.3.0-55-gdce08883

Git user git at public.arvados.org
Wed Dec 15 22:00:54 UTC 2021


Summary of changes:
 cypress/integration/favorites.spec.js                       |  3 ++-
 src/store/collections/collection-partial-copy-actions.ts    |  2 +-
 .../context-menu/action-sets/collection-files-action-set.ts | 13 +++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

       via  dce08883afbf575127601743e2482c3bd8604d3a (commit)
       via  7490775a0dd834c087f291219092fb350be9705f (commit)
      from  401e3b5a6339e8f8a1d8edacdca86b98cfaeda4e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit dce08883afbf575127601743e2482c3bd8604d3a
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Wed Dec 15 18:59:55 2021 -0300

    18587: Temporarily disabling the 'copy selected into collection' feature.
    
    There're some cases that can cause data corruption.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js
index 13a2c467..9bc90ebd 100644
--- a/cypress/integration/favorites.spec.js
+++ b/cypress/integration/favorites.spec.js
@@ -44,7 +44,8 @@ describe('Favorites tests', function () {
         });
     });
 
-    it('can copy selected into the collection', () => {
+    // Disabled while addressing #18587
+    it.skip('can copy selected into the collection', () => {
         cy.createCollection(adminUser.token, {
             name: `Test source collection ${Math.floor(Math.random() * 999999)}`,
             manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
diff --git a/src/views-components/context-menu/action-sets/collection-files-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
index 3aeec4c0..59a5f368 100644
--- a/src/views-components/context-menu/action-sets/collection-files-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
@@ -26,12 +26,13 @@ export const readOnlyCollectionFilesActionSet: ContextMenuActionSet = [[
             dispatch<any>(openCollectionPartialCopyDialog());
         }
     },
-    {
-        name: "Copy selected into the collection",
-        execute: dispatch => {
-            dispatch<any>(openCollectionPartialCopyToSelectedCollectionDialog());
-        }
-    }
+    // Disabled while addressing #18587
+    // {
+    //     name: "Copy selected into the collection",
+    //     execute: dispatch => {
+    //         dispatch<any>(openCollectionPartialCopyToSelectedCollectionDialog());
+    //     }
+    // }
 ]];
 
 export const collectionFilesActionSet: ContextMenuActionSet = readOnlyCollectionFilesActionSet.concat([[

commit 7490775a0dd834c087f291219092fb350be9705f
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Wed Dec 15 18:55:46 2021 -0300

    18584: Fixes error when creating a collection with selected files.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/src/store/collections/collection-partial-copy-actions.ts b/src/store/collections/collection-partial-copy-actions.ts
index 8c4cb379..9f478d74 100644
--- a/src/store/collections/collection-partial-copy-actions.ts
+++ b/src/store/collections/collection-partial-copy-actions.ts
@@ -67,7 +67,7 @@ export const copyCollectionPartial = ({ name, description, projectUuid }: Collec
                     return !paths.find(path => path.indexOf(file.replace(newCollection.uuid, '')) > -1);
                 });
                 await services.collectionService.deleteFiles(
-                    '',
+                    newCollection.uuid,
                     filesToDelete
                 );
                 dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_FORM_NAME }));

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list