From 7c6333fca5b2701126e6315716ee744d48248551 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 14 Apr 2020 10:58:56 +0200 Subject: [PATCH] updates ModelView to use model instead of record --- .../src/components/database/ModelView.svelte | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/packages/builder/src/components/database/ModelView.svelte b/packages/builder/src/components/database/ModelView.svelte index c7b46df560..61768f4479 100644 --- a/packages/builder/src/components/database/ModelView.svelte +++ b/packages/builder/src/components/database/ModelView.svelte @@ -23,8 +23,7 @@ import { templateApi, pipe, validate } from "components/common/core" import ErrorsBox from "components/common/ErrorsBox.svelte" - let record - let getIndexAllowedRecords + let model let editingField = false let fieldToEdit let isNewField = false @@ -34,23 +33,15 @@ let onFinishedFieldEdit let editIndex - $: models = $store.hierarchy.children - $: parent = record && record.parent() + $: parent = model && model.parent() $: isChildModel = parent && parent.name !== "root" $: modelExistsInHierarchy = $store.currentNode && getNode($store.hierarchy, $store.currentNode.nodeId) store.subscribe($store => { - record = $store.currentNode + model = $store.currentNode const flattened = hierarchy.getFlattenedHierarchy($store.hierarchy) - getIndexAllowedRecords = compose( - join(", "), - map(id => flattened.find(n => n.nodeId === id).name), - filter(id => flattened.some(n => n.nodeId === id)), - get("allowedRecordNodeIds") - ) - newField = () => { isNewField = true fieldToEdit = templateApi($store.hierarchy).getNewField("string") @@ -94,8 +85,8 @@ const nameChanged = ev => { const pluralName = n => `${n}s` - if (record.collectionName === "") { - record.collectionName = pluralName(ev.target.value) + if (model.collectionName === "") { + model.collectionName = pluralName(ev.target.value) } } @@ -119,7 +110,7 @@
- + {#if isChildModel}
@@ -144,7 +135,7 @@ - {#each record ? record.fields : [] as field} + {#each model ? model.fields : [] as field} editField(field)} /> @@ -169,7 +160,7 @@ {#if modelExistsInHierarchy} - Create Child Model on {record.name} + Create Child Model on {model.name} - Create Child View on {record.name} + Create Child View on {model.name} Delete @@ -190,7 +181,7 @@ {/if}