fix(frontend): set unused schema property fields to null

This commit is contained in:
Ruben Fiszel
2024-10-11 15:25:32 +02:00
parent 568cc66932
commit be112408e7
3 changed files with 34 additions and 15 deletions
@@ -141,6 +141,7 @@
defaultValue?: any,
nnullable?: boolean
) {
console.log(value)
if ((value == undefined || value == null) && !ignoreValueUndefined) {
value = defaultValue
if (defaultValue === undefined || defaultValue === null) {
@@ -18,9 +18,9 @@
export let contentEncoding: 'base64' | 'binary' | undefined
export let customErrorMessage: string | undefined
export let minRows: number | undefined = undefined
export let disableCreate: boolean | undefined = false
export let disableVariablePicker: boolean | undefined = false
export let password: boolean = false
export let disableCreate: boolean | undefined = undefined
export let disableVariablePicker: boolean | undefined = undefined
export let password: boolean | undefined = undefined
export let noExtra = false
export let dateFormat: string | undefined
export let enumLabels: Record<string, string> | undefined = undefined
@@ -236,7 +236,7 @@
<Toggle
size="xs"
options={{ right: 'Disallow creating custom values' }}
checked={disableCreate != undefined && disableCreate}
checked={disableCreate}
on:change={(e) => {
if (e.detail) {
disableCreate = true
@@ -309,7 +309,7 @@
<Toggle
size="xs"
options={{ right: 'Disable variable picker' }}
checked={disableVariablePicker != undefined && disableVariablePicker}
checked={disableVariablePicker}
on:change={(e) => {
if (e.detail) {
disableVariablePicker = true
@@ -327,7 +327,11 @@
options={{ right: 'Is Password' }}
checked={password}
on:change={(e) => {
password = e.detail
if (e.detail) {
password = true
} else {
password = undefined
}
}}
/>
{/if}
@@ -26,11 +26,11 @@
export let oneOf: SchemaProperty[] | undefined = undefined
export let required = false
export let pattern: undefined | string = undefined
export let password = false
export let password: undefined | boolean = undefined
export let variableEditor: VariableEditor | undefined = undefined
export let itemPicker: ItemPicker | undefined = undefined
export let nullable: boolean = false
export let disabled: boolean = false
export let nullable: boolean | undefined = undefined
export let disabled: boolean | undefined = undefined
export let defaultValue: any = undefined
export let propsNames: any = []
export let showExpr: string | undefined = undefined
@@ -44,9 +44,9 @@
multiselect?: string[]
}
| undefined = undefined
export let properties: Record<string, any> = {}
export let order: string[] = []
export let requiredProperty: string[] = []
export let properties: Record<string, any> | undefined = undefined
export let order: string[] | undefined = undefined
export let requiredProperty: string[] | undefined = undefined
export let displayWebhookWarning: boolean = true
export let lightweightMode: boolean = false
@@ -126,7 +126,7 @@
return {
...v,
properties: {
...v.properties,
...(v.properties ?? {}),
label: {
type: 'string',
enum: [v.title ?? '']
@@ -386,7 +386,14 @@
}}
lightMode
size="xs"
bind:checked={nullable}
checked={nullable}
on:change={(event) => {
if (event?.detail) {
nullable = true
} else {
nullable = undefined
}
}}
disabled={required}
/>
{/if}
@@ -397,7 +404,14 @@
}}
lightMode
size="xs"
bind:checked={disabled}
checked={disabled}
on:change={(event) => {
if (event?.detail) {
disabled = true
} else {
disabled = undefined
}
}}
/>
</div>