projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14565-admin-managing-user'
[arvados-workbench2.git]
/
src
/
views-components
/
form-fields
/
collection-form-fields.tsx
diff --git
a/src/views-components/form-fields/collection-form-fields.tsx
b/src/views-components/form-fields/collection-form-fields.tsx
index ddd5bceff37d8aabdc60a631f6367d7216bc0abf..c02996d81cb21b148708d0cac1a2a9a398a1ee65 100644
(file)
--- a/
src/views-components/form-fields/collection-form-fields.tsx
+++ b/
src/views-components/form-fields/collection-form-fields.tsx
@@
-3,17
+3,19
@@
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
-import { Field
, WrappedFieldProps
} from "redux-form";
+import { Field } from "redux-form";
import { TextField } from "~/components/text-field/text-field";
import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION, COLLECTION_PROJECT_VALIDATION } from "~/validators/validators";
import { TextField } from "~/components/text-field/text-field";
import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION, COLLECTION_PROJECT_VALIDATION } from "~/validators/validators";
-import { ProjectTreePicker } from "~/views-components/project-tree-picker/project-tree-picker";
+import { ProjectTreePickerField } from "~/views-components/project-tree-picker/project-tree-picker";
+import { PickerIdProp } from '~/store/tree-picker/picker-id';
export const CollectionNameField = () =>
<Field
name='name'
component={TextField}
validate={COLLECTION_NAME_VALIDATION}
export const CollectionNameField = () =>
<Field
name='name'
component={TextField}
validate={COLLECTION_NAME_VALIDATION}
- label="Collection Name" />;
+ label="Collection Name"
+ autoFocus={true} />;
export const CollectionDescriptionField = () =>
<Field
export const CollectionDescriptionField = () =>
<Field
@@
-22,13
+24,9
@@
export const CollectionDescriptionField = () =>
validate={COLLECTION_DESCRIPTION_VALIDATION}
label="Description - optional" />;
validate={COLLECTION_DESCRIPTION_VALIDATION}
label="Description - optional" />;
-export const CollectionProjectPickerField = () =>
+export const CollectionProjectPickerField = (
props: PickerIdProp
) =>
<Field
name="projectUuid"
<Field
name="projectUuid"
- component={ProjectPicker}
+ pickerId={props.pickerId}
+ component={ProjectTreePickerField}
validate={COLLECTION_PROJECT_VALIDATION} />;
validate={COLLECTION_PROJECT_VALIDATION} />;
-
-const ProjectPicker = (props: WrappedFieldProps) =>
- <div style={{ height: '144px', display: 'flex', flexDirection: 'column' }}>
- <ProjectTreePicker onChange={projectUuid => props.input.onChange(projectUuid)} />
- </div>;