From 85377d24cef5a91bf4c9e54dfcfea8d476d492aa Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 19 Mar 2021 13:09:22 +0000 Subject: [PATCH] Update form setting datasource type --- packages/standard-components/manifest.json | 32 +------------------ .../standard-components/src/forms/Form.svelte | 12 +++---- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json index 50812fc1dd..36ecde0903 100644 --- a/packages/standard-components/manifest.json +++ b/packages/standard-components/manifest.json @@ -440,36 +440,6 @@ } ] }, - "rowdetail": { - "name": "Row Detail", - "description": "Loads a row, using an id from the URL, which can be used with {{ context }}, in children", - "icon": "ri-profile-line", - "styleable": true, - "hasChildren": true, - "dataProvider": true, - "settings": [ - { - "type": "table", - "label": "Table", - "key": "table" - } - ] - }, - "newrow": { - "name": "New Row", - "description": "Sets up a new row for creation, which can be used with {{ context }}, in children", - "icon": "ri-profile-line", - "hasChildren": true, - "styleable": true, - "dataProvider": true, - "settings": [ - { - "type": "table", - "label": "Table", - "key": "table" - } - ] - }, "cardhorizontal": { "name": "Horizontal Card", "description": "A basic card component that can contain content and actions.", @@ -1144,7 +1114,7 @@ { "type": "schema", "label": "Schema", - "key": "datasource" + "key": "dataSource" }, { "type": "select", diff --git a/packages/standard-components/src/forms/Form.svelte b/packages/standard-components/src/forms/Form.svelte index e51a31955e..5e810d5086 100644 --- a/packages/standard-components/src/forms/Form.svelte +++ b/packages/standard-components/src/forms/Form.svelte @@ -5,7 +5,7 @@ import { createValidatorFromConstraints } from "./validation" import { generateID } from "../helpers" - export let datasource + export let dataSource export let theme export let size export let disabled = false @@ -143,15 +143,15 @@ }) } - // Fetches the form schema from this form's datasource, if one exists + // Fetches the form schema from this form's dataSource, if one exists const fetchSchema = async () => { - if (!datasource?.tableId) { + if (!dataSource?.tableId) { schema = {} table = null } else { - table = await API.fetchTableDefinition(datasource?.tableId) + table = await API.fetchTableDefinition(dataSource?.tableId) if (table) { - if (datasource?.type === "query") { + if (dataSource?.type === "query") { schema = {} const params = table.parameters || [] params.forEach(param => { @@ -171,7 +171,7 @@ + data={{ ...$formState.values, tableId: dataSource?.tableId }}>