[ARVADOS-WORKBENCH2] updated: 1.2.0-1028-gf0aac0b

[Git user]

Summary of changes:
 .../resource-properties-form/property-key-field.tsx                 | 6 +++---
 .../resource-properties-form/property-value-field.tsx               | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

       via  f0aac0b9747eac597ed42e5169be73cf6fbad410 (commit)
       via  ca4613365dcc5e9e88d6c9ea4f05ffbed4b37daa (commit)
      from  6a9232429f4bb61e2be686dc6b164e40e9952f7d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f0aac0b9747eac597ed42e5169be73cf6fbad410
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Wed Nov 28 13:07:24 2018 +0100

    Restore TAG_VALUE_VALIDATION
    
    Feature #14393
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

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 56eaf6d..db2db3f 100644
--- a/src/views-components/resource-properties-form/property-value-field.tsx
+++ b/src/views-components/resource-properties-form/property-value-field.tsx
@@ -7,9 +7,9 @@ import { WrappedFieldProps, Field, formValues } from 'redux-form';
 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 { VocabularyProp, connectVocabulary, buildProps } from '~/views-components/resource-properties-form/property-field-common';
+import { TAG_VALUE_VALIDATION } from '~/validators/validators';
 
 interface PropertyKeyProp {
     propertyKey: string;
@@ -39,8 +39,8 @@ const PropertyValueInput = ({ vocabulary, propertyKey, ...props }: WrappedFieldP
 
 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) =>

commit ca4613365dcc5e9e88d6c9ea4f05ffbed4b37daa
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Wed Nov 28 13:07:12 2018 +0100

    Restore TAG_KEY_VALIDATION
    
    Feature #14393
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views-components/resource-properties-form/property-key-field.tsx b/src/views-components/resource-properties-form/property-key-field.tsx
index a8584c1..e6708a3 100644
--- a/src/views-components/resource-properties-form/property-key-field.tsx
+++ b/src/views-components/resource-properties-form/property-key-field.tsx
@@ -7,8 +7,8 @@ import { WrappedFieldProps, Field } from 'redux-form';
 import { memoize } from 'lodash';
 import { Autocomplete } from '~/components/autocomplete/autocomplete';
 import { Vocabulary } from '~/models/vocabulary';
-import { require } from '~/validators/require';
 import { connectVocabulary, VocabularyProp, buildProps } from '~/views-components/resource-properties-form/property-field-common';
+import { TAG_KEY_VALIDATION } from '~/validators/validators';
 
 export const PROPERTY_KEY_FIELD_NAME = 'key';
 
@@ -30,8 +30,8 @@ const PropertyKeyInput = ({ vocabulary, ...props }: WrappedFieldProps & Vocabula
 const getValidation = memoize(
     (vocabulary: Vocabulary) =>
         vocabulary.strict
-            ? [require, matchTags(vocabulary)]
-            : [require]);
+            ? [...TAG_KEY_VALIDATION, matchTags(vocabulary)]
+            : TAG_KEY_VALIDATION);
 
 const matchTags = (vocabulary: Vocabulary) =>
     (value: string) =>

-----------------------------------------------------------------------


hooks/post-receive
--