--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { connect } from 'react-redux';
+import { Vocabulary } from '~/models/vocabulary';
+import { RootState } from '~/store/store';
+import { getVocabulary } from '~/store/vocabulary/vocabulary-selctors';
+
+export interface VocabularyProp {
+ vocabulary: Vocabulary;
+}
+
+export const mapStateToProps = (state: RootState): VocabularyProp => ({
+ vocabulary: getVocabulary(state.properties),
+});
+
+export const connectVocabulary = connect(mapStateToProps);
+
+export const ITEMS_PLACEHOLDER: string[] = [];
import * as React from 'react';
import { WrappedFieldProps, Field } from 'redux-form';
-import { connect } from 'react-redux';
import { identity, memoize } from 'lodash';
-import { RootState } from '~/store/store';
-import { getVocabulary } from '~/store/vocabulary/vocabulary-selctors';
import { Autocomplete } from '~/components/autocomplete/autocomplete';
import { Vocabulary } from '~/models/vocabulary';
import { require } from '~/validators/require';
-
-interface VocabularyProp {
- vocabulary: Vocabulary;
-}
-
-const mapStateToProps = (state: RootState): VocabularyProp => ({
- vocabulary: getVocabulary(state.properties),
-});
+import { ITEMS_PLACEHOLDER, connectVocabulary, VocabularyProp } from '~/views-components/resource-properties-form/property-field-common';
export const PROPERTY_KEY_FIELD_NAME = 'key';
-export const PropertyKeyField = connect(mapStateToProps)(
+export const PropertyKeyField = connectVocabulary(
({ vocabulary }: VocabularyProp) =>
<Field
name={PROPERTY_KEY_FIELD_NAME}
const getTagsList = ({ tags }: Vocabulary) =>
Object.keys(tags);
-
-const ITEMS_PLACEHOLDER: string[] = [];
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 { RootState } from '~/store/store';
-import { getVocabulary } from '~/store/vocabulary/vocabulary-selctors';
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';
-
-interface VocabularyProp {
- vocabulary: Vocabulary;
-}
+import { ITEMS_PLACEHOLDER, VocabularyProp, connectVocabulary } from '~/views-components/resource-properties-form/property-field-common';
interface PropertyKeyProp {
propertyKey: string;
type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp;
-const mapStateToProps = (state: RootState): VocabularyProp => ({
- vocabulary: getVocabulary(state.properties),
-});
-
export const PROPERTY_VALUE_FIELD_NAME = 'value';
export const PropertyValueField = compose(
- connect(mapStateToProps),
+ connectVocabulary,
formValues({ propertyKey: PROPERTY_KEY_FIELD_NAME })
)(
(props: PropertyValueFieldProps) =>
const tag = vocabulary.tags[tagName];
return tag && tag.values ? tag.values : [];
};
-
-const ITEMS_PLACEHOLDER: string[] = [];