Fixing validation for the InputFormWithLabels sample

samples/Templates/Scenarios/InputFormWithLabels.data.json

@@ -1,23 +1,26 @@
 {
-        "title": "Tell us about yourself",
-        "body": "We just need a few more details to get you booked for the trip of a lifetime!",
-        "disclaimer": "Don't worry, we'll never share or sell your information.",
-        "properties": [
-            {
-                "label": "Your name (Last, First)",
-                "validation": "^[A-Z](a-z)+ [A-Z](a-z)+( ([A-Z][a-z]+))*$",
-                "error": "Please enter your name in the specified format"
-            },
-            {
-                "label": "Your email",
-                "validation": "^[A-Z0-9._%+-]+@[A-Z0-9.-]+.[A-Z]{2,4}$",
-                "error": "Please enter a valid email address"
-            },
-            {
-                "label": "Phone Number (xxx-xxx-xxxx)",
-                "validation": "^[0-9]{3}-[0-9]{3}-[0-9]{4}$",
-			    "error": "Invalid phone number. Use the specified format: 3 numbers, hyphen, 3 numbers, hyphen and 4 numbers"
-            }
-        ],
-        "thumbnailUrl": "https://upload.wikimedia.org/wikipedia/commons/b/b2/Diver_Silhouette%2C_Great_Barrier_Reef.jpg"
+	"title": "Tell us about yourself",
+	"body": "We just need a few more details to get you booked for the trip of a lifetime!",
+	"disclaimer": "Don't worry, we'll never share or sell your information.",
+	"properties": [
+		{
+			"id": "myName",
+			"label": "Your name (Last, First)",
+			"validation": "^[A-Z][a-z]+, [A-Z][a-z]+$",
+			"error": "Please enter your name in the specified format"
+		},
+		{
+			"id": "myEmail",
+			"label": "Your email",
+			"validation": "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+[.][A-Za-z0-9-]{2,4}$",
+			"error": "Please enter a valid email address"
+		},
+		{
+			"id": "myTel",
+			"label": "Phone Number (xxx-xxx-xxxx)",
+			"validation": "^[0-9]{3}-[0-9]{3}-[0-9]{4}$",
+			"error": "Invalid phone number. Use the specified format: 3 numbers, hyphen, 3 numbers, hyphen and 4 numbers"
+		}
+	],
+	"thumbnailUrl": "https://upload.wikimedia.org/wikipedia/commons/b/b2/Diver_Silhouette%2C_Great_Barrier_Reef.jpg"
 }

samples/Templates/Scenarios/InputFormWithLabels.template.json

@@ -1,68 +1,68 @@
 {
-    "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-    "type": "AdaptiveCard",
-    "version": "1.0",
-    "body": [
-        {
-            "type": "ColumnSet",
-            "columns": [
-                {
-                    "type": "Column",
-                    "width": 2,
-                    "items": [
-                        {
-                            "type": "TextBlock",
-                            "text": "${title}",
-                            "weight": "bolder",
-                            "size": "medium"
-                        },
-                        {
-                            "type": "TextBlock",
-                            "text": "${body}",
-                            "isSubtle": true,
-                            "wrap": true
-                        },
-                        {
-                            "type": "TextBlock",
-                            "text": "${disclaimer}",
-                            "isSubtle": true,
-                            "wrap": true,
-                            "size": "small"
-                        },
-                        {
-                            "type": "Container",
-                            "$data": "${properties}",
-                            "items": [
-                                {
-                                    "type": "Input.Text",
-                                    "label": "${label}",
-                                    "id": "${if(title == 'Your Name', 'myName', if(title == 'Your email', 'myEmail', 'myTel'))}",
-                                    "regex": "${validation}",
-                                    "errorMessage": "${error}",
-                                    "isRequired": true
-                                }
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "type": "Column",
-                    "width": 1,
-                    "items": [
-                        {
-                            "type": "Image",
-                            "url": "${thumbnailUrl}",
-                            "size": "auto"
-                        }
-                    ]
-                }
-            ]
-        }
-    ],
-    "actions": [
-        {
-            "type": "Action.Submit",
-            "title": "Submit"
-        }
-    ]
+	"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+	"type": "AdaptiveCard",
+	"version": "1.0",
+	"body": [
+		{
+			"type": "ColumnSet",
+			"columns": [
+				{
+					"type": "Column",
+					"width": 2,
+					"items": [
+						{
+							"type": "TextBlock",
+							"text": "${title}",
+							"weight": "bolder",
+							"size": "medium"
+						},
+						{
+							"type": "TextBlock",
+							"text": "${body}",
+							"isSubtle": true,
+							"wrap": true
+						},
+						{
+							"type": "TextBlock",
+							"text": "${disclaimer}",
+							"isSubtle": true,
+							"wrap": true,
+							"size": "small"
+						},
+						{
+							"type": "Container",
+							"$data": "${properties}",
+							"items": [
+								{
+									"type": "Input.Text",
+									"label": "${label}",
+									"id": "${id}",
+									"regex": "${validation}",
+									"errorMessage": "${error}",
+									"isRequired": true
+								}
+							]
+						}
+					]
+				},
+				{
+					"type": "Column",
+					"width": 1,
+					"items": [
+						{
+							"type": "Image",
+							"url": "${thumbnailUrl}",
+							"size": "auto"
+						}
+					]
+				}
+			]
+		}
+	],
+	"actions": [
+		{
+			"type": "Action.Submit",
+			"title": "Submit"
+		}
+	]
 }