projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14393-vocabulary'
[arvados-workbench2.git]
/
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 a9edc8047bee6899175c2fc1ac61bd30c17a857b..db2db3f7ece5e63ed7656f2f3a417996b3238dad 100644
(file)
--- 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,12
@@
import * as React from 'react';
import { WrappedFieldProps, Field, formValues } from 'redux-form';
import * as React from 'react';
import { WrappedFieldProps, Field, formValues } from 'redux-form';
-import { connect } from 'react-redux';
-import { identity } from 'lodash';
import { compose } from 'redux';
import { compose } from 'redux';
-import { RootState } from '~/store/store';
-import { getVocabulary } from '~/store/vocabulary/vocabulary-selctors';
import { Autocomplete } from '~/components/autocomplete/autocomplete';
import { Vocabulary } from '~/models/vocabulary';
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 { PROPERTY_KEY_FIELD_NAME } from '~/views-components/resource-properties-form/property-key-field';
-
-interface VocabularyProp {
- vocabulary: Vocabulary;
-}
+import { VocabularyProp, connectVocabulary, buildProps } from '~/views-components/resource-properties-form/property-field-common';
+import { TAG_VALUE_VALIDATION } from '~/validators/validators';
interface PropertyKeyProp {
propertyKey: string;
interface PropertyKeyProp {
propertyKey: string;
@@
-24,14
+17,10
@@
interface PropertyKeyProp {
type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp;
type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp;
-const mapStateToProps = (state: RootState): VocabularyProp => ({
- vocabulary: getVocabulary(state.properties),
-});
-
export const PROPERTY_VALUE_FIELD_NAME = 'value';
export const PropertyValueField = compose(
export const PROPERTY_VALUE_FIELD_NAME = 'value';
export const PropertyValueField = compose(
- connect
(mapStateToProps)
,
+ connect
Vocabulary
,
formValues({ propertyKey: PROPERTY_KEY_FIELD_NAME })
)(
(props: PropertyValueFieldProps) =>
formValues({ propertyKey: PROPERTY_KEY_FIELD_NAME })
)(
(props: PropertyValueFieldProps) =>
@@
-41,23
+30,17
@@
export const PropertyValueField = compose(
validate={getValidation(props)}
{...props} />);
validate={getValidation(props)}
{...props} />);
-const PropertyValueInput = ({
input, meta, vocabulary, propertyKey
}: WrappedFieldProps & PropertyValueFieldProps) =>
+const PropertyValueInput = ({
vocabulary, propertyKey, ...props
}: WrappedFieldProps & PropertyValueFieldProps) =>
<Autocomplete
<Autocomplete
- value={input.value}
- onChange={input.onChange}
label='Value'
label='Value'
- suggestions={getSuggestions(input.value, propertyKey, vocabulary)}
- items={ITEMS_PLACEHOLDER}
- onSelect={input.onChange}
- renderSuggestion={identity}
- error={meta.invalid}
- helperText={meta.error}
+ suggestions={getSuggestions(props.input.value, propertyKey, vocabulary)}
+ {...buildProps(props)}
/>;
const getValidation = (props: PropertyValueFieldProps) =>
isStrictTag(props.propertyKey, props.vocabulary)
/>;
const getValidation = (props: 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) =>
const matchTagValues = ({ vocabulary, propertyKey }: PropertyValueFieldProps) =>
(value: string) =>
@@
-75,7
+58,5
@@
const isStrictTag = (tagName: string, vocabulary: Vocabulary) => {
const getTagValues = (tagName: string, vocabulary: Vocabulary) => {
const tag = vocabulary.tags[tagName];
const getTagValues = (tagName: string, vocabulary: Vocabulary) => {
const tag = vocabulary.tags[tagName];
- return tag ? tag.values : [];
+ return tag
&& tag.values
? tag.values : [];
};
};
-
-const ITEMS_PLACEHOLDER: string[] = [];