Merge branch 'main' into ue-fieldtype

Talmiz Ahmed · Talmiz Ahmed · commit 3fa85d812723 · 2025-03-26T15:55:30.000+05:30
diff --git a/blocks/form/components/accordion/_accordion.json b/blocks/form/components/accordion/_accordion.json
@@ -10,20 +10,14 @@
                         "template": {
                             "jcr:title": "Accordion",
                             "fd:viewType": "accordion",
-                            "enabled": true,
-                            "visible": true,
                             "panel1": {
                                 "jcr:title": "Item 1",
                                 "fieldType": "panel",
-                                "visible": true,
-                                "enabled": true,
                                 "sling:resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer"
                             },
                             "panel2": {
                                 "jcr:title": "Item 2",
                                 "fieldType": "panel",
-                                "visible": true,
-                                "enabled": true,
                                 "sling:resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer"
                             }
                         }
diff --git a/blocks/form/components/modal/_modal.json b/blocks/form/components/modal/_modal.json
@@ -9,9 +9,7 @@
                   "resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer",
                   "template": {
                     "jcr:title": "Modal",
-                    "fd:viewType": "modal",
-                    "enabled": true,
-                    "visible": false
+                    "fd:viewType": "modal"
                   }
                 }
               }
diff --git a/blocks/form/components/rating/_rating.json b/blocks/form/components/rating/_rating.json
@@ -9,9 +9,7 @@
             "resourceType": "core/fd/components/form/numberinput/v1/numberinput",
             "template": {
               "jcr:title": "Rating",
-              "fd:viewType": "rating",
-              "enabled": true,
-              "visible": true
+              "fd:viewType": "rating"
             }
           }
         }
diff --git a/blocks/form/components/tnc/_tnc.json b/blocks/form/components/tnc/_tnc.json
@@ -10,8 +10,6 @@
             "template": {
               "jcr:title": "Terms and conditions",
               "fd:viewType": "tnc",
-              "enabled": true,
-              "visible": true,
               "text": {
                 "value": "Text related to the terms and conditions come here.",
                 "sling:resourceType": "core/fd/components/form/text/v1/text",
@@ -21,8 +19,6 @@
                 "enum": ["dummy-link-1"],
                 "type": "string[]",
                 "fd:viewType": "toggleable-link",
-                "enabled": true,
-                "visible": true,
                 "title": "I agree to the terms & conditions",
                 "enumNames": [
                   "Privacy policy."
@@ -44,8 +40,6 @@
                 "jcr:title": "I agree to the terms & conditions.",
                 "sling:resourceType": "core/fd/components/form/checkbox/v1/checkbox",
                 "required": true,
-                "enabled": true,
-                "visible": true,
                 "type": "string",
                 "enum": [
                   "true"
diff --git a/blocks/form/components/wizard/_wizard.json b/blocks/form/components/wizard/_wizard.json
@@ -10,18 +10,12 @@
             "template": {
               "jcr:title": "Wizard",
               "fd:viewType": "wizard",
-              "enabled": true,
-              "visible": true,
               "panel1": {
                 "jcr:title": "Item 1",
-                "visible": true,
-                "enabled": true,
                 "sling:resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer"
               },
               "panel2": {
                 "jcr:title": "Item 2",
-                "visible": true,
-                "enabled": true,
                 "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,9 +8,7 @@
           "page": {
             "resourceType": "core/fd/components/form/button/v1/button",
             "template": {
-              "jcr:title": "Button",
-              "enabled": true,
-              "visible": true
+              "jcr:title": "Button"
             }
           }
         }
diff --git a/blocks/form/models/form-components/_checkbox-group.json b/blocks/form/models/form-components/_checkbox-group.json
@@ -17,8 +17,6 @@
                                 "Item 1",
                                 "Item 2"
                             ],
-                            "visible": true,
-                            "enabled": true,
                             "orientation": "horizontal",
                             "type": "string[]"
                         }
diff --git a/blocks/form/models/form-components/_checkbox.json b/blocks/form/models/form-components/_checkbox.json
@@ -4,17 +4,15 @@
             "title": "Checkbox",
             "id": "checkbox",
             "plugins": {
-              "xwalk": {
-                "page": {
-                  "resourceType": "core/fd/components/form/checkbox/v1/checkbox",
-                  "template": {
-                    "jcr:title": "Checkbox",
-                    "enabled": true,
-                    "visible": true,
-                    "checkedValue": "on"
-                  }
+                "xwalk": {
+                    "page": {
+                        "resourceType": "core/fd/components/form/checkbox/v1/checkbox",
+                        "template": {
+                            "jcr:title": "Checkbox",
+                            "checkedValue": "on"
+                        }
+                    }
                 }
-              }
             }
         }
     ],
diff --git a/blocks/form/models/form-components/_date-input.json b/blocks/form/models/form-components/_date-input.json
@@ -8,9 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/datepicker/v1/datepicker",
                         "template": {
-                            "jcr:title": "Date Input",
-                            "enabled": true,
-                            "visible": true
+                            "jcr:title": "Date Input"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_drop-down.json b/blocks/form/models/form-components/_drop-down.json
@@ -17,8 +17,6 @@
                 "Item 1",
                 "Item 2"
               ],
-              "enabled": true,
-              "visible": true,
               "type": "string"
             }
           }
