[ARVADOS-WORKBENCH2] created: 1.2.0-341-g7486a32
Git user
git at public.curoverse.com
Mon Sep 10 05:08:07 EDT 2018
at 7486a3262490a384017ee6c826a408a017a79f55 (commit)
commit 7486a3262490a384017ee6c826a408a017a79f55
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Sep 10 11:07:46 2018 +0200
make a copy process
Feature #14097
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/collections/collection-copy-actions.ts b/src/store/collections/collection-copy-actions.ts
index 87ba042..09d4e04 100644
--- a/src/store/collections/collection-copy-actions.ts
+++ b/src/store/collections/collection-copy-actions.ts
@@ -9,24 +9,19 @@ import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree
import { RootState } from '~/store/store';
import { ServiceRepository } from '~/services/services';
import { getCommonResourceServiceError, CommonResourceServiceError } from '~/services/common-service/common-resource-service';
+import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
export const COLLECTION_COPY_FORM_NAME = 'collectionCopyFormName';
-export interface CollectionCopyFormDialogData {
- name: string;
- ownerUuid: string;
- uuid: string;
-}
-
export const openCollectionCopyDialog = (resource: { name: string, uuid: string }) =>
(dispatch: Dispatch) => {
dispatch<any>(resetPickerProjectTree());
- const initialData: CollectionCopyFormDialogData = { name: `Copy of: ${resource.name}`, ownerUuid: '', uuid: resource.uuid };
+ const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, ownerUuid: '', uuid: resource.uuid };
dispatch<any>(initialize(COLLECTION_COPY_FORM_NAME, initialData));
dispatch(dialogActions.OPEN_DIALOG({ id: COLLECTION_COPY_FORM_NAME, data: {} }));
};
-export const copyCollection = (resource: CollectionCopyFormDialogData) =>
+export const copyCollection = (resource: CopyFormDialogData) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
dispatch(startSubmit(COLLECTION_COPY_FORM_NAME));
try {
diff --git a/src/store/processes/process-copy-actions.ts b/src/store/copy-dialog/copy-dialog.ts
similarity index 59%
copy from src/store/processes/process-copy-actions.ts
copy to src/store/copy-dialog/copy-dialog.ts
index e3c5acc..4450cfc 100644
--- a/src/store/processes/process-copy-actions.ts
+++ b/src/store/copy-dialog/copy-dialog.ts
@@ -2,10 +2,8 @@
//
// SPDX-License-Identifier: AGPL-3.0
-export const PROCESS_COPY_FORM_NAME = 'processCopyFormName';
-
-export interface ProcessCopyFormDialogData {
+export interface CopyFormDialogData {
name: string;
- ownerUuid: string;
uuid: string;
+ ownerUuid: string;
}
\ No newline at end of file
diff --git a/src/store/processes/process-copy-actions.ts b/src/store/processes/process-copy-actions.ts
index e3c5acc..a9ae64e 100644
--- a/src/store/processes/process-copy-actions.ts
+++ b/src/store/processes/process-copy-actions.ts
@@ -2,10 +2,51 @@
//
// SPDX-License-Identifier: AGPL-3.0
+import { Dispatch } from "redux";
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { initialize, startSubmit } from 'redux-form';
+import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
+import { RootState } from '~/store/store';
+import { ServiceRepository } from '~/services/services';
+import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
+import { getProcess, ProcessStatus, getProcessStatus } from '~/store/processes/process';
+import { snackbarActions } from '~/store/snackbar/snackbar-actions';
+
export const PROCESS_COPY_FORM_NAME = 'processCopyFormName';
-export interface ProcessCopyFormDialogData {
- name: string;
- ownerUuid: string;
- uuid: string;
-}
\ No newline at end of file
+export const openCopyProcessDialog = (resource: { name: string, uuid: string }) =>
+ (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const process = getProcess(resource.uuid)(getState().resources);
+ if (process) {
+ const processStatus = getProcessStatus(process);
+ if (processStatus === ProcessStatus.DRAFT) {
+ dispatch<any>(resetPickerProjectTree());
+ const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, uuid: resource.uuid, ownerUuid: '' };
+ dispatch<any>(initialize(PROCESS_COPY_FORM_NAME, initialData));
+ dispatch(dialogActions.OPEN_DIALOG({ id: PROCESS_COPY_FORM_NAME, data: {} }));
+ } else {
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'You can copy only draft processes.', hideDuration: 2000 }));
+ }
+ } else {
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process not found', hideDuration: 2000 }));
+ }
+ };
+
+export const copyProcess = (resource: CopyFormDialogData) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ dispatch(startSubmit(PROCESS_COPY_FORM_NAME));
+ try {
+ const process = await services.containerRequestService.get(resource.uuid);
+ const uuidKey = 'uuid';
+ delete process[uuidKey];
+ await services.containerRequestService.create({ ...process, ownerUuid: resource.ownerUuid, name: resource.name });
+ dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_COPY_FORM_NAME }));
+ return process;
+ } catch (e) {
+ if (e) {
+ dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_COPY_FORM_NAME }));
+ throw new Error('Could not copy the process.');
+ }
+ return;
+ }
+ };
\ No newline at end of file
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index cb65c24..647395b 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -30,10 +30,12 @@ import * as collectionUpdateActions from '~/store/collections/collection-update-
import * as collectionMoveActions from '~/store/collections/collection-move-actions';
import * as processesActions from '../processes/processes-actions';
import * as processMoveActions from '~/store/processes/process-move-actions';
+import * as processCopyActions from '~/store/processes/process-copy-actions';
import { trashPanelColumns } from "~/views/trash-panel/trash-panel";
import { loadTrashPanel, trashPanelActions } from "~/store/trash-panel/trash-panel-action";
import { initProcessLogsPanel } from '../process-logs-panel/process-logs-panel-actions';
import { loadProcessPanel } from '~/store/process-panel/process-panel-actions';
+import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
export const loadWorkbench = () =>
@@ -161,7 +163,7 @@ export const updateCollection = (data: collectionUpdateActions.CollectionUpdateF
}
};
-export const copyCollection = (data: collectionCopyActions.CollectionCopyFormDialogData) =>
+export const copyCollection = (data: CopyFormDialogData) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
try {
const collection = await dispatch<any>(collectionCopyActions.copyCollection(data));
@@ -207,6 +209,18 @@ export const moveProcess = (data: MoveToFormDialogData) =>
}
};
+export const copyProcess = (data: CopyFormDialogData) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ try {
+ const process = await dispatch<any>(processCopyActions.copyProcess(data));
+ dispatch<any>(updateResources([process]));
+ dispatch<any>(reloadProjectMatchingUuid([process.ownerUuid]));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process has been copied.', hideDuration: 2000 }));
+ } catch (e) {
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 }));
+ }
+ };
+
export const loadProcessLog = (uuid: string) =>
async (dispatch: Dispatch) => {
const process = await dispatch<any>(processesActions.loadProcess(uuid));
diff --git a/src/views-components/context-menu/action-sets/process-action-set.ts b/src/views-components/context-menu/action-sets/process-action-set.ts
index 3a824ec..891064b 100644
--- a/src/views-components/context-menu/action-sets/process-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-action-set.ts
@@ -12,6 +12,7 @@ import {
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
import { navigateToProcessLogs } from '~/store/navigation/navigation-action';
import { openMoveProcessDialog } from '~/store/processes/process-move-actions';
+import { openCopyProcessDialog } from '~/store/processes/process-copy-actions';
export const processActionSet: ContextMenuActionSet = [[
{
@@ -44,9 +45,7 @@ export const processActionSet: ContextMenuActionSet = [[
{
icon: CopyIcon,
name: "Copy to project",
- execute: (dispatch, resource) => {
- // add code
- }
+ execute: (dispatch, resource) => dispatch<any>(openCopyProcessDialog(resource))
},
{
icon: ReRunProcessIcon,
diff --git a/src/views-components/context-menu/action-sets/process-resource-action-set.ts b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
index 64e30f7..ac09226 100644
--- a/src/views-components/context-menu/action-sets/process-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
@@ -8,6 +8,7 @@ import { toggleFavorite } from "~/store/favorites/favorites-actions";
import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon } from "~/components/icon/icon";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
import { openMoveProcessDialog } from '~/store/processes/process-move-actions';
+import { openCopyProcessDialog } from '~/store/processes/process-copy-actions';
export const processResourceActionSet: ContextMenuActionSet = [[
{
@@ -40,9 +41,7 @@ export const processResourceActionSet: ContextMenuActionSet = [[
{
icon: CopyIcon,
name: "Copy to project",
- execute: (dispatch, resource) => {
- // add code
- }
+ execute: (dispatch, resource) => dispatch<any>(openCopyProcessDialog(resource))
},
{
icon: DetailsIcon,
diff --git a/src/views-components/dialog-copy/dialog-collection-copy.tsx b/src/views-components/dialog-copy/dialog-copy.tsx
similarity index 89%
rename from src/views-components/dialog-copy/dialog-collection-copy.tsx
rename to src/views-components/dialog-copy/dialog-copy.tsx
index 33d16b8..4155415 100644
--- a/src/views-components/dialog-copy/dialog-collection-copy.tsx
+++ b/src/views-components/dialog-copy/dialog-copy.tsx
@@ -9,9 +9,9 @@ import { FormDialog } from '~/components/form-dialog/form-dialog';
import { ProjectTreePickerField } from '~/views-components/project-tree-picker/project-tree-picker';
import { COPY_NAME_VALIDATION, COPY_FILE_VALIDATION } from '~/validators/validators';
import { TextField } from "~/components/text-field/text-field";
-import { CollectionCopyFormDialogData } from "~/store/collections/collection-copy-actions";
+import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
-type CopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CollectionCopyFormDialogData>;
+type CopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CopyFormDialogData>;
export const DialogCopy = (props: CopyFormDialogProps) =>
<FormDialog
diff --git a/src/views-components/dialog-forms/copy-collection-dialog.ts b/src/views-components/dialog-forms/copy-collection-dialog.ts
index 1782390..41309fd 100644
--- a/src/views-components/dialog-forms/copy-collection-dialog.ts
+++ b/src/views-components/dialog-forms/copy-collection-dialog.ts
@@ -5,13 +5,14 @@
import { compose } from "redux";
import { withDialog } from "~/store/dialog/with-dialog";
import { reduxForm } from 'redux-form';
-import { COLLECTION_COPY_FORM_NAME, CollectionCopyFormDialogData } from '~/store/collections/collection-copy-actions';
-import { DialogCopy } from "~/views-components/dialog-copy/dialog-collection-copy";
+import { COLLECTION_COPY_FORM_NAME } from '~/store/collections/collection-copy-actions';
+import { DialogCopy } from "~/views-components/dialog-copy/dialog-copy";
import { copyCollection } from '~/store/workbench/workbench-actions';
+import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
export const CopyCollectionDialog = compose(
withDialog(COLLECTION_COPY_FORM_NAME),
- reduxForm<CollectionCopyFormDialogData>({
+ reduxForm<CopyFormDialogData>({
form: COLLECTION_COPY_FORM_NAME,
onSubmit: (data, dispatch) => {
dispatch(copyCollection(data));
diff --git a/src/views-components/dialog-forms/copy-process-dialog.ts b/src/views-components/dialog-forms/copy-process-dialog.ts
index d063562..4ec17c6 100644
--- a/src/views-components/dialog-forms/copy-process-dialog.ts
+++ b/src/views-components/dialog-forms/copy-process-dialog.ts
@@ -5,16 +5,17 @@
import { compose } from "redux";
import { withDialog } from "~/store/dialog/with-dialog";
import { reduxForm } from 'redux-form';
-import { PROCESS_COPY_FORM_NAME, ProcessCopyFormDialogData } from '~/store/processes/process-copy-actions';
-import { DialogCopy } from "~/views-components/dialog-copy/dialog-collection-copy";
-import { copyCollection } from '~/store/workbench/workbench-actions';
+import { PROCESS_COPY_FORM_NAME } from '~/store/processes/process-copy-actions';
+import { DialogCopy } from "~/views-components/dialog-copy/dialog-copy";
+import { copyProcess } from '~/store/workbench/workbench-actions';
+import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog';
export const CopyProcessDialog = compose(
withDialog(PROCESS_COPY_FORM_NAME),
- reduxForm<ProcessCopyFormDialogData>({
+ reduxForm<CopyFormDialogData>({
form: PROCESS_COPY_FORM_NAME,
onSubmit: (data, dispatch) => {
- dispatch(copyCollection(data));
+ dispatch(copyProcess(data));
}
})
)(DialogCopy);
\ No newline at end of file
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 4d231a0..0e85ca3 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -30,6 +30,7 @@ import { ProcessLogPanel } from '~/views/process-log-panel/process-log-panel';
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 { UpdateCollectionDialog } from '~/views-components/dialog-forms/update-collection-dialog';
import { UpdateProjectDialog } from '~/views-components/dialog-forms/update-project-dialog';
import { MoveProcessDialog } from '~/views-components/dialog-forms/move-process-dialog';
@@ -149,6 +150,7 @@ export const Workbench = withStyles(styles)(
<PartialCopyCollectionDialog />
<FileRemoveDialog />
<CopyCollectionDialog />
+ <CopyProcessDialog />
<FileRemoveDialog />
<MultipleFilesRemoveDialog />
<UpdateCollectionDialog />
commit 80e9a9f467827453339ddf581584762afd1748b0
Merge: a288630 ff74ff7
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Sep 10 09:43:21 2018 +0200
Merge branch 'master' into 14097-make-a-copy-process
refs #14097
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
commit a288630d830ed5aa076e3aa8482ab260190311cd
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Sep 10 09:42:48 2018 +0200
init make a copy
Feature #14097
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/processes/process-copy-actions.ts b/src/store/processes/process-copy-actions.ts
new file mode 100644
index 0000000..e3c5acc
--- /dev/null
+++ b/src/store/processes/process-copy-actions.ts
@@ -0,0 +1,11 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+export const PROCESS_COPY_FORM_NAME = 'processCopyFormName';
+
+export interface ProcessCopyFormDialogData {
+ name: string;
+ ownerUuid: string;
+ uuid: string;
+}
\ No newline at end of file
diff --git a/src/views-components/dialog-copy/dialog-collection-copy.tsx b/src/views-components/dialog-copy/dialog-collection-copy.tsx
index 029db57..33d16b8 100644
--- a/src/views-components/dialog-copy/dialog-collection-copy.tsx
+++ b/src/views-components/dialog-copy/dialog-collection-copy.tsx
@@ -13,15 +13,15 @@ import { CollectionCopyFormDialogData } from "~/store/collections/collection-cop
type CopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CollectionCopyFormDialogData>;
-export const DialogCollectionCopy = (props: CopyFormDialogProps) =>
+export const DialogCopy = (props: CopyFormDialogProps) =>
<FormDialog
dialogTitle='Make a copy'
- formFields={CollectionCopyFields}
+ formFields={CopyDialogFields}
submitLabel='Copy'
{...props}
/>;
-const CollectionCopyFields = () => <span>
+const CopyDialogFields = () => <span>
<Field
name='name'
component={TextField}
diff --git a/src/views-components/dialog-forms/copy-collection-dialog.ts b/src/views-components/dialog-forms/copy-collection-dialog.ts
index 245465f..1782390 100644
--- a/src/views-components/dialog-forms/copy-collection-dialog.ts
+++ b/src/views-components/dialog-forms/copy-collection-dialog.ts
@@ -6,7 +6,7 @@ import { compose } from "redux";
import { withDialog } from "~/store/dialog/with-dialog";
import { reduxForm } from 'redux-form';
import { COLLECTION_COPY_FORM_NAME, CollectionCopyFormDialogData } from '~/store/collections/collection-copy-actions';
-import { DialogCollectionCopy } from "~/views-components/dialog-copy/dialog-collection-copy";
+import { DialogCopy } from "~/views-components/dialog-copy/dialog-collection-copy";
import { copyCollection } from '~/store/workbench/workbench-actions';
export const CopyCollectionDialog = compose(
@@ -17,4 +17,4 @@ export const CopyCollectionDialog = compose(
dispatch(copyCollection(data));
}
})
-)(DialogCollectionCopy);
\ No newline at end of file
+)(DialogCopy);
\ No newline at end of file
diff --git a/src/views-components/dialog-forms/copy-process-dialog.ts b/src/views-components/dialog-forms/copy-process-dialog.ts
new file mode 100644
index 0000000..d063562
--- /dev/null
+++ b/src/views-components/dialog-forms/copy-process-dialog.ts
@@ -0,0 +1,20 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { compose } from "redux";
+import { withDialog } from "~/store/dialog/with-dialog";
+import { reduxForm } from 'redux-form';
+import { PROCESS_COPY_FORM_NAME, ProcessCopyFormDialogData } from '~/store/processes/process-copy-actions';
+import { DialogCopy } from "~/views-components/dialog-copy/dialog-collection-copy";
+import { copyCollection } from '~/store/workbench/workbench-actions';
+
+export const CopyProcessDialog = compose(
+ withDialog(PROCESS_COPY_FORM_NAME),
+ reduxForm<ProcessCopyFormDialogData>({
+ form: PROCESS_COPY_FORM_NAME,
+ onSubmit: (data, dispatch) => {
+ dispatch(copyCollection(data));
+ }
+ })
+)(DialogCopy);
\ No newline at end of file
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list