Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions blocks/form/_form.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,29 @@
{
"name": "Send email",
"value": "fd/af/components/guidesubmittype/email"
},
{
"name": "Submit to Spreadsheet",
"value": "fd/af/components/guidesubmittype/franklin/spreadsheet"
}
],
"value" : ""
},
{
"component": "text",
"name": "spreadsheetUrl",
"label": "Spreadsheet Url",
"valueType": "string",
"required": true,
"condition": {
"==": [
{
"var": "actionType"
},
"fd/af/components/guidesubmittype/franklin/spreadsheet"
]
}
},
{
"component": "boolean",
"name": "enableRestEndpointPost",
Expand Down Expand Up @@ -123,6 +142,12 @@
"label": "Use external template",
"valueType": "boolean"
},
{
"component": "boolean",
"name": "useExternalEmailTemplate",
"label": "Use external template",
"valueType": "boolean"
},
{
"component": "aem-content",
"name": "templatePath",
Expand Down
1 change: 1 addition & 0 deletions blocks/form/models/form-common/_basic-fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down
1 change: 1 addition & 0 deletions blocks/form/models/form-common/_basic-input-fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down
2 changes: 1 addition & 1 deletion blocks/form/models/form-components/_checkbox-group.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"visible": true,
"enabled": true,
"orientation": "horizontal",
"type": "number[]"
"type": "string[]"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion blocks/form/models/form-components/_drop-down.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"enabled": true,
"visible": true,
"type": "number"
"type": "string"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions blocks/form/models/form-components/_text.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down
4 changes: 2 additions & 2 deletions component-definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
"visible": true,
"enabled": true,
"orientation": "horizontal",
"type": "number[]"
"type": "string[]"
}
}
}
Expand Down Expand Up @@ -316,7 +316,7 @@
],
"enabled": true,
"visible": true,
"type": "number"
"type": "string"
}
}
}
Expand Down
47 changes: 47 additions & 0 deletions component-models.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@
}
]
},
{

Check failure on line 277 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using more than 4 cells in a block, found 15 for form
"id": "form",
"fields": [
{
Expand Down Expand Up @@ -306,7 +306,7 @@
{
"component": "select",
"valueType": "string",
"name": "actionType",

Check failure on line 309 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using orphan collapsible field names
"label": "Submit Action",
"options": [
{
Expand All @@ -316,10 +316,29 @@
{
"name": "Send email",
"value": "fd/af/components/guidesubmittype/email"
},
{
"name": "Submit to Spreadsheet",
"value": "fd/af/components/guidesubmittype/franklin/spreadsheet"
}
],
"value": ""
},
{
"component": "text",
"name": "spreadsheetUrl",
"label": "Spreadsheet Url",
"valueType": "string",
"required": true,
"condition": {
"==": [
{
"var": "actionType"
},
"fd/af/components/guidesubmittype/franklin/spreadsheet"
]
}
},
{
"component": "boolean",
"name": "enableRestEndpointPost",
Expand Down Expand Up @@ -398,10 +417,16 @@
},
{
"component": "boolean",
"name": "useExternalEmailTemplate",

Check failure on line 420 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Do not use duplicate field names
"label": "Use external template",
"valueType": "boolean"
},
{
"component": "boolean",
"name": "useExternalEmailTemplate",
"label": "Use external template",
"valueType": "boolean"
},
{
"component": "aem-content",
"name": "templatePath",
Expand Down Expand Up @@ -440,7 +465,7 @@
}
]
},
{

Check failure on line 468 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using more than 4 cells in a block, found 7 for form-button
"id": "form-button",
"fields": [
{
Expand Down Expand Up @@ -486,6 +511,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -561,7 +587,7 @@
}
]
},
{

Check failure on line 590 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using more than 4 cells in a block, found 20 for checkbox-group
"id": "checkbox-group",
"fields": [
{
Expand Down Expand Up @@ -590,7 +616,7 @@
},
{
"component": "boolean",
"name": "hideTitle",

Check failure on line 619 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using orphan collapsible field names
"label": "Hide title",
"valueType": "boolean"
},
Expand Down Expand Up @@ -631,6 +657,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -809,7 +836,7 @@
}
]
},
{

Check failure on line 839 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using more than 4 cells in a block, found 18 for checkbox
"id": "checkbox",
"fields": [
{
Expand Down Expand Up @@ -838,7 +865,7 @@
},
{
"component": "boolean",
"name": "hideTitle",

Check failure on line 868 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using orphan collapsible field names
"label": "Hide title",
"valueType": "boolean"
},
Expand Down Expand Up @@ -879,6 +906,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -1020,7 +1048,7 @@
}
]
},
{

Check failure on line 1051 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using more than 4 cells in a block, found 21 for date-input
"id": "date-input",
"fields": [
{
Expand Down Expand Up @@ -1049,7 +1077,7 @@
},
{
"component": "boolean",
"name": "hideTitle",

Check failure on line 1080 in component-models.json

View workflow job for this annotation

GitHub Actions / build

Avoid using orphan collapsible field names
"label": "Hide title",
"valueType": "boolean"
},
Expand Down Expand Up @@ -1090,6 +1118,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -1345,6 +1374,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -1566,6 +1596,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -1793,6 +1824,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -1991,6 +2023,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -2270,6 +2303,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -2503,6 +2537,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -2768,6 +2803,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -3048,6 +3084,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -3283,6 +3320,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -3404,6 +3442,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -3549,6 +3588,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -3762,6 +3802,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -3953,6 +3994,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -4076,6 +4118,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -4249,6 +4292,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -4394,6 +4438,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -4595,6 +4640,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down Expand Up @@ -4746,6 +4792,7 @@
"name": "colspan",
"label": "Column Span",
"valueType": "string",
"value": "12",
"options": [
{
"name": "1 column",
Expand Down
Loading