cr changes

Feature #13988

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --git a/src/validators/validators.tsx b/src/validators/validators.tsx
index 92f917e8bbe45b26765b65d43929c88f79ba5353..fd45a3126a21a4c9ded90bf1ef68603f76b32da9 100644 (file)
--- a/src/validators/validators.tsx
+++ b/src/validators/validators.tsx
@@ -16,6 +16,6 @@ export const COLLECTION_DESCRIPTION_VALIDATION = [maxLength(255)];
 export const COLLECTION_PROJECT_VALIDATION = [require];
 
 export const COPY_NAME_VALIDATION = [require, maxLength(255)];
-export const MAKE_A_COPY_VALIDATION = [require];
+export const COPY_PROJECT_VALIDATION = [require];
 
 export const MOVE_TO_VALIDATION = [require];

diff --git a/src/views-components/project-copy-dialog/project-copy-dialog.tsx b/src/views-components/project-copy-dialog/project-copy-dialog.tsx
index 7f37a510537e2a2a22d6c3c54191efa77e801475..e136a3e69162062e69cd223f11cc02e591761309 100644 (file)
--- a/src/views-components/project-copy-dialog/project-copy-dialog.tsx
+++ b/src/views-components/project-copy-dialog/project-copy-dialog.tsx
@@ -7,11 +7,13 @@ 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/project-tree-picker/project-tree-picker';
-import { COPY_NAME_VALIDATION, MAKE_A_COPY_VALIDATION } from '~/validators/validators';
+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";
 
-export const ProjectCopyFormDialog = (props: WithDialogProps<string> & InjectedFormProps<ProjectCopyFormDialogData>) =>
+type ProjectCopyFormDialogProps = WithDialogProps<string> & InjectedFormProps<ProjectCopyFormDialogData>;
+
+export const ProjectCopyFormDialog = (props: ProjectCopyFormDialogProps) =>
     <FormDialog
         dialogTitle='Make a copy'
         formFields={ProjectCopyFields}
@@ -19,20 +21,14 @@ export const ProjectCopyFormDialog = (props: WithDialogProps<string> & InjectedF
         {...props}
     />;
 
-const ProjectCopyFields = () => <div>
-    <ProjectCopyNameField />
-    <ProjectCopyDialogFields />
-</div>;
-
-const ProjectCopyNameField = () =>
+const ProjectCopyFields = () => <span>
     <Field
         name='name'
         component={TextField}
         validate={COPY_NAME_VALIDATION}
-        label="Enter a new name for the copy" />;
-
-const ProjectCopyDialogFields = () =>
+        label="Enter a new name for the copy" />
     <Field
         name="projectUuid"
         component={ProjectTreePickerField}
-        validate={MAKE_A_COPY_VALIDATION} />;
+        validate={COPY_PROJECT_VALIDATION} />
+</span>;