15768: new dialog box for multi-copy Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa...
authorLisa Knox <lisaknox83@gmail.com>
Thu, 25 May 2023 20:15:44 +0000 (16:15 -0400)
committerLisa Knox <lisaknox83@gmail.com>
Thu, 25 May 2023 20:15:44 +0000 (16:15 -0400)
src/components/multiselectToolbar/MultiselectToolbar.tsx
src/store/dialog/dialog-reducer.ts
src/store/processes/process-copy-actions.ts
src/views-components/dialog-copy/dialog-process-rerun.tsx
src/views-components/dialog-forms/copy-process-dialog.ts
src/views/workbench/workbench.tsx

index 2d6b18895c3c80dc57496d8895684e64b6eb9e35..d141afd99931bf4a8f595d6d7922593a5b533624 100644 (file)
@@ -15,13 +15,14 @@ import { processResourceActionSet } from '../../views-components/context-menu/ac
 import { ContextMenuResource } from 'store/context-menu/context-menu-actions';
 import { ResourceKind, extractUuidKind } from 'models/resource';
 import { openMoveProcessDialog } from 'store/processes/process-move-actions';
-import { openCopyProcessDialog } from 'store/processes/process-copy-actions';
+import { openCopyProcessDialog, openCopyManyProcessesDialog } from 'store/processes/process-copy-actions';
 import { getResource } from 'store/resources/resources';
 import { ResourceName } from 'views-components/data-explorer/renderers';
 import { ProcessResource } from 'models/process';
 import { ResourcesState } from 'store/resources/resources';
 import { Resource } from 'models/resource';
 import { getProcess } from 'store/processes/process';
+import { CopyProcessDialog, CopyManyProcessesDialog } from 'views-components/dialog-forms/copy-process-dialog';
 
 type CssRules = 'root' | 'button';
 
