Merge branch 'main' into ue-telephone

Talmiz Ahmed · Talmiz Ahmed · commit 1d6ed637c0f2 · 2025-04-04T10:12:52.000+05:30
diff --git a/blocks/form/components/accordion/_accordion.json b/blocks/form/components/accordion/_accordion.json
@@ -9,7 +9,6 @@
                         "resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer",
                         "template": {
                             "jcr:title": "Accordion",
-                            "fieldType": "panel",
                             "fd:viewType": "accordion",
                             "minOccur": 1,
                             "panel1": {
diff --git a/blocks/form/components/modal/_modal.json b/blocks/form/components/modal/_modal.json
@@ -9,7 +9,6 @@
                   "resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer",
                   "template": {
                     "jcr:title": "Modal",
-                    "fieldType": "panel",
                     "fd:viewType": "modal"
                   }
                 }
diff --git a/blocks/form/components/password/_password.json b/blocks/form/components/password/_password.json
@@ -9,7 +9,6 @@
             "resourceType": "core/fd/components/form/textinput/v1/textinput",
             "template": {
               "jcr:title": "Password",
-              "fieldType": "text-input",
               "fd:viewType": "password"
             }
           }
diff --git a/blocks/form/components/rating/_rating.json b/blocks/form/components/rating/_rating.json
@@ -9,7 +9,6 @@
             "resourceType": "core/fd/components/form/numberinput/v1/numberinput",
             "template": {
               "jcr:title": "Rating",
-              "fieldType": "number-input",
               "fd:viewType": "rating"
             }
           }
diff --git a/blocks/form/components/tnc/_tnc.json b/blocks/form/components/tnc/_tnc.json
@@ -9,12 +9,10 @@
             "resourceType": "core/fd/components/form/termsandconditions/v1/termsandconditions",
             "template": {
               "jcr:title": "Terms and conditions",
-              "fieldType": "panel",
               "fd:viewType": "tnc",
               "text": {
                 "value": "Text related to the terms and conditions come here.",
                 "sling:resourceType": "core/fd/components/form/text/v1/text",
-                "fieldType": "plain-text",
                 "textIsRich": true
               },
               "link": {
@@ -26,7 +24,6 @@
                   "Privacy policy."
                 ],
                 "sling:resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
-                "fieldType": "checkbox-group",
                 "fd:rules": {
                   "jcr:primaryType": "nt:unstructured",
                   "validationStatus": "valid"
@@ -42,7 +39,6 @@
                 "name": "approvalcheckbox",
                 "jcr:title": "I agree to the terms & conditions.",
                 "sling:resourceType": "core/fd/components/form/checkbox/v1/checkbox",
-                "fieldType": "checkbox",
                 "required": true,
                 "type": "string",
                 "enum": [
diff --git a/blocks/form/components/wizard/_wizard.json b/blocks/form/components/wizard/_wizard.json
@@ -9,17 +9,14 @@
             "resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer",
             "template": {
               "jcr:title": "Wizard",
-              "fieldType": "panel",
               "fd:viewType": "wizard",
               "minOccur": 1,
               "panel1": {
                 "jcr:title": "Item 1",
-                "fieldType": "panel",
                 "sling:resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer"
               },
               "panel2": {
                 "jcr:title": "Item 2",
-                "fieldType": "panel",
                 "sling:resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer"
               }
             }
diff --git a/blocks/form/models/form-components/_button.json b/blocks/form/models/form-components/_button.json
@@ -8,8 +8,7 @@
           "page": {
             "resourceType": "core/fd/components/form/button/v1/button",
             "template": {
-              "jcr:title": "Button",
-              "fieldType": "button"
+              "jcr:title": "Button"
             }
           }
         }
diff --git a/blocks/form/models/form-components/_checkbox-group.json b/blocks/form/models/form-components/_checkbox-group.json
@@ -9,7 +9,6 @@
                         "resourceType": "core/fd/components/form/checkboxgroup/v1/checkboxgroup",
                         "template": {
                             "jcr:title": "Checkbox Group",
-                            "fieldType": "checkbox-group",
                             "enum": [
                                 "0",
                                 "1"
@@ -109,3 +108,4 @@
         }
     ]
 }
+
diff --git a/blocks/form/models/form-components/_checkbox.json b/blocks/form/models/form-components/_checkbox.json
@@ -9,7 +9,6 @@
                         "resourceType": "core/fd/components/form/checkbox/v1/checkbox",
                         "template": {
                             "jcr:title": "Checkbox",
-                            "fieldType": "checkbox",
                             "checkedValue": "on"
                         }
                     }
