X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/768d715efc5ecf3f0108a70f695e3c32e187c900..dbbaaf10b4f87f30a3d15480b9d27dc909d5c4e1:/src/views-components/resource-properties-form/property-value-field.tsx diff --git a/src/views-components/resource-properties-form/property-value-field.tsx b/src/views-components/resource-properties-form/property-value-field.tsx index ff0959d9..13dcfeb5 100644 --- a/src/views-components/resource-properties-form/property-value-field.tsx +++ b/src/views-components/resource-properties-form/property-value-field.tsx @@ -4,19 +4,18 @@ import * as React from 'react'; import { WrappedFieldProps, Field, formValues } from 'redux-form'; -import { identity } from 'lodash'; import { compose } from 'redux'; import { Autocomplete } from '~/components/autocomplete/autocomplete'; import { Vocabulary } from '~/models/vocabulary'; -import { require } from '~/validators/require'; import { PROPERTY_KEY_FIELD_NAME } from '~/views-components/resource-properties-form/property-key-field'; -import { ITEMS_PLACEHOLDER, VocabularyProp, connectVocabulary, hasError, getErrorMsg, handleBlur, buildProps } from '~/views-components/resource-properties-form/property-field-common'; +import { VocabularyProp, connectVocabulary, buildProps } from '~/views-components/resource-properties-form/property-field-common'; +import { TAG_VALUE_VALIDATION } from '~/validators/validators'; interface PropertyKeyProp { propertyKey: string; } -type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp; +export type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp; export const PROPERTY_VALUE_FIELD_NAME = 'value'; @@ -31,7 +30,7 @@ export const PropertyValueField = compose( validate={getValidation(props)} {...props} />); -const PropertyValueInput = ({ vocabulary, propertyKey, ...props }: WrappedFieldProps & PropertyValueFieldProps) => +export const PropertyValueInput = ({ vocabulary, propertyKey, ...props }: WrappedFieldProps & PropertyValueFieldProps) => isStrictTag(props.propertyKey, props.vocabulary) - ? [require, matchTagValues(props)] - : [require]; + ? [...TAG_VALUE_VALIDATION, matchTagValues(props)] + : TAG_VALUE_VALIDATION; const matchTagValues = ({ vocabulary, propertyKey }: PropertyValueFieldProps) => (value: string) =>