[arvados-workbench2] updated: 2.6.0-87-ge6e51406

[git repository hosting]

Summary of changes:
 src/store/collections/collection-copy-actions.ts                     | 5 +----
 src/store/workbench/workbench-actions.ts                             | 2 +-
 .../context-menu/action-sets/collection-action-set.ts                | 3 ---
 src/views-components/dialog-copy/dialog-copy.tsx                     | 4 ----
 src/views-components/dialog-forms/copy-collection-dialog.ts          | 2 --
 5 files changed, 2 insertions(+), 14 deletions(-)

       via  e6e51406134e71d493f5258917915136709bcda2 (commit)
      from  44821dc84765936ce99fa2d760ef683281f0a578 (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 e6e51406134e71d493f5258917915136709bcda2
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Fri Sep 8 10:21:49 2023 -0400

    15768: made new dialog for multi-copy Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/src/store/collections/collection-copy-actions.ts b/src/store/collections/collection-copy-actions.ts
index a482b9a7..d4e647f8 100644
--- a/src/store/collections/collection-copy-actions.ts
+++ b/src/store/collections/collection-copy-actions.ts
@@ -19,7 +19,6 @@ export const COLLECTION_COPY_FORM_NAME = "collectionCopyFormName";
 export const COLLECTION_MULTI_COPY_FORM_NAME = "collectionMultiCopyFormName";
 
 export const openCollectionCopyDialog = (resource: { name: string; uuid: string; isSingle?: boolean }) => (dispatch: Dispatch) => {
-    //here
     dispatch<any>(resetPickerProjectTree());
     dispatch<any>(initProjectsTreePicker(COLLECTION_COPY_FORM_NAME));
     const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, ownerUuid: "", uuid: resource.uuid, isSingle: resource.isSingle };
@@ -28,7 +27,6 @@ export const openCollectionCopyDialog = (resource: { name: string; uuid: string;
 };
 
 export const openMultiCollectionCopyDialog = (resource: { name: string; uuid: string; isSingle?: boolean }) => (dispatch: Dispatch) => {
-    //here
     dispatch<any>(resetPickerProjectTree());
     dispatch<any>(initProjectsTreePicker(COLLECTION_MULTI_COPY_FORM_NAME));
     const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, ownerUuid: "", uuid: resource.uuid, isSingle: resource.isSingle };
@@ -38,9 +36,8 @@ export const openMultiCollectionCopyDialog = (resource: { name: string; uuid: st
 
 export const copyCollection =
     (resource: CopyFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-        console.log("IN COPY COLLECTION", resource);
         const formName = resource.isSingle ? COLLECTION_COPY_FORM_NAME : COLLECTION_MULTI_COPY_FORM_NAME;
-        dispatch(startSubmit(COLLECTION_COPY_FORM_NAME));
+        dispatch(startSubmit(formName));
         let collection = getResource<CollectionResource>(resource.uuid)(getState().resources);
         try {
             if (!collection) {
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index 71fdc6aa..d65f26d5 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -437,7 +437,7 @@ export const copyCollection = (data: CopyFormDialogData) => async (dispatch: Dis
         .filter(resource => resource.kind === ResourceKind.COLLECTION);
 
     for (const collection of collectionsToCopy) {
-        await copySingleCollection(collection as CollectionCopyResource);
+        await copySingleCollection({ ...collection, ownerUuid: data.ownerUuid } as CollectionCopyResource);
     }
 
     async function copySingleCollection(copyToProject: CollectionCopyResource) {
diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts
index b63497f2..c63144e8 100644
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -66,8 +66,6 @@ const commonActionSet: ContextMenuActionSet = [
             icon: CopyIcon,
             name: "Make a copy",
             execute: (dispatch, resources) => {
-                console.log(resources[0]);
-                //here fix single vs one
                 if (resources[0].isSingle) dispatch<any>(openCollectionCopyDialog(resources[0]));
                 else dispatch<any>(openMultiCollectionCopyDialog(resources[0]));
             },
@@ -129,7 +127,6 @@ export const collectionActionSet: ContextMenuActionSet = [
             component: ToggleTrashAction,
             name: "ToggleTrashAction",
             execute: (dispatch, resources: ContextMenuResource[]) => {
-                //here fix  multi?
                 resources.forEach(resource => dispatch<any>(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!)));
             },
         },
diff --git a/src/views-components/dialog-copy/dialog-copy.tsx b/src/views-components/dialog-copy/dialog-copy.tsx
index e7e7836e..8e37ac32 100644
--- a/src/views-components/dialog-copy/dialog-copy.tsx
+++ b/src/views-components/dialog-copy/dialog-copy.tsx
@@ -16,8 +16,6 @@ import { PickerIdProp } from "store/tree-picker/picker-id";
 type CopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CopyFormDialogData>;
 
 export const DialogCopy = (props: CopyFormDialogProps & PickerIdProp) => {
-    console.log("single dialog copy", props);
-
     return (
         <FormDialog
             dialogTitle="Make a copy"
@@ -46,8 +44,6 @@ const CopyDialogFields = memoize((pickerId: string) => () => (
 ));
 
 export const DialogMultiCopy = (props: CopyFormDialogProps & PickerIdProp) => {
-    console.log("multi dialog copy", props);
-
     return (
         <FormDialog
             dialogTitle="Make a copy"
diff --git a/src/views-components/dialog-forms/copy-collection-dialog.ts b/src/views-components/dialog-forms/copy-collection-dialog.ts
index 5d0ff29f..220b5a2c 100644
--- a/src/views-components/dialog-forms/copy-collection-dialog.ts
+++ b/src/views-components/dialog-forms/copy-collection-dialog.ts
@@ -17,7 +17,6 @@ export const CopyCollectionDialog = compose(
         form: COLLECTION_COPY_FORM_NAME,
         touchOnChange: true,
         onSubmit: (data, dispatch) => {
-            console.log("DATA main", data);
             dispatch(copyCollection(data));
         },
     }),
@@ -30,7 +29,6 @@ export const CopyMultiCollectionDialog = compose(
         form: COLLECTION_MULTI_COPY_FORM_NAME,
         touchOnChange: true,
         onSubmit: (data, dispatch) => {
-            console.log("DATA main", data);
             dispatch(copyCollection(data));
         },
     }),

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


hooks/post-receive
--