X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/37ef971c0db3e1989dcab9268337bc92aa950499..b676312f840c3f12855a4392afe90b275dd25b97:/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 a547659f..8941d441 100644
--- a/src/views-components/resource-properties-form/property-value-field.tsx
+++ b/src/views-components/resource-properties-form/property-value-field.tsx
@@ -2,67 +2,111 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import * as React from 'react';
-import { WrappedFieldProps, Field, formValues } from 'redux-form';
+import React from 'react';
+import { WrappedFieldProps, Field, formValues, FormName, WrappedFieldInputProps, WrappedFieldMetaProps, change } from 'redux-form';
import { compose } from 'redux';
-import { Autocomplete } from '~/components/autocomplete/autocomplete';
-import { Vocabulary } from '~/models/vocabulary';
-import { PROPERTY_KEY_FIELD_NAME } from '~/views-components/resource-properties-form/property-key-field';
-import { VocabularyProp, connectVocabulary, buildProps } from '~/views-components/resource-properties-form/property-field-common';
-import { TAG_VALUE_VALIDATION } from '~/validators/validators';
+import { Autocomplete } from 'components/autocomplete/autocomplete';
+import { Vocabulary, isStrictTag, getTagValues, getTagValueID, getTagValueLabel, PropFieldSuggestion, getPreferredTagValues } from 'models/vocabulary';
+import { PROPERTY_KEY_FIELD_ID, PROPERTY_KEY_FIELD_NAME } from 'views-components/resource-properties-form/property-key-field';
+import {
+ handleSelect,
+ handleBlur,
+ VocabularyProp,
+ ValidationProp,
+ connectVocabulary,
+ buildProps
+} from 'views-components/resource-properties-form/property-field-common';
+import { TAG_VALUE_VALIDATION } from 'validators/validators';
+import { escapeRegExp } from 'common/regexp';
+import { ChangeEvent } from 'react';
interface PropertyKeyProp {
- propertyKey: string;
+ propertyKeyId: string;
+ propertyKeyName: string;
+}
+
+interface PropertyValueInputProp {
+ disabled: boolean;
}
-export type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp;
+type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp & ValidationProp & PropertyValueInputProp;
export const PROPERTY_VALUE_FIELD_NAME = 'value';
+export const PROPERTY_VALUE_FIELD_ID = 'valueID';
-export const PropertyValueField = compose(
+const connectVocabularyAndPropertyKey = compose(
connectVocabulary,
- formValues({ propertyKey: PROPERTY_KEY_FIELD_NAME })
-)(
- (props: PropertyValueFieldProps) =>
+ formValues({
+ propertyKeyId: PROPERTY_KEY_FIELD_ID,
+ propertyKeyName: PROPERTY_KEY_FIELD_NAME,
+ }),
+);
+
+export const PropertyValueField = connectVocabularyAndPropertyKey(
+ ({ skipValidation, ...props }: PropertyValueFieldProps) =>
+
);
+ validate={skipValidation ? undefined : getValidation(props)}
+ {...{...props, disabled: !props.propertyKeyName}} />
+
+);
-export const PropertyValueInput = ({ vocabulary, propertyKey, ...props }: WrappedFieldProps & PropertyValueFieldProps) =>
- ;
+const PropertyValueInput = ({ vocabulary, propertyKeyId, propertyKeyName, ...props }: WrappedFieldProps & PropertyValueFieldProps) =>
+ (
+ s.synonyms && s.synonyms.length > 0
+ ? `${s.label} (${s.synonyms.join('; ')})`
+ : s.label
+ }
+ onSelect={handleSelect(PROPERTY_VALUE_FIELD_ID, data.form, props.input, props.meta)}
+ onBlur={() => {
+ // Case-insensitive search for the value in the vocabulary
+ const foundValueID = getTagValueID(propertyKeyId, props.input.value, vocabulary);
+ if (foundValueID !== '') {
+ props.input.value = getTagValueLabel(propertyKeyId, foundValueID, vocabulary);
+ }
+ handleBlur(PROPERTY_VALUE_FIELD_ID, data.form, props.meta, props.input, foundValueID)();
+ }}
+ onChange={(e: ChangeEvent) => {
+ const newValue = e.currentTarget.value;
+ const tagValueID = getTagValueID(propertyKeyId, newValue, vocabulary);
+ handleChange(data.form, tagValueID, props.input, props.meta, newValue);
+ }}
+ />
+ )} />;
const getValidation = (props: PropertyValueFieldProps) =>
- isStrictTag(props.propertyKey, props.vocabulary)
+ isStrictTag(props.propertyKeyId, props.vocabulary)
? [...TAG_VALUE_VALIDATION, matchTagValues(props)]
: TAG_VALUE_VALIDATION;
-const matchTagValues = ({ vocabulary, propertyKey }: PropertyValueFieldProps) =>
+const matchTagValues = ({ vocabulary, propertyKeyId }: PropertyValueFieldProps) =>
(value: string) =>
- getTagValues(propertyKey, vocabulary).find(v => v.id.includes(value))
+ getTagValues(propertyKeyId, vocabulary).find(v => !value || v.label === value)
? undefined
: 'Incorrect value';
-const getSuggestions = (value: string, tagKey: string, vocabulary: Vocabulary) =>
- getTagValues(tagKey, vocabulary).filter(v => v.label.includes(value) && v.label !== value);
-
-const isStrictTag = (tagKey: string, vocabulary: Vocabulary) => {
- const tag = vocabulary.tags[tagKey];
- return tag ? tag.strict : false;
+const getSuggestions = (value: string, tagName: string, vocabulary: Vocabulary) => {
+ const re = new RegExp(escapeRegExp(value), "i");
+ return getPreferredTagValues(tagName, vocabulary, value).filter(
+ val => (val.label !== value && re.test(val.label)) ||
+ (val.synonyms && val.synonyms.some(s => re.test(s))));
};
-const getTagValues = (tagKey: string, vocabulary: Vocabulary) => {
- const tag = vocabulary.tags[tagKey];
- const ret = tag && tag.values
- ? Object.keys(tag.values).map(
- tagValueID => tag.values![tagValueID].labels
- ? {"id": tagValueID, "label": tag.values![tagValueID].labels[0].label}
- : {"id": tagValueID, "label": tagValueID})
- : [];
- return ret;
-};
+const handleChange = (
+ formName: string,
+ tagValueID: string,
+ { onChange }: WrappedFieldInputProps,
+ { dispatch }: WrappedFieldMetaProps,
+ value: string) => {
+ onChange(value);
+ dispatch(change(formName, PROPERTY_VALUE_FIELD_NAME, value));
+ dispatch(change(formName, PROPERTY_VALUE_FIELD_ID, tagValueID));
+ };
\ No newline at end of file