From cd43a1a2c26f10b0599e9db9a53266e791b82013 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 30 Jun 2023 09:48:07 +0100 Subject: [PATCH] Clear validation processing when crossing into a side panel component --- packages/builder/src/builderStore/store/frontend.js | 6 +++++- .../[componentId]/new/_components/NewComponentPanel.svelte | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 9dfd11a537..4a2de13ab0 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -235,6 +235,7 @@ export const getFrontendStore = () => { legalDirectChildren = [] ) => { const type = component._component + if (illegalChildren.includes(type)) { return type } @@ -248,10 +249,13 @@ export const getFrontendStore = () => { return } + if (type === "@budibase/standard-components/sidepanel") { + illegalChildren = [] + } + const definition = store.actions.components.getDefinition( component._component ) - // Reset whitelist for direct children legalDirectChildren = [] if (definition?.legalDirectChildren?.length) { diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte index 6372ceeed0..7dca5b792b 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte @@ -52,6 +52,9 @@ // Build up list of illegal children from ancestors let illegalChildren = definition.illegalChildren || [] path.forEach(ancestor => { + if (ancestor._component === `@budibase/standard-components/sidepanel`) { + illegalChildren = [] + } const def = store.actions.components.getDefinition(ancestor._component) const blacklist = def?.illegalChildren?.map(x => { return `@budibase/standard-components/${x}`