diff --git a/blocks/form/models/form-components/_date-input.json b/blocks/form/models/form-components/_date-input.json
@@ -8,8 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/datepicker/v1/datepicker",
                         "template": {
-                            "jcr:title": "Date Input",
-                            "fieldType": "date-input"
+                            "jcr:title": "Date Input"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_drop-down.json b/blocks/form/models/form-components/_drop-down.json
@@ -9,7 +9,6 @@
             "resourceType": "core/fd/components/form/dropdown/v1/dropdown",
             "template": {
               "jcr:title": "Drop Down List",
-              "fieldType": "drop-down",
               "enum": [
                 "0",
                 "1"
diff --git a/blocks/form/models/form-components/_email.json b/blocks/form/models/form-components/_email.json
@@ -8,8 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/emailinput/v1/emailinput",
                         "template": {
-                            "jcr:title": "Email Input",
-                            "fieldType": "email"
+                            "jcr:title": "Email Input"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_file-input.json b/blocks/form/models/form-components/_file-input.json
@@ -9,7 +9,6 @@
                         "resourceType": "core/fd/components/form/fileinput/v2/fileinput",
                         "template": {
                             "jcr:title": "File Attachment",
-                            "fieldType": "file-input",
                             "accept": [
                                 "audio/*",
                                 "video/*",
diff --git a/blocks/form/models/form-components/_fragment.json b/blocks/form/models/form-components/_fragment.json
@@ -4,15 +4,14 @@
             "title": "Form Fragment",
             "id": "form-fragment",
             "plugins": {
-                "xwalk": {
-                    "page": {
-                        "resourceType": "core/fd/components/form/fragment/v1/fragment",
-                        "template": {
-                            "jcr:title": "Fragment",
-                            "fieldType": "panel"
-                        }
-                    }
+              "xwalk": {
+                "page": {
+                  "resourceType": "core/fd/components/form/fragment/v1/fragment",
+                  "template": {
+                    "jcr:title": "Fragment"
+                  }
                 }
+              }
             }
         }
     ],
diff --git a/blocks/form/models/form-components/_image.json b/blocks/form/models/form-components/_image.json
@@ -8,8 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/image/v1/image",
                         "template": {
-                            "jcr:title": "Image",
-                            "fieldType": "image"
+                            "jcr:title": "Image"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_number-input.json b/blocks/form/models/form-components/_number-input.json
@@ -8,8 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/numberinput/v1/numberinput",
                         "template": {
-                            "jcr:title": "Number Input",
-                            "fieldType": "number-input"
+                            "jcr:title": "Number Input"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_panel.json b/blocks/form/models/form-components/_panel.json
@@ -9,7 +9,6 @@
                         "resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer",
                         "template": {
                             "jcr:title": "Panel",
-                            "fieldType": "panel",
                             "minOccur": 1
                         }
                     }
diff --git a/blocks/form/models/form-components/_radio-group.json b/blocks/form/models/form-components/_radio-group.json
@@ -9,7 +9,6 @@
                         "resourceType": "core/fd/components/form/radiobutton/v1/radiobutton",
                         "template": {
                             "jcr:title": "Radio Group",
-                            "fieldType": "radio-group",
                             "enum": [
                                 "0",
                                 "1"
diff --git a/blocks/form/models/form-components/_recaptcha.json b/blocks/form/models/form-components/_recaptcha.json
@@ -8,8 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/recaptcha/v1/recaptcha",
                         "template": {
-                            "jcr:title": "Captcha (Invisible)",
-                            "fieldType": "captcha"
+                            "jcr:title": "Captcha (Invisible)"
                         }
                     }
                 }
@@ -30,4 +29,4 @@
             ]
         }
     ]
-}
+}
diff --git a/blocks/form/models/form-components/_reset-button.json b/blocks/form/models/form-components/_reset-button.json
@@ -9,8 +9,7 @@
             "resourceType": "core/fd/components/form/actions/reset/v1/reset",
             "template": {
               "jcr:title": "Reset",
-              "buttonType": "reset",
-              "fieldType": "button"
+              "buttonType": "reset"
             }
           }
         }
diff --git a/blocks/form/models/form-components/_submit-button.json b/blocks/form/models/form-components/_submit-button.json
@@ -9,8 +9,7 @@
             "resourceType": "core/fd/components/form/actions/submit/v1/submit",
             "template": {
               "jcr:title": "Submit",
-              "buttonType": "submit",
-              "fieldType": "button"
+              "buttonType": "submit"
             }
           }
         }
@@ -35,3 +34,4 @@
     }
   ]
 }
+
diff --git a/blocks/form/models/form-components/_text-input.json b/blocks/form/models/form-components/_text-input.json
@@ -8,8 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/textinput/v1/textinput",
                         "template": {
-                            "jcr:title": "Text Input",
-                            "fieldType": "text-input"
+                            "jcr:title": "Text Input"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_text.json b/blocks/form/models/form-components/_text.json
@@ -9,7 +9,6 @@
             "resourceType": "core/fd/components/form/text/v1/text",
             "template": {
               "jcr:title": "Text",
-              "fieldType": "plain-text",
               "textIsRich": true,
               "value": "Adaptive Form Text Component"
             }
diff --git a/component-definition.json b/component-definition.json
diff --git a/test/unit/form.authoring.test.js b/test/unit/form.authoring.test.js

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`"resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer",`
`10`	`10`	`"template": {`
`11`	`11`	`"jcr:title": "Modal",`
`12`		`- "fieldType": "panel",`
`13`	`12`	`"fd:viewType": "modal"`
`14`	`13`	`}`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`	`"page": {`
`9`	`9`	`"resourceType": "core/fd/components/form/button/v1/button",`
`10`	`10`	`"template": {`
`11`		`- "jcr:title": "Button",`
`12`		`- "fieldType": "button"`
	`11`	`+ "jcr:title": "Button"`
`13`	`12`	`}`
`14`	`13`	`}`
`15`	`14`	`}`