diff --git a/blocks/form/models/form-components/_email.json b/blocks/form/models/form-components/_email.json
@@ -8,9 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/emailinput/v1/emailinput",
                         "template": {
-                            "jcr:title": "Email Input",
-                            "enabled": true,
-                            "visible": true
+                            "jcr:title": "Email Input"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_file-input.json b/blocks/form/models/form-components/_file-input.json
@@ -18,9 +18,7 @@
                             ],
                             "buttonText": "Attach",
                             "dragDropText": "Drag and Drop To Upload",
-                            "type": "file",
-                            "enabled": true,
-                            "visible": true
+                            "type": "file"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_fragment.json b/blocks/form/models/form-components/_fragment.json
@@ -8,9 +8,7 @@
                 "page": {
                   "resourceType": "core/fd/components/form/fragment/v1/fragment",
                   "template": {
-                    "jcr:title": "Fragment",
-                    "enabled": true,
-                    "visible": true
+                    "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",
-                            "visible": true
+                            "jcr:title": "Image"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_number-input.json b/blocks/form/models/form-components/_number-input.json
@@ -8,9 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/numberinput/v1/numberinput",
                         "template": {
-                            "jcr:title": "Number Input",
-                            "enabled": true,
-                            "visible": true
+                            "jcr:title": "Number Input"
                         }
                     }
                 }
diff --git a/blocks/form/models/form-components/_panel.json b/blocks/form/models/form-components/_panel.json
@@ -9,8 +9,6 @@
                         "resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer",
                         "template": {
                             "jcr:title": "Panel",
-                            "enabled": true,
-                            "visible": true,
                             "minOccur": 1
                         }
                     }
diff --git a/blocks/form/models/form-components/_radio-group.json b/blocks/form/models/form-components/_radio-group.json
@@ -17,8 +17,6 @@
                                 "Item 1",
                                 "Item 2"
                             ],
-                            "enabled": true,
-                            "visible": true,
                             "orientation": "horizontal"
                         }
                     }
diff --git a/blocks/form/models/form-components/_reset-button.json b/blocks/form/models/form-components/_reset-button.json
@@ -9,9 +9,7 @@
             "resourceType": "core/fd/components/form/actions/reset/v1/reset",
             "template": {
               "jcr:title": "Reset",
-              "buttonType": "reset",
-              "enabled": true,
-              "visible": true
+              "buttonType": "reset"
             }
           }
         }
@@ -35,4 +33,4 @@
       ]
     }
   ]
-}
+}
diff --git a/blocks/form/models/form-components/_submit-button.json b/blocks/form/models/form-components/_submit-button.json
@@ -9,9 +9,7 @@
             "resourceType": "core/fd/components/form/actions/submit/v1/submit",
             "template": {
               "jcr:title": "Submit",
-              "buttonType": "submit",
-              "enabled": true,
-              "visible": true
+              "buttonType": "submit"
             }
           }
         }
@@ -35,4 +33,5 @@
       ]
     }
   ]
-}
+}
+
diff --git a/blocks/form/models/form-components/_telephone-input.json b/blocks/form/models/form-components/_telephone-input.json
@@ -8,9 +8,7 @@
           "page": {
             "resourceType": "core/fd/components/form/telephoneinput/v1/telephoneinput",
             "template": {
-              "jcr:title": "Telephone Input",
-              "enabled": true,
-              "visible": true
+              "jcr:title": "Telephone Input"
             }
           }
         }
diff --git a/blocks/form/models/form-components/_text-input.json b/blocks/form/models/form-components/_text-input.json
@@ -8,9 +8,7 @@
                     "page": {
                         "resourceType": "core/fd/components/form/textinput/v1/textinput",
                         "template": {
-                            "jcr:title": "Text Input",
-                            "enabled": true,
-                            "visible": true
+                            "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",
-              "visible": true,
               "textIsRich": true,
               "value": "Adaptive Form Text Component"
             }
diff --git a/component-definition.json b/component-definition.json

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,7 @@`
`9`	`9`	`"resourceType": "core/fd/components/form/panelcontainer/v1/panelcontainer",`
`10`	`10`	`"template": {`
`11`	`11`	`"jcr:title": "Modal",`
`12`		`- "fd:viewType": "modal",`
`13`		`- "enabled": true,`
`14`		`- "visible": false`
	`12`	`+ "fd:viewType": "modal"`
`15`	`13`	`}`
`16`	`14`	`}`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,7 @@`
`8`	`8`	`"page": {`
`9`	`9`	`"resourceType": "core/fd/components/form/button/v1/button",`
`10`	`10`	`"template": {`
`11`		`- "jcr:title": "Button",`
`12`		`- "enabled": true,`
`13`		`- "visible": true`
	`11`	`+ "jcr:title": "Button"`
`14`	`12`	`}`
`15`	`13`	`}`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@`
`17`	`17`	`"Item 1",`
`18`	`18`	`"Item 2"`
`19`	`19`	`],`
`20`		`- "visible": true,`
`21`		`- "enabled": true,`
`22`	`20`	`"orientation": "horizontal",`
`23`	`21`	`"type": "string[]"`
`24`	`22`	`}`