Clean up code

[arvados.git] / src / views-components / move-to-dialog / move-to-dialog.tsx

diff --git a/src/views-components/move-to-dialog/move-to-dialog.tsx b/src/views-components/move-to-dialog/move-to-dialog.tsx
index d7c66bc4a470a800de70aa5665d6c6e843dd824d..4c27722c6de5b6fe0244fcf45ca393f0db253543 100644 (file)
--- a/src/views-components/move-to-dialog/move-to-dialog.tsx
+++ b/src/views-components/move-to-dialog/move-to-dialog.tsx
@@ -3,86 +3,38 @@
 // 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 { MOVE_TO_VALIDATION } from '~/validators/validators';
 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';
-
-export const MOVE_TO_DIALOG = 'moveToDialog';
-
-export interface MoveToDialogResource {
-    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, owner_uuid: 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 {
-                    dispatch(dialogActions.CLOSE_DIALOG({ id: MOVE_TO_DIALOG }));
-                    dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not move the resource.', hideDuration: 2000 }));
-                }
-            }
-        }
-    };
+import { MOVE_TO_VALIDATION } from '~/validators/validators';
+import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
 
-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 = () =>
     <Field
         name="ownerUuid"
-        component={Picker}
+        component={ProjectPicker}
         validate={MOVE_TO_VALIDATION} />;
 
-
-const Picker = (props: WrappedFieldProps) =>
-    <div style={{ height: '144px', display: 'flex', flexDirection: 'column' }}>
-        <ProjectTreePicker onChange={projectUuid => props.input.onChange(projectUuid)} />
+const ProjectPicker = (props: WrappedFieldProps) =>
+    <div style={{ height: '200px', display: 'flex', flexDirection: 'column' }}>
+        <ProjectTreePicker onChange={handleChange(props)} />
         {props.meta.dirty && props.meta.error &&
             <Typography variant='caption' color='error'>
                 {props.meta.error}
             </Typography>}
     </div>;
+
+const handleChange = (props: WrappedFieldProps) => (value: string) =>
+    props.input.value === value
+        ? props.input.onChange('')
+        : props.input.onChange(value);