import { Vocabulary } from '~/models/vocabulary';
import { RootState } from '~/store/store';
import { getVocabulary } from '~/store/vocabulary/vocabulary-selctors';
+import { WrappedFieldMetaProps, WrappedFieldInputProps } from 'redux-form';
export interface VocabularyProp {
vocabulary: Vocabulary;
export const connectVocabulary = connect(mapStateToProps);
export const ITEMS_PLACEHOLDER: string[] = [];
+
+export const hasError = ({ touched, invalid }: WrappedFieldMetaProps) =>
+ touched && invalid;
+
+export const getErrorMsg = (meta: WrappedFieldMetaProps) =>
+ hasError(meta)
+ ? meta.error
+ : '';
+
+export const handleBlur = ({ onBlur, value }: WrappedFieldInputProps) =>
+ () =>
+ onBlur(value);
import { Autocomplete } from '~/components/autocomplete/autocomplete';
import { Vocabulary } from '~/models/vocabulary';
import { require } from '~/validators/require';
-import { ITEMS_PLACEHOLDER, connectVocabulary, VocabularyProp } from '~/views-components/resource-properties-form/property-field-common';
+import { ITEMS_PLACEHOLDER, connectVocabulary, VocabularyProp, hasError, getErrorMsg, handleBlur } from '~/views-components/resource-properties-form/property-field-common';
export const PROPERTY_KEY_FIELD_NAME = 'key';
<Autocomplete
value={input.value}
onChange={input.onChange}
+ onBlur={handleBlur(input)}
label='Key'
suggestions={getSuggestions(input.value, vocabulary)}
items={ITEMS_PLACEHOLDER}
onSelect={input.onChange}
renderSuggestion={identity}
- error={meta.invalid}
- helperText={meta.error}
+ error={hasError(meta)}
+ helperText={getErrorMsg(meta)}
/>;
const getValidation = memoize(
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 } from '~/views-components/resource-properties-form/property-field-common';
+import { ITEMS_PLACEHOLDER, VocabularyProp, connectVocabulary, hasError, getErrorMsg, handleBlur } from '~/views-components/resource-properties-form/property-field-common';
interface PropertyKeyProp {
propertyKey: string;
<Autocomplete
value={input.value}
onChange={input.onChange}
+ onBlur={handleBlur(input)}
label='Value'
suggestions={getSuggestions(input.value, propertyKey, vocabulary)}
items={ITEMS_PLACEHOLDER}
onSelect={input.onChange}
renderSuggestion={identity}
- error={meta.invalid}
- helperText={meta.error}
+ error={hasError(meta)}
+ helperText={getErrorMsg(meta)}
/>;
const getValidation = (props: PropertyValueFieldProps) =>