CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-01 01:28:51 +13:00
Code Issues Projects Releases Wiki Activity

Fix issue where required settings that depend on other settings were still blocking rendering

Browse source
This commit is contained in:
Andrew Kingston 2022-06-15 10:17:34 +01:00
parent 8fbcf86d40
commit 11c5ed1f6a
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
packages/client/src/components/Component.svelte
View file

@ -207,10 +207,23 @@
// Check if we have any missing required settings // Check if we have any missing required settings
missingRequiredSettings = settingsDefinition.filter(setting => { missingRequiredSettings = settingsDefinition.filter(setting => {
return ( let empty = instance[setting.key] == null || instance[setting.key] === ""
setting.required && let missing = setting.required && empty
(instance[setting.key] == null || instance[setting.key] === "")
) // Check if this setting depends on another, as it may not be required
if (setting.dependsOn) {
const dependsOnKey = setting.dependsOn.setting || setting.dependsOn
const dependsOnValue = setting.dependsOn.value
const realDependentValue = instance[dependsOnKey]
if (dependsOnValue == null && realDependentValue == null) {
return false
}
if (dependsOnValue !== realDependentValue) {
return false
}
}
return missing
}) })
// Force an initial enrichment of the new settings // Force an initial enrichment of the new settings