feature:add i18n label to dynamic values

component-form/component-form-core/src/main/java/org/talend/component/form/api/UiSpecService.java

@@ -32,7 +32,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.TreeMap;
 import java.util.stream.Stream;
 
@@ -212,20 +211,22 @@ private UiSpecPayload.UiSchema primitiveToUiSchema(final Collection<SimpleProper
                 final Map<String, Object> values = client.action(detail.getId().getFamily(), "dynamic_values",
                         prop.getMetadata().get("action::dynamic_values"), emptyMap());
 
-                final List<String> items = ofNullable(values).map(v -> v.get("items")).filter(Collection.class::isInstance)
+                final List<UiSpecPayload.NameValue> namedValues = ofNullable(values).map(v -> v.get("items")).filter(Collection.class::isInstance)
                         .map(c -> {
                             final Collection<?> dynamicValues = Collection.class.cast(c);
-                            return dynamicValues.stream().filter(Map.class::isInstance).map(m -> Map.class.cast(m).get("value"))
-                                    .filter(Objects::nonNull).filter(String.class::isInstance).map(String.class::cast).sorted()
+                            return dynamicValues.stream().filter(Map.class::isInstance)//.map(m -> Map.class.cast(m).get("id"))
+                                    .filter(m -> Map.class.cast(m).get("id") != null && Map.class.cast(m).get("id") instanceof String)
+                                    .map(Map.class::cast)
+                                    .map(entry -> {
+                                        UiSpecPayload.NameValue val = new UiSpecPayload.NameValue();
+                                        val.setName((String)entry.get("id"));
+                                        val.setValue(entry.get("label") == null ? (String)entry.get("id") : (String)entry.get("label"));
+                                        return val;
+                                    })
                                     .collect(toList());
                         }).orElse(emptyList());
-                schema.setTitleMap(items.stream().map(v -> {
-                    final UiSpecPayload.NameValue nameValue = new UiSpecPayload.NameValue();
-                    nameValue.setValue(v);
-                    nameValue.setName(v);
-                    return nameValue;
-                }).collect(toList()));
-                jsonSchema.setEnumValues(items);
+                schema.setTitleMap(namedValues);
+                jsonSchema.setEnumValues(namedValues.stream().map(c -> c.getName()).sorted().collect(toList()));
             } else {
                 schema.setTitleMap(emptyList());
                 jsonSchema.setEnumValues(emptyList());

component-form/component-form-core/src/test/java/org/talend/component/form/api/UiSpecServiceTest.java

@@ -26,13 +26,7 @@
 import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
@@ -55,7 +49,10 @@ public class UiSpecServiceTest {
         public Map<String, Object> action(final String family, final String type, final String action,
                 final Map<String, Object> params) {
             if ("jdbc".equals(family) && "dynamic_values".equals(type) && "driver".equals(action)) {
-                return singletonMap("items", singleton(singletonMap("value", "some.driver.Jdbc")));
+                Map<String, String> item = new HashMap<>();
+                item.put("id", "some.driver.Jdbc");
+                item.put("label", "Jdbc driver");
+                return singletonMap("items", singleton(item));
             }
             return params;
         }
@@ -190,7 +187,7 @@ public void uiSchema() throws Exception {
                     assertEquals(1, titleMap.size());
                     final UiSpecPayload.NameValue firstTitleMap = titleMap.iterator().next();
                     assertEquals("some.driver.Jdbc", firstTitleMap.getName());
-                    assertEquals("some.driver.Jdbc", firstTitleMap.getValue());
+                    assertEquals("Jdbc driver", firstTitleMap.getValue());
 
                     final UiSpecPayload.Trigger trigger = driver.getTriggers().iterator().next();
                     assertEquals("driver", trigger.getAction());

documentation/src/main/java/org/talend/runtime/documentation/Generator.java

@@ -133,7 +133,8 @@ private static String sample(final Class<?> returnedType) {
             list.setItems(new ArrayList<>());
 
             final Values.Item item = new Values.Item();
-            item.setValue("a value");
+            item.setId("value");
+            item.setLabel("label");
             list.getItems().add(item);
 
             return new MapperBuilder().setPretty(false).build().writeObjectAsString(list);

sample/src/main/java/org/talend/component/sample/other/ComplexComponent.java

@@ -77,8 +77,8 @@ public static class PathService {
 
         @DynamicValues(family = "complex", value = "path")
         public Values find(@Option("value") final String value) {
-            return new Values(IntStream.range(1, 11).mapToObj(i -> "/opt/sample/file_" + i + ".txt")
-                                       .map(Values.Item::new).collect(toList()));
+            return new Values(IntStream.range(1, 11).mapToObj(i -> new Values.Item("file_" + i, "/opt/sample/file_" + i + ".txt"))
+                    .collect(toList()));
         }
     }
 }