import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "~/components/icon/icon";
import { openUpdater } from "~/store/collections/updater/collection-updater-action";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
-import { openMoveToDialog } from "../../move-to-dialog/move-to-dialog";
-import { ResourceKind } from "~/models/resource";
+import { openMoveCollectionDialog } from '../../move-collection-dialog/move-collection-dialog';
export const collectionActionSet: ContextMenuActionSet = [[
{
{
icon: MoveToIcon,
name: "Move to",
- execute: (dispatch, resource) => dispatch<any>(openMoveToDialog({
- name: resource.name,
- uuid: resource.uuid,
- kind: ResourceKind.COLLECTION
- }))
+ execute: (dispatch, resource) => dispatch<any>(openMoveCollectionDialog(resource))
},
{
component: ToggleFavoriteAction,
import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon } from "~/components/icon/icon";
import { openUpdater } from "~/store/collections/updater/collection-updater-action";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
-import { openMoveToDialog } from "../../move-to-dialog/move-to-dialog";
-import { ResourceKind } from '~/models/resource';
+import { openMoveCollectionDialog } from '../../move-collection-dialog/move-collection-dialog';
export const collectionResourceActionSet: ContextMenuActionSet = [[
{
{
icon: MoveToIcon,
name: "Move to",
- execute: (dispatch, resource) => dispatch<any>(openMoveToDialog({
- name: resource.name,
- uuid: resource.uuid,
- kind: ResourceKind.COLLECTION
- }))
+ execute: (dispatch, resource) => dispatch<any>(openMoveCollectionDialog(resource))
},
{
component: ToggleFavoriteAction,
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "~/store/favorites/favorites-actions";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
-import { openMoveToDialog } from "../../move-to-dialog/move-to-dialog";
import { PROJECT_CREATE_DIALOG } from "../../dialog-create/dialog-project-create";
-import { ResourceKind } from '~/models/resource';
+import { openMoveProjectDialog } from '../../move-project-dialog/move-project-dialog';
export const projectActionSet: ContextMenuActionSet = [[
{
{
icon: MoveToIcon,
name: "Move to",
- execute: (dispatch, resource) => dispatch<any>(openMoveToDialog({
- name: resource.name,
- uuid: resource.uuid,
- kind: ResourceKind.PROJECT
- }))
+ execute: (dispatch, resource) => dispatch<any>(openMoveProjectDialog(resource))
},
]];
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { Dispatch, compose } from "redux";
+import { withDialog } from "~/store/dialog/with-dialog";
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { reduxForm, startSubmit, stopSubmit, initialize } from 'redux-form';
+import { ServiceRepository } from '~/services/services';
+import { RootState } from '~/store/store';
+import { getCommonResourceServiceError, CommonResourceServiceError } from "~/common/api/common-resource-service";
+import { snackbarActions } from '~/store/snackbar/snackbar-actions';
+import { MoveToFormDialogData, MoveToFormDialog } from '../move-to-dialog/move-to-dialog';
+
+export const MOVE_COLLECTION_DIALOG = 'moveCollectionDialog';
+
+export const openMoveCollectionDialog = (resource: { name: string, uuid: string }) =>
+ (dispatch: Dispatch) => {
+ dispatch(initialize(MOVE_COLLECTION_DIALOG, resource));
+ dispatch(dialogActions.OPEN_DIALOG({ id: MOVE_COLLECTION_DIALOG, data: {} }));
+ };
+
+export const moveCollection = (resource: MoveToFormDialogData) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ dispatch(startSubmit(MOVE_COLLECTION_DIALOG));
+ try {
+ const collection = await services.collectionService.get(resource.uuid);
+ await services.collectionService.update(resource.uuid, { ...collection, ownerUuid: resource.ownerUuid });
+ dispatch(dialogActions.CLOSE_DIALOG({ id: MOVE_COLLECTION_DIALOG }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved', hideDuration: 2000 }));
+ } catch (e) {
+ const error = getCommonResourceServiceError(e);
+ if (error === CommonResourceServiceError.UNIQUE_VIOLATION) {
+ dispatch(stopSubmit(MOVE_COLLECTION_DIALOG, { ownerUuid: 'A collection with the same name already exists in the target project.' }));
+ } else {
+ dispatch(dialogActions.CLOSE_DIALOG({ id: MOVE_COLLECTION_DIALOG }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not move the collection.', hideDuration: 2000 }));
+ }
+ }
+ };
+
+export const MoveCollectionDialog = compose(
+ withDialog(MOVE_COLLECTION_DIALOG),
+ reduxForm<MoveToFormDialogData>({
+ form: MOVE_COLLECTION_DIALOG,
+ onSubmit: (data, dispatch) => {
+ dispatch(moveCollection(data));
+ }
+ })
+)(MoveToFormDialog);
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { Dispatch, compose } from "redux";
+import { withDialog } from "~/store/dialog/with-dialog";
+import { dialogActions } from "~/store/dialog/dialog-actions";
+import { reduxForm, startSubmit, stopSubmit, initialize } from 'redux-form';
+import { ServiceRepository } from '~/services/services';
+import { RootState } from '~/store/store';
+import { getCommonResourceServiceError, CommonResourceServiceError } from "~/common/api/common-resource-service";
+import { snackbarActions } from '~/store/snackbar/snackbar-actions';
+import { MoveToFormDialogData, MoveToFormDialog } from '../move-to-dialog/move-to-dialog';
+
+export const MOVE_PROJECT_DIALOG = 'moveProjectDialog';
+
+export const openMoveProjectDialog = (resource: { name: string, uuid: string }) =>
+ (dispatch: Dispatch) => {
+ dispatch(initialize(MOVE_PROJECT_DIALOG, resource));
+ dispatch(dialogActions.OPEN_DIALOG({ id: MOVE_PROJECT_DIALOG, data: {} }));
+ };
+
+export const moveProject = (resource: MoveToFormDialogData) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ dispatch(startSubmit(MOVE_PROJECT_DIALOG));
+ try {
+ const project = await services.projectService.get(resource.uuid);
+ await services.projectService.update(resource.uuid, { ...project, ownerUuid: resource.ownerUuid });
+ dispatch(dialogActions.CLOSE_DIALOG({ id: MOVE_PROJECT_DIALOG }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Project has been moved', hideDuration: 2000 }));
+ } catch (e) {
+ const error = getCommonResourceServiceError(e);
+ if (error === CommonResourceServiceError.UNIQUE_VIOLATION) {
+ dispatch(stopSubmit(MOVE_PROJECT_DIALOG, { ownerUuid: 'A project with the same name already exists in the target project.' }));
+ } else if (error === CommonResourceServiceError.OWNERSHIP_CYCLE) {
+ dispatch(stopSubmit(MOVE_PROJECT_DIALOG, { ownerUuid: 'Cannot move a project into itself.' }));
+ } else {
+ dispatch(dialogActions.CLOSE_DIALOG({ id: MOVE_PROJECT_DIALOG }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not move the project.', hideDuration: 2000 }));
+ }
+ }
+ };
+
+export const MoveProjectDialog = compose(
+ withDialog(MOVE_PROJECT_DIALOG),
+ reduxForm<MoveToFormDialogData>({
+ form: MOVE_PROJECT_DIALOG,
+ onSubmit: (data, dispatch) => {
+ dispatch(moveProject(data));
+ }
+ })
+)(MoveToFormDialog);
+
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
-import { Dispatch, compose } from "redux";
-import { withDialog } from "~/store/dialog/with-dialog";
-import { dialogActions } from "~/store/dialog/dialog-actions";
-import { reduxForm, startSubmit, stopSubmit, InjectedFormProps, initialize, Field, WrappedFieldProps } from 'redux-form';
+import { InjectedFormProps, Field, WrappedFieldProps } from 'redux-form';
import { WithDialogProps } from '~/store/dialog/with-dialog';
import { FormDialog } from '~/components/form-dialog/form-dialog';
import { ProjectTreePicker } from '~/views-components/project-tree-picker/project-tree-picker';
import { Typography } from "@material-ui/core";
import { ResourceKind } from '~/models/resource';
-import { ServiceRepository, getResourceService } from '~/services/services';
-import { RootState } from '~/store/store';
-import { getCommonResourceServiceError, CommonResourceServiceError } from "~/common/api/common-resource-service";
-import { snackbarActions } from '../../store/snackbar/snackbar-actions';
-import { require } from '~/validators/require';
+import { MOVE_TO_VALIDATION } from '../../validators/validators';
-export const MOVE_TO_DIALOG = 'moveToDialog';
-
-export interface MoveToDialogResource {
+export interface MoveToFormDialogData {
name: string;
uuid: string;
ownerUuid: string;
kind: ResourceKind;
}
-export const openMoveToDialog = (resource: { name: string, uuid: string, kind: ResourceKind }) =>
- (dispatch: Dispatch) => {
- dispatch(initialize(MOVE_TO_DIALOG, resource));
- dispatch(dialogActions.OPEN_DIALOG({ id: MOVE_TO_DIALOG, data: {} }));
- };
-
-export const moveResource = (resource: MoveToDialogResource) =>
- async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const service = getResourceService(resource.kind, services);
- dispatch(startSubmit(MOVE_TO_DIALOG));
- if (service) {
- try {
- const originalResource = await service.get(resource.uuid);
- await service.update(resource.uuid, { ...originalResource, ownerUuid: resource.ownerUuid });
- dispatch(dialogActions.CLOSE_DIALOG({ id: MOVE_TO_DIALOG }));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Resource has been moved', hideDuration: 2000 }));
- } catch (e) {
- const error = getCommonResourceServiceError(e);
- if (error === CommonResourceServiceError.UNIQUE_VIOLATION) {
- dispatch(stopSubmit(MOVE_TO_DIALOG, { ownerUuid: 'A resource with the same name already exists in the target project.' }));
- } else if (error === CommonResourceServiceError.OWNERSHIP_CYCLE) {
- dispatch(stopSubmit(MOVE_TO_DIALOG, { ownerUuid: 'Cannot move a project into itself.' }));
- } else {
- dispatch(dialogActions.CLOSE_DIALOG({ id: MOVE_TO_DIALOG }));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not move the resource.', hideDuration: 2000 }));
- }
- }
- }
- };
-
-export const MoveToProjectDialog = compose(
- withDialog(MOVE_TO_DIALOG),
- reduxForm<MoveToDialogResource>({
- form: MOVE_TO_DIALOG,
- onSubmit: (data, dispatch) => {
- dispatch(moveResource(data));
- }
- })
-)((props: WithDialogProps<string> & InjectedFormProps<MoveToDialogResource>) =>
+export const MoveToFormDialog = (props: WithDialogProps<string> & InjectedFormProps<MoveToFormDialogData>) =>
<FormDialog
dialogTitle='Move to'
formFields={MoveToDialogFields}
submitLabel='Move'
{...props}
- />);
+ />;
-const MoveToDialogFields = (props: InjectedFormProps<MoveToDialogResource>) =>
+const MoveToDialogFields = () =>
<Field
name="ownerUuid"
- component={Picker}
- validate={validation} />;
-
-const validation = [require];
+ component={ProjectPicker}
+ validate={MOVE_TO_VALIDATION} />;
-const Picker = (props: WrappedFieldProps) =>
+const ProjectPicker = (props: WrappedFieldProps) =>
<div style={{ height: '200px', display: 'flex', flexDirection: 'column' }}>
<ProjectTreePicker onChange={handleChange(props)} />
{props.meta.dirty && props.meta.error &&
const handleChange = (props: WrappedFieldProps) => (value: string) =>
props.input.value === value
? props.input.onChange('')
- : props.input.onChange(value);
\ No newline at end of file
+ : props.input.onChange(value);
import { FileRemoveDialog } from '~/views-components/file-remove-dialog/file-remove-dialog';
import { MultipleFilesRemoveDialog } from '~/views-components/file-remove-dialog/multiple-files-remove-dialog';
import { DialogCollectionCreateWithSelectedFile } from '~/views-components/create-collection-dialog-with-selected/create-collection-dialog-with-selected';
-import { MoveToProjectDialog } from '../../views-components/move-to-dialog/move-to-dialog';
import { COLLECTION_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-collection-create';
import { PROJECT_CREATE_DIALOG } from '~/views-components/dialog-create/dialog-project-create';
import { UploadCollectionFilesDialog } from '~/views-components/upload-collection-files-dialog/upload-collection-files-dialog';
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';
const DRAWER_WITDH = 240;
const APP_BAR_HEIGHT = 100;
<CreateCollectionDialog />
<RenameFileDialog />
<CollectionPartialCopyDialog />
- <MoveToProjectDialog />
<DialogCollectionCreateWithSelectedFile />
<FileRemoveDialog />
<MultipleFilesRemoveDialog />
<UpdateCollectionDialog />
<UploadCollectionFilesDialog />
<UpdateProjectDialog />
+ <MoveCollectionDialog />
+ <MoveProjectDialog />
<CurrentTokenDialog
currentToken={this.props.currentToken}
open={this.state.isCurrentTokenDialogOpen}
projects / arvados-workbench2.git / commitdiff