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

Skeleton Fixes (#8845)

This commit is contained in:
Gerard Burns 2022-12-02 09:24:05 +00:00 committed by GitHub
parent 8fab962e38
commit 66a00a677a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 265 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/components/Component.svelte
View File

@ -479,6 +479,7 @@
definition.name !== "Screenslot" && definition.name !== "Screenslot" &&
children.length === 0 && children.length === 0 &&
!instance._blockElementHasChildren && !instance._blockElementHasChildren &&
!definition.block &&
definition.skeleton !== false definition.skeleton !== false
</script> </script>

8
packages/client/src/components/app/blocks/CardsBlock.svelte
View File

@ -36,7 +36,6 @@
let dataProviderId let dataProviderId
let repeaterId let repeaterId
let schema let schema
let schemaLoaded = false
$: fetchSchema(dataSource) $: fetchSchema(dataSource)
$: enrichedSearchColumns = enrichSearchColumns(searchColumns, schema) $: enrichedSearchColumns = enrichSearchColumns(searchColumns, schema)
@ -75,12 +74,10 @@
enrichRelationships: true, enrichRelationships: true,
}) })
} }
schemaLoaded = true
} }
</script> </script>
{#if schemaLoaded} <Block>
<Block>
<BlockComponent <BlockComponent
type="form" type="form"
bind:id={formId} bind:id={formId}
@ -208,5 +205,4 @@
</BlockComponent> </BlockComponent>
</BlockComponent> </BlockComponent>
</BlockComponent> </BlockComponent>
</Block> </Block>
{/if}

8
packages/client/src/components/app/blocks/TableBlock.svelte
View File

@ -36,7 +36,6 @@
let newRowSidePanelId let newRowSidePanelId
let schema let schema
let primaryDisplay let primaryDisplay
let schemaLoaded = false
$: fetchSchema(dataSource) $: fetchSchema(dataSource)
$: enrichedSearchColumns = enrichSearchColumns(searchColumns, schema) $: enrichedSearchColumns = enrichSearchColumns(searchColumns, schema)
@ -89,7 +88,6 @@
enrichRelationships: true, enrichRelationships: true,
}) })
} }
schemaLoaded = true
} }
const getNormalFields = schema => { const getNormalFields = schema => {
@ -113,8 +111,7 @@
} }
</script> </script>
{#if schemaLoaded} <Block>
<Block>
<BlockComponent <BlockComponent
type="form" type="form"
bind:id={formId} bind:id={formId}
@ -270,5 +267,4 @@
</BlockComponent> </BlockComponent>
{/if} {/if}
</BlockComponent> </BlockComponent>
</Block> </Block>
{/if}

10
packages/client/src/components/app/forms/Form.svelte
View File

@ -20,7 +20,6 @@
const context = getContext("context") const context = getContext("context")
const { API, fetchDatasourceSchema } = getContext("sdk") const { API, fetchDatasourceSchema } = getContext("sdk")
let loaded = false
let schema let schema
let table let table
@ -49,9 +48,6 @@
// Fetches the form schema from this form's dataSource // Fetches the form schema from this form's dataSource
const fetchSchema = async dataSource => { const fetchSchema = async dataSource => {
schema = (await fetchDatasourceSchema(dataSource)) || {} schema = (await fetchDatasourceSchema(dataSource)) || {}
if (!loaded) {
loaded = true
}
} }
const fetchTable = async dataSource => { const fetchTable = async dataSource => {
@ -70,8 +66,7 @@
) )
</script> </script>
{#if loaded} {#key resetKey}
{#key resetKey}
<InnerForm <InnerForm
{dataSource} {dataSource}
{theme} {theme}
@ -86,5 +81,4 @@
> >
<slot /> <slot />
</InnerForm> </InnerForm>
{/key} {/key}
{/if}