Move info in schemas

Talend · May 11, 2017 · 7e39984 · 7e39984
1 parent dd4b1ba
commit 7e39984
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 48 deletions.
diff --git a/packages/forms/stories/json/core-simple.json b/packages/forms/stories/json/core-simple.json
@@ -4,38 +4,27 @@
     "title": "Comment",
     "properties": {
       "name": {
-        "title": "Name",
         "type": "string"
       },
       "lastname": {
-        "title": "Last Name (with description)",
-        "type": "string",
-        "description": "Hint: this is the last name"
-      },
-      "firstname": {
-        "title": "First Name (with placeholder)",
         "type": "string"
       },
-      "nochange": {
-        "title": "Field (read only mode)",
+      "firstname": {
         "type": "string"
       },
       "age": {
-        "title": "Age",
         "type": "number"
       },
+      "nochange": {
+        "type": "string"
+      },
       "email": {
-        "title": "Email (with pattern validation and custom validation message)",
         "type": "string",
-        "pattern": "^\\S+@\\S+$",
-        "description": "Email will be used for evil.",
-        "validationMessage": "Please enter a valid email address, e.g. [email protected]"
+        "pattern": "^\\S+@\\S+$"
       },
       "comment": {
-        "title": "Comment",
         "type": "string",
-        "maxLength": 20,
-        "validationMessage": "Don't be greedy!"
+        "maxLength": 20
       }
     },
     "required": [
@@ -46,24 +35,41 @@
     ]
   },
   "uiSchema": [
-    "name",
-    "lastname",
+    {
+      "key": "name",
+      "title": "Name"
+    },
+    {
+      "key": "lastname",
+      "title": "Last Name (with description)",
+      "description": "Hint: this is the last name"
+    },
     {
       "key": "firstname",
-      "type": "text",
+      "title": "First Name (with placeholder)",
       "placeholder": "Enter your firstname here"
     },
-    "age",
-    "email",
+    {
+      "key": "age",
+      "title": "Age"
+    },
+    {
+      "key": "email",
+      "title": "Email (with pattern validation and custom validation message)",
+      "description": "Email will be used for evil.",
+      "validationMessage": "Please enter a valid email address, e.g. [email protected]"
+    },
     {
       "key": "nochange",
-      "type": "text",
+      "title": "Field (read only mode)",
       "readOnly": true
     },
     {
       "key": "comment",
       "type": "textarea",
-      "placeholder": "Make a comment"
+      "title": "Comment",
+      "placeholder": "Make a comment",
+      "validationMessage": "Don't be greedy!"
     }
   ],
   "properties": {

diff --git a/packages/forms/stories/json/core-structured-model.json b/packages/forms/stories/json/core-structured-model.json
@@ -7,68 +7,76 @@
         "type": "object",
         "properties": {
           "name": {
-            "title": "Name",
             "type": "string"
           },
           "lastname": {
-            "title": "Last Name (with description)",
-            "type": "string",
-            "description": "Hint: this is the last name"
+            "type": "string"
           },
           "firstname": {
-            "title": "First Name (with placeholder)",
             "type": "string"
           },
           "age": {
-            "title": "Age",
             "type": "number"
           }
-        }
+        },
+        "required": [
+          "name",
+          "firstname"
+        ]
       },
       "nochange": {
-        "title": "Field (read only mode)",
         "type": "string"
       },
       "email": {
-        "title": "Email (with pattern validation and custom validation message)",
         "type": "string",
-        "pattern": "^\\S+@\\S+$",
-        "description": "Email will be used for evil.",
-        "validationMessage": "Please enter a valid email address, e.g. [email protected]"
+        "pattern": "^\\S+@\\S+$"
       },
       "comment": {
-        "title": "Comment",
         "type": "string",
-        "maxLength": 20,
-        "validationMessage": "Don't be greedy!"
+        "maxLength": 20
       }
     },
     "required": [
-      "name",
-      "firstname",
       "email",
       "comment"
     ]
   },
   "uiSchema": [
-    "user.name",
-    "user.lastname",
+    {
+      "key": "user.name",
+      "title": "Name"
+    },
+    {
+      "key": "user.lastname",
+      "title": "Last Name (with description)",
+      "description": "Hint: this is the last name"
+    },
     {
       "key": "user.firstname",
-      "type": "text",
+      "title": "First Name (with placeholder)",
       "placeholder": "Enter your firstname here"
     },
-    "user.age",
-    "email",
+    {
+      "key": "user.age",
+      "title": "Age"
+    },
+    {
+      "key": "email",
+      "title": "Email (with pattern validation and custom validation message)",
+      "description": "Email will be used for evil.",
+      "validationMessage": "Please enter a valid email address, e.g. [email protected]"
+    },
     {
       "key": "nochange",
-      "type": "text",
+      "title": "Field (read only mode)",
       "readOnly": true
     },
     {
       "key": "comment",
       "type": "textarea",
-      "placeholder": "Make a comment"
+      "title": "Comment",
+      "placeholder": "Make a comment",
+      "validationMessage": "Don't be greedy!"
     }
   ],
   "properties": {