From 0ae668edc6882d951e40b1ec66e717a51edceb09 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 31 Jan 2024 20:52:02 +0100 Subject: [PATCH] make reorder more resilient --- frontend/src/lib/components/EditableSchemaForm.svelte | 4 +++- frontend/src/lib/components/LightweightSchemaForm.svelte | 4 +++- frontend/src/lib/components/SchemaEditor.svelte | 1 - frontend/src/lib/components/SchemaForm.svelte | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/lib/components/EditableSchemaForm.svelte b/frontend/src/lib/components/EditableSchemaForm.svelte index 9f2ae71dc9..b7b5b34fdd 100644 --- a/frontend/src/lib/components/EditableSchemaForm.svelte +++ b/frontend/src/lib/components/EditableSchemaForm.svelte @@ -102,7 +102,9 @@ const n = {} ;(schema.order as string[]).forEach((x) => { - n[x] = schema.properties[x] + if (schema.properties && schema.properties[x] != undefined) { + n[x] = schema.properties[x] + } }) Object.keys(schema.properties ?? {}) diff --git a/frontend/src/lib/components/LightweightSchemaForm.svelte b/frontend/src/lib/components/LightweightSchemaForm.svelte index 2a56521220..3d2b43bac3 100644 --- a/frontend/src/lib/components/LightweightSchemaForm.svelte +++ b/frontend/src/lib/components/LightweightSchemaForm.svelte @@ -44,7 +44,9 @@ const n = {} ;(schema.order as string[]).forEach((x) => { - n[x] = schema.properties[x] + if (schema.properties && schema.properties[x] != undefined) { + n[x] = schema.properties[x] + } }) Object.keys(schema.properties ?? {}) diff --git a/frontend/src/lib/components/SchemaEditor.svelte b/frontend/src/lib/components/SchemaEditor.svelte index c2025aaf2c..db438d14d1 100644 --- a/frontend/src/lib/components/SchemaEditor.svelte +++ b/frontend/src/lib/components/SchemaEditor.svelte @@ -242,7 +242,6 @@ index: index, propertiesNumber: Object.entries(properties).length } - console.log(name, property) if (property?.type === 'object') { const newPath = [...path, name] return [ diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte index 19c2fb9404..96056f7d50 100644 --- a/frontend/src/lib/components/SchemaForm.svelte +++ b/frontend/src/lib/components/SchemaForm.svelte @@ -98,7 +98,9 @@ const n = {} ;(schema.order as string[]).forEach((x) => { - n[x] = schema.properties[x] + if (schema.properties && schema.properties[x] != undefined) { + n[x] = schema.properties[x] + } }) Object.keys(schema.properties ?? {})