[ARVADOS-WORKBENCH2] updated: 1.2.0-124-gb478a2d
Git user
git at public.curoverse.com
Wed Aug 22 08:12:41 EDT 2018
Summary of changes:
src/validators/validators.tsx | 2 +-
.../project-copy-dialog/project-copy-dialog.tsx | 20 ++++++++------------
2 files changed, 9 insertions(+), 13 deletions(-)
via b478a2dc99c373634dffd5a1110f0fa3a53866ef (commit)
from 13810782091128f6cf5b346243be77f5c1776d2c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b478a2dc99c373634dffd5a1110f0fa3a53866ef
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Wed Aug 22 14:12:26 2018 +0200
cr changes
Feature #13988
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/validators/validators.tsx b/src/validators/validators.tsx
index 92f917e..fd45a31 100644
--- 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 7f37a51..e136a3e 100644
--- 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>;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list