Load previous keyword from file properly

metadata_form/src/js/TreeKeywordSelector.js

@@ -43,7 +43,7 @@ class TreeKeywordSelector extends React.Component {
       // Filter out empty objects (when no keyword has been selected yet for example)
       newVal = this.props.formData.filter(x => !this.isEmpty(x)).map((keyObj) => {
         // Convert schema structure to expected structure for TreeSelect
-        if (Object.keys(keyObj).includes('valueURI')) {
+        if (Object.keys(keyObj).includes('valueUri')) {
           return { label: keyObj.subject, value: [keyObj.subject, keyObj.valueUri].join(':') }
         } else {
           return { label: keyObj.subject, value: keyObj.subject + ':' }
@@ -183,10 +183,12 @@ class TreeKeywordSelector extends React.Component {
     const title = this.props.schema.title || this.props.uiSchema['ui:title']
     const required = this.props.required
     const fullLine = title + (required ? '*' : '')
-    const labelClasses = "w-100" + (required ? ' select-required' : '')
-      + (this.fieldNeedsAttention() ? ' text-danger' : '')
-      + ((!('minItems' in this.props.schema) && required) || 
-        (required && 'minItems' in this.props.schema && this.state.value.length >= this.props.schema.minItems) ? ' select-filled' : '')
+    const labelClasses = 'w-100' + (required ? ' select-required' : '') +
+      (this.fieldNeedsAttention() ? ' text-danger' : '') +
+      ((!('minItems' in this.props.schema) && required) ||
+        (required && 'minItems' in this.props.schema && this.state.value.length >= this.props.schema.minItems)
+        ? ' select-filled'
+        : '')
     return <label className={labelClasses}>{fullLine}</label>
   }