[ARVADOS-WORKBENCH2] created: 1.2.0-130-gf8a4392
Git user
git at public.curoverse.com
Thu Aug 23 08:07:57 EDT 2018
at f8a43920a3a9808e4aad77a73c5966b800e34882 (commit)
commit f8a43920a3a9808e4aad77a73c5966b800e34882
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Thu Aug 23 14:07:35 2018 +0200
13897-make-a-copy-collections
Feature #13897
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/collection-copy-dialog/collection-copy-dialog.ts b/src/store/collection-copy-dialog/collection-copy-dialog.ts
new file mode 100644
index 0000000..d264063
--- /dev/null
+++ b/src/store/collection-copy-dialog/collection-copy-dialog.ts
@@ -0,0 +1,51 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { Dispatch } from "redux";
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { initialize, startSubmit, stopSubmit } 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 { getCommonResourceServiceError, CommonResourceServiceError } from '~/common/api/common-resource-service';
+import { snackbarActions } from '../snackbar/snackbar-actions';
+import { projectPanelActions } from '~/store/project-panel/project-panel-action';
+
+export const COLLECTION_COPY_DIALOG = 'projectCopy';
+
+export interface CopyFormDialogData {
+ name: string;
+ ownerUuid: string;
+ uuid: string;
+}
+
+export const openCollectionCopyDialog = (resource: { name: string, uuid: string }) =>
+ (dispatch: Dispatch) => {
+ dispatch<any>(resetPickerProjectTree());
+ const initialData: CopyFormDialogData = { name: `Copy of: ${resource.name}`, ownerUuid: '', uuid: resource.uuid };
+ dispatch<any>(initialize(COLLECTION_COPY_DIALOG, initialData));
+ dispatch(dialogActions.OPEN_DIALOG({ id: COLLECTION_COPY_DIALOG, data: {} }));
+ };
+
+export const copyCollection = (resource: CopyFormDialogData) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ dispatch(startSubmit(COLLECTION_COPY_DIALOG));
+ try {
+ const collection = await services.collectionService.get(resource.uuid);
+ const uuidKey = 'uuid';
+ delete collection[uuidKey];
+ await services.collectionService.create({ ...collection, ownerUuid: resource.ownerUuid, name: resource.name });
+ dispatch(projectPanelActions.REQUEST_ITEMS());
+ dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_COPY_DIALOG }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied', hideDuration: 2000 }));
+ } catch (e) {
+ const error = getCommonResourceServiceError(e);
+ if (error === CommonResourceServiceError.UNIQUE_VIOLATION) {
+ dispatch(stopSubmit(COLLECTION_COPY_DIALOG, { ownerUuid: 'A collection with the same name already exists in the target project.' }));
+ } else {
+ dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_COPY_DIALOG }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not copy the collection', hideDuration: 2000 }));
+ }
+ }
+ };
\ No newline at end of file
diff --git a/src/store/project-copy-dialog/project-copy-dialog.ts b/src/store/project-copy-dialog/project-copy-dialog.ts
deleted file mode 100644
index dbf3f8f..0000000
--- a/src/store/project-copy-dialog/project-copy-dialog.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-export interface ProjectCopyFormDialogData {
- name: string;
- projectUuid: string;
- uuid: string;
-}
\ No newline at end of file
diff --git a/src/store/project-copy-project-dialog/project-copy-project-dialog.ts b/src/store/project-copy-project-dialog/project-copy-project-dialog.ts
deleted file mode 100644
index 11cd305..0000000
--- a/src/store/project-copy-project-dialog/project-copy-project-dialog.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: AGPL-3.0
-
-import { Dispatch } from "redux";
-import { dialogActions } from "~/store/dialog/dialog-actions";
-import { initialize, startSubmit, stopSubmit } from 'redux-form';
-import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
-import { ProjectCopyFormDialogData } from "~/store/project-copy-dialog/project-copy-dialog";
-
-export const PROJECT_COPY_DIALOG = 'projectCopy';
-
-export const openProjectCopyDialog = (data: { projectUuid: string, name: string }) =>
- (dispatch: Dispatch) => {
- dispatch<any>(resetPickerProjectTree());
- const initialData: ProjectCopyFormDialogData = { name: `Copy of: ${data.name}`, projectUuid: '', uuid: data.projectUuid };
- dispatch<any>(initialize(PROJECT_COPY_DIALOG, initialData));
- dispatch(dialogActions.OPEN_DIALOG({ id: PROJECT_COPY_DIALOG, data: {} }));
- };
-
-export const copyProject = (data: {}) =>
- (dispatch: Dispatch) => {
- dispatch(startSubmit(PROJECT_COPY_DIALOG));
- setTimeout(() => dispatch(stopSubmit(PROJECT_COPY_DIALOG, { name: 'Invalid path' })), 2000);
- };
\ No newline at end of file
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 d02c987..78bab04 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
@@ -9,7 +9,7 @@ import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGra
import { openUpdater } from "~/store/collections/updater/collection-updater-action";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
import { openMoveCollectionDialog } from '~/store/move-collection-dialog/move-collection-dialog';
-import { openProjectCopyDialog } from "~/store/project-copy-project-dialog/project-copy-project-dialog";
+import { openCollectionCopyDialog } from "~/store/collection-copy-dialog/collection-copy-dialog";
export const collectionActionSet: ContextMenuActionSet = [[
{
@@ -43,7 +43,7 @@ export const collectionActionSet: ContextMenuActionSet = [[
icon: CopyIcon,
name: "Copy to project",
execute: (dispatch, resource) => {
- dispatch<any>(openProjectCopyDialog({name: resource.name, projectUuid: resource.uuid}));
+ dispatch<any>(openCollectionCopyDialog(resource));
}
},
{
diff --git a/src/views-components/context-menu/action-sets/collection-resource-action-set.ts b/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
index 1870c2f..5c9206a 100644
--- a/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
@@ -9,7 +9,7 @@ import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon }
import { openUpdater } from "~/store/collections/updater/collection-updater-action";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
import { openMoveCollectionDialog } from '~/store/move-collection-dialog/move-collection-dialog';
-import { openProjectCopyDialog } from '~/store/project-copy-project-dialog/project-copy-project-dialog';
+import { openCollectionCopyDialog } from '~/store/collection-copy-dialog/collection-copy-dialog';
export const collectionResourceActionSet: ContextMenuActionSet = [[
{
@@ -43,7 +43,7 @@ export const collectionResourceActionSet: ContextMenuActionSet = [[
icon: CopyIcon,
name: "Copy to project",
execute: (dispatch, resource) => {
- dispatch<any>(openProjectCopyDialog({name: resource.name, projectUuid: resource.uuid}));
+ dispatch<any>(openCollectionCopyDialog(resource));
},
},
{
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 3948b8c..8ae60c8 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -12,7 +12,6 @@ import { toggleFavorite } from "~/store/favorites/favorites-actions";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
import { PROJECT_CREATE_DIALOG } from "../../dialog-create/dialog-project-create";
import { openMoveProjectDialog } from '~/store/move-project-dialog/move-project-dialog';
-import { openProjectCopyDialog } from "~/store/project-copy-project-dialog/project-copy-project-dialog";
export const projectActionSet: ContextMenuActionSet = [[
{
@@ -48,7 +47,7 @@ export const projectActionSet: ContextMenuActionSet = [[
icon: CopyIcon,
name: "Copy to project",
execute: (dispatch, resource) => {
- dispatch<any>(openProjectCopyDialog({name: resource.name, projectUuid: resource.uuid}));
+ // add code
}
- }
+ },
]];
diff --git a/src/views-components/copy-dialog/copy-collection-dialog.tsx b/src/views-components/copy-dialog/copy-collection-dialog.tsx
new file mode 100644
index 0000000..db721e0
--- /dev/null
+++ b/src/views-components/copy-dialog/copy-collection-dialog.tsx
@@ -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 { COLLECTION_COPY_DIALOG, CopyFormDialogData } from '~/store/collection-copy-dialog/collection-copy-dialog';
+import { CopyFormDialog } from "~/views-components/copy-dialog/copy-dialog";
+import { copyCollection } from '~/store/collection-copy-dialog/collection-copy-dialog';
+
+export const CollectionCopyDialog = compose(
+ withDialog(COLLECTION_COPY_DIALOG),
+ reduxForm<CopyFormDialogData>({
+ form: COLLECTION_COPY_DIALOG,
+ onSubmit: (data, dispatch) => {
+ dispatch(copyCollection(data));
+ }
+ })
+)(CopyFormDialog);
\ No newline at end of file
diff --git a/src/views-components/project-copy-dialog/project-copy-dialog.tsx b/src/views-components/copy-dialog/copy-dialog.tsx
similarity index 71%
rename from src/views-components/project-copy-dialog/project-copy-dialog.tsx
rename to src/views-components/copy-dialog/copy-dialog.tsx
index e136a3e..c9b6486 100644
--- a/src/views-components/project-copy-dialog/project-copy-dialog.tsx
+++ b/src/views-components/copy-dialog/copy-dialog.tsx
@@ -9,26 +9,26 @@ import { FormDialog } from '~/components/form-dialog/form-dialog';
import { ProjectTreePickerField } from '~/views-components/project-tree-picker/project-tree-picker';
import { COPY_NAME_VALIDATION, COPY_PROJECT_VALIDATION } from '~/validators/validators';
import { TextField } from "~/components/text-field/text-field";
-import { ProjectCopyFormDialogData } from "~/store/project-copy-dialog/project-copy-dialog";
+import { CopyFormDialogData } from "~/store/collection-copy-dialog/collection-copy-dialog";
-type ProjectCopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<ProjectCopyFormDialogData>;
+type CopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<CopyFormDialogData>;
-export const ProjectCopyFormDialog = (props: ProjectCopyFormDialogProps) =>
+export const CopyFormDialog = (props: CopyFormDialogProps) =>
<FormDialog
dialogTitle='Make a copy'
- formFields={ProjectCopyFields}
+ formFields={CopyFields}
submitLabel='Copy'
{...props}
/>;
-const ProjectCopyFields = () => <span>
+const CopyFields = () => <span>
<Field
name='name'
component={TextField}
validate={COPY_NAME_VALIDATION}
label="Enter a new name for the copy" />
<Field
- name="projectUuid"
+ name="ownerUuid"
component={ProjectTreePickerField}
validate={COPY_PROJECT_VALIDATION} />
</span>;
diff --git a/src/views-components/project-copy-project-dialog/project-copy-project-dialog.tsx b/src/views-components/project-copy-project-dialog/project-copy-project-dialog.tsx
deleted file mode 100644
index 3478d9f..0000000
--- a/src/views-components/project-copy-project-dialog/project-copy-project-dialog.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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 { PROJECT_COPY_DIALOG } from '~/store/project-copy-project-dialog/project-copy-project-dialog';
-import { ProjectCopyFormDialog } from "~/views-components/project-copy-dialog/project-copy-dialog";
-import { copyProject } from '../../store/project-copy-project-dialog/project-copy-project-dialog';
-
-export const ProjectCopyDialog = compose(
- withDialog(PROJECT_COPY_DIALOG),
- reduxForm({
- form: PROJECT_COPY_DIALOG,
- onSubmit: (data, dispatch) => dispatch(copyProject(data))
- })
-)(ProjectCopyFormDialog);
\ No newline at end of file
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 89bd71e..d372b53 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -53,7 +53,7 @@ import { UploadCollectionFilesDialog } from '~/views-components/upload-collectio
import { CollectionPartialCopyDialog } from '../../views-components/collection-partial-copy-dialog/collection-partial-copy-dialog';
import { MoveProjectDialog } from '~/views-components/move-project-dialog/move-project-dialog';
import { MoveCollectionDialog } from '~/views-components/move-collection-dialog/move-collection-dialog';
-import { ProjectCopyDialog } from '~/views-components/project-copy-project-dialog/project-copy-project-dialog';
+import { CollectionCopyDialog } from '~/views-components/copy-dialog/copy-collection-dialog';
const DRAWER_WITDH = 240;
const APP_BAR_HEIGHT = 100;
@@ -250,7 +250,7 @@ export const Workbench = withStyles(styles)(
<CollectionPartialCopyDialog />
<DialogCollectionCreateWithSelectedFile />
<FileRemoveDialog />
- <ProjectCopyDialog />
+ <CollectionCopyDialog />
<MultipleFilesRemoveDialog />
<UpdateCollectionDialog />
<UploadCollectionFilesDialog />
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list