X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1a59e5dcc15a9a1aebfd15a08903fcb75efd2aac..c29de730b2cf8582667e21bc985530a804797186:/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 2d2a7c80..b3a3c224 100644
--- a/src/views-components/form-fields/collection-form-fields.tsx
+++ b/src/views-components/form-fields/collection-form-fields.tsx
@@ -3,19 +3,37 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
-import { Field, WrappedFieldProps } from "redux-form";
+import { Field, Validator } 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 { ProjectTreePicker, ProjectTreePickerField } from "~/views-components/project-tree-picker/project-tree-picker";
-import { PickerIdProp } from '../../store/tree-picker/picker-id';
+import {
+ COLLECTION_NAME_VALIDATION, COLLECTION_NAME_VALIDATION_ALLOW_SLASH,
+ COLLECTION_DESCRIPTION_VALIDATION, COLLECTION_PROJECT_VALIDATION
+} from "~/validators/validators";
+import { ProjectTreePickerField, CollectionTreePickerField } from "~/views-components/projects-tree-picker/tree-picker-field";
+import { PickerIdProp } from '~/store/tree-picker/picker-id';
+import { connect } from "react-redux";
+import { RootState } from "~/store/store";
-export const CollectionNameField = () =>
- ;
+interface CollectionNameFieldProps {
+ validate: Validator[];
+}
+
+// See implementation note on declaration of ProjectNameField
+
+export const CollectionNameField = connect(
+ (state: RootState) => {
+ return {
+ validate: (state.auth.config.clusterConfig.Collections.ForwardSlashNameSubstitution === "" ?
+ COLLECTION_NAME_VALIDATION : COLLECTION_NAME_VALIDATION_ALLOW_SLASH)
+ };
+ })((props: CollectionNameFieldProps) =>
+
+ );
export const CollectionDescriptionField = () =>
pickerId={props.pickerId}
component={ProjectTreePickerField}
validate={COLLECTION_PROJECT_VALIDATION} />;
+
+export const CollectionPickerField = (props: PickerIdProp) =>
+ ;