MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent adding form steps inside other form steps and fix illegalChildren usage

This commit is contained in:
Andrew Kingston 2021-08-20 15:16:20 +01:00
parent 86dbd918f2
commit 8cb9870cf7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/builder/src/components/design/AppPreview/ComponentSelectionList.svelte
View File

@ -46,7 +46,7 @@
<ActionMenu disabled={!item.isCategory}> <ActionMenu disabled={!item.isCategory}>
<ActionButton <ActionButton
icon={item.icon} icon={item.icon}
disabled={isChildAllowed(item, $selectedComponent)} disabled={!item.isCategory && isChildAllowed(item, $selectedComponent)}
quiet quiet
size="S" size="S"
slot="control" slot="control"
@ -66,6 +66,7 @@
dataCy={`component-${item.name}`} dataCy={`component-${item.name}`}
icon={item.icon} icon={item.icon}
on:click={() => onItemChosen(item)} on:click={() => onItemChosen(item)}
disabled={isChildAllowed(item, $selectedComponent)}
> >
{item.name} {item.name}
</MenuItem> </MenuItem>

6
packages/standard-components/manifest.json
View File

@ -1702,7 +1702,7 @@
"name": "Form", "name": "Form",
"icon": "Form", "icon": "Form",
"hasChildren": true, "hasChildren": true,
"illegalChildren": ["section"], "illegalChildren": ["section", "form"],
"actions": [ "actions": [
"ValidateForm", "ValidateForm",
"ClearForm", "ClearForm",
@ -1764,9 +1764,9 @@
}, },
"formstep": { "formstep": {
"name": "Form Step", "name": "Form Step",
"icon": "Form", "icon": "AssetsAdded",
"hasChildren": true, "hasChildren": true,
"illegalChildren": ["section"], "illegalChildren": ["section", "form", "form step"],
"styles": ["size"], "styles": ["size"],
"settings": [ "settings": [
{ {