@@ -101,7 +102,8 @@ export const MultiselectToolbar = connect(
             <Toolbar className={classes.root} style={{ width: `${buttons.length * 5.5}rem` }}>
                 {buttons.length ? (
                     buttons.map((btn) => (
-                        <Button key={btn.name} className={classes.button} onClick={() => props[btn.funcName](checkedList, resources)}>
+                        <Button key={btn.name} className={classes.button} onClick={() => props[btn.funcName](checkedList)}>
+                            {/* {<CopyProcessDialog>{btn.name}</CopyProcessDialog>} */}
                             {btn.name}
                         </Button>
                     ))
@@ -134,8 +136,6 @@ function selectedToKindSet(checkedList: TCheckedList): Set<string> {
 }
 
 function mapStateToProps(state: RootState) {
-    // console.log(state);
-    // console.log(getResource<ProcessResource>('tordo-dz642-0p7xefqdr4nw4pw')(state.resources));
     const { isVisible, checkedList } = state.multiselect;
     return {
         isVisible: isVisible,
@@ -146,20 +146,18 @@ function mapStateToProps(state: RootState) {
 
 function mapDispatchToProps(dispatch: Dispatch) {
     return {
-        copySelected: (checkedList: TCheckedList, resources: ResourcesState) => copyMoveMulti(dispatch, checkedList, resources),
+        copySelected: (checkedList: TCheckedList, resources: ResourcesState) => copyMoveMany(dispatch, checkedList),
         moveSelected: (checkedList: TCheckedList) => {},
         barSelected: () => {},
         removeSelected: (checkedList: TCheckedList) => removeMultiProcesses(dispatch, checkedList),
     };
 }
 
-function copyMoveMulti(dispatch: Dispatch, checkedList: TCheckedList, resources: ResourcesState) {
+function copyMoveMany(dispatch: Dispatch, checkedList: TCheckedList) {
     const selectedList: Array<string> = selectedToArray(checkedList);
-    const single = getProcess(selectedList[0])(resources)?.containerRequest;
-    console.log(single);
-    const { name, uuid } = single as any;
-    console.log(name, uuid);
-    dispatch<any>(openCopyProcessDialog({ name, uuid }));
+    const uuid = selectedList[0];
+    // dispatch<any>(openCopyManyProcessesDialog(uuid));
+    dispatch<any>(openCopyManyProcessesDialog(selectedList));
 }
 
 function moveMultiProcesses(dispatch: Dispatch, checkedList: TCheckedList): void {
index 30368685064dfe6f9837d7c20d0cc4808b0cbf01..548d0a7897f99ba48a27c9826bf02bc18ad8d9ca 100644 (file)
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { DialogAction, dialogActions } from "./dialog-actions";
+import { DialogAction, dialogActions } from './dialog-actions';
 
 export type DialogState = Record<string, Dialog<any>>;
 
@@ -12,16 +12,14 @@ export interface Dialog<T> {
 }
 
 export const dialogReducer = (state: DialogState = {}, action: DialogAction) =>
-
     dialogActions.match(action, {
         OPEN_DIALOG: ({ id, data }) => ({ ...state, [id]: { open: true, data } }),
         CLOSE_DIALOG: ({ id }) => ({
             ...state,
-            [id]: state[id] ? { ...state[id], open: false } : { open: false, data: {} }
+            [id]: state[id] ? { ...state[id], open: false } : { open: false, data: {} },
         }),
-        CLOSE_ALL_DIALOGS: () => ({ }),
+        CLOSE_ALL_DIALOGS: () => ({}),
         default: () => state,
     });
 
-export const getDialog = <T>(state: DialogState, id: string) =>
-    state[id] ? state[id] as Dialog<T> : undefined;
+export const getDialog = <T>(state: DialogState, id: string) => (state[id] ? (state[id] as Dialog<T>) : undefined);
index d8e1eb0945f055c85c6d09c9c46edc3f877b30b1..d3c36b3f363afd9a0b4e545b751d901143215923 100644 (file)
@@ -9,15 +9,15 @@ import { resetPickerProjectTree } from 'store/project-tree-picker/project-tree-p
 import { RootState } from 'store/store';
 import { ServiceRepository } from 'services/services';
 import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
-import { getProcess } from 'store/processes/process';
+import { Process, getProcess } from 'store/processes/process';
 import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
 import { initProjectsTreePicker } from 'store/tree-picker/tree-picker-actions';
-import { ContainerRequestState } from 'models/container-request';
+import { ContainerRequestResource, ContainerRequestState } from 'models/container-request';
 
 export const PROCESS_COPY_FORM_NAME = 'processCopyFormName';
+export const MULTI_PROCESS_COPY_FORM_NAME = 'multiProcessCopyFormName';
 
 export const openCopyProcessDialog = (resource: { name: string; uuid: string }) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
-    console.log(resource);
     const process = getProcess(resource.uuid)(getState().resources);
     if (process) {
         dispatch<any>(resetPickerProjectTree());
@@ -30,6 +30,30 @@ export const openCopyProcessDialog = (resource: { name: string; uuid: string })
     }
 };
 
+export const openCopyManyProcessesDialog = (list: Array<string>) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+    //need to test with undefined process array
+    const testList = ['tordo-xvhdp-f8ps1vs3s3c2u3v', 'foo'];
+    const processes = list.map((uuid) => {
+        // const processes = testList.map((uuid) => {
+        const process = getProcess(uuid)(getState().resources);
+        if (!process) {
+            dispatch(snackbarActions.OPEN_SNACKBAR({ message: `Process ${uuid} not found`, hideDuration: 2000, kind: SnackbarKind.ERROR }));
+            return undefined;
+        } else return process;
+    });
+    console.log(processes);
+
+    let initialData: CopyFormDialogData;
+    if (processes.every((process) => !!process)) {
+        const { name, uuid } = (processes[0] as Process).containerRequest;
+        dispatch<any>(resetPickerProjectTree());
+        dispatch<any>(initProjectsTreePicker(MULTI_PROCESS_COPY_FORM_NAME));
+        initialData = { name: `Copy of: ${name}`, uuid: uuid, ownerUuid: '' };
+        dispatch<any>(initialize(MULTI_PROCESS_COPY_FORM_NAME, initialData));
+        dispatch(dialogActions.OPEN_DIALOG({ id: MULTI_PROCESS_COPY_FORM_NAME, data: {} }));
+    }
+};
+
 export const copyProcess = (resource: CopyFormDialogData) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
     dispatch(startSubmit(PROCESS_COPY_FORM_NAME));
     try {
index 9f97b1accd8cca463ebc06cb67c90bd518135408..2d34baf925570f0a067ee51f917a431ce9ba81be 100644 (file)
@@ -2,38 +2,37 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import React from "react";
+import React from 'react';
 import { memoize } from 'lodash/fp';
 import { InjectedFormProps, Field } from 'redux-form';
 import { WithDialogProps } from 'store/dialog/with-dialog';
 import { FormDialog } from 'components/form-dialog/form-dialog';
 import { ProjectTreePickerField } from 'views-components/projects-tree-picker/tree-picker-field';
 import { COPY_NAME_VALIDATION, COPY_FILE_VALIDATION } from 'validators/validators';
-import { TextField } from "components/text-field/text-field";
+import { TextField } from 'components/text-field/text-field';
 import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
 import { PickerIdProp } from 'store/tree-picker/picker-id';
 
 type ProcessRerunFormDialogProps = WithDialogProps<string> & InjectedFormProps<CopyFormDialogData>;
 
-export const DialogProcessRerun = (props: ProcessRerunFormDialogProps & PickerIdProp) =>
-    <FormDialog
-        dialogTitle='Choose location for re-run'
-        formFields={CopyDialogFields(props.pickerId)}
-        submitLabel='Copy'
-        {...props}
-    />;
+export const DialogProcessRerun = (props: ProcessRerunFormDialogProps & PickerIdProp) => (
+    <FormDialog dialogTitle='Choose location for re-run' formFields={CopyDialogFields(props.pickerId)} submitLabel='Copy' {...props} />
+);
 
-const CopyDialogFields = memoize((pickerId: string) =>
-    () =>
-        <>
-            <Field
-                name='name'
-                component={TextField as any}
-                validate={COPY_NAME_VALIDATION}
-                label="Enter a new name for the copy" />
-            <Field
-                name="ownerUuid"
-                component={ProjectTreePickerField}
-                validate={COPY_FILE_VALIDATION}
-                pickerId={pickerId}/>
-        </>);
+const CopyDialogFields = memoize((pickerId: string) => () => (
+    <>
+        <Field name='name' component={TextField as any} validate={COPY_NAME_VALIDATION} label='Enter a new name for the copy' />
+        <Field name='ownerUuid' component={ProjectTreePickerField} validate={COPY_FILE_VALIDATION} pickerId={pickerId} />
+    </>
+));
+
+export const DialogManyProcessesRerun = (props: ProcessRerunFormDialogProps & PickerIdProp) => (
+    <FormDialog dialogTitle='Choose location for re-runs' formFields={CopyManyDialogFields(props.pickerId)} submitLabel='Copy' {...props} />
+);
+
+const CopyManyDialogFields = memoize((pickerId: string) => () => (
+    <>
+        {/* <Field name='name' component={TextField as any} validate={COPY_NAME_VALIDATION} label='Enter a new name for the copy' /> */}
+        <Field name='ownerUuid' component={ProjectTreePickerField} validate={COPY_FILE_VALIDATION} pickerId={pickerId} />
+    </>
+));
index 6a79b62613d34b435a8c3a04f7bd3ad78e92602d..b3454428fda691cb5754596abcda2058de29c523 100644 (file)
@@ -2,14 +2,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { compose } from "redux";
-import { withDialog } from "store/dialog/with-dialog";
+import { compose } from 'redux';
+import { withDialog } from 'store/dialog/with-dialog';
 import { reduxForm } from 'redux-form';
-import { PROCESS_COPY_FORM_NAME } from 'store/processes/process-copy-actions';
-import { DialogProcessRerun } from "views-components/dialog-copy/dialog-process-rerun";
+import { PROCESS_COPY_FORM_NAME, MULTI_PROCESS_COPY_FORM_NAME } from 'store/processes/process-copy-actions';
+import { DialogProcessRerun, DialogManyProcessesRerun } from 'views-components/dialog-copy/dialog-process-rerun';
 import { copyProcess } from 'store/workbench/workbench-actions';
 import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
-import { pickerId } from "store/tree-picker/picker-id";
+import { pickerId } from 'store/tree-picker/picker-id';
 
 export const CopyProcessDialog = compose(
     withDialog(PROCESS_COPY_FORM_NAME),
@@ -17,7 +17,19 @@ export const CopyProcessDialog = compose(
         form: PROCESS_COPY_FORM_NAME,
         onSubmit: (data, dispatch) => {
             dispatch(copyProcess(data));
-        }
+        },
     }),
-    pickerId(PROCESS_COPY_FORM_NAME),
+    pickerId(PROCESS_COPY_FORM_NAME)
 )(DialogProcessRerun);
+
+export const CopyManyProcessesDialog = compose(
+    withDialog(MULTI_PROCESS_COPY_FORM_NAME),
+    reduxForm<CopyFormDialogData>({
+        form: MULTI_PROCESS_COPY_FORM_NAME,
+        onSubmit: (data, dispatch) => {
+            console.log('COPYMANY', data);
+            dispatch(copyProcess(data));
+        },
+    }),
+    pickerId(MULTI_PROCESS_COPY_FORM_NAME)
+)(DialogManyProcessesRerun);
index 7be3c8ba880f6a73fa8194479bac0c58ca05a673..74bccd0f741cc903b3c7b2ac9976566a5de5221c 100644 (file)
@@ -24,7 +24,7 @@ import { ChangeWorkflowDialog } from 'views-components/run-process-dialog/change
 import { CreateProjectDialog } from 'views-components/dialog-forms/create-project-dialog';
 import { CreateCollectionDialog } from 'views-components/dialog-forms/create-collection-dialog';
 import { CopyCollectionDialog } from 'views-components/dialog-forms/copy-collection-dialog';
-import { CopyProcessDialog } from 'views-components/dialog-forms/copy-process-dialog';
+import { CopyProcessDialog, CopyManyProcessesDialog } from 'views-components/dialog-forms/copy-process-dialog';
 import { UpdateCollectionDialog } from 'views-components/dialog-forms/update-collection-dialog';
 import { UpdateProcessDialog } from 'views-components/dialog-forms/update-process-dialog';
 import { UpdateProjectDialog } from 'views-components/dialog-forms/update-project-dialog';
@@ -255,6 +255,7 @@ export const WorkbenchPanel = withStyles(styles)((props: WorkbenchPanelProps) =>
             <ContextMenu />
             <CopyCollectionDialog />
             <CopyProcessDialog />
+            <CopyManyProcessesDialog />
             <CreateCollectionDialog />
             <CreateProjectDialog />
             <CreateRepositoryDialog />