From 0c0887382d0e05622124ac145d1caa3519629b10 Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Sun, 11 Oct 2020 20:42:30 +0100 Subject: [PATCH 1/7] fix: no fields required by default --- packages/builder/src/constants/backend/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js index 55a2d2c6c..a735e4b86 100644 --- a/packages/builder/src/constants/backend/index.js +++ b/packages/builder/src/constants/backend/index.js @@ -15,7 +15,7 @@ export const FIELDS = { type: "options", constraints: { type: "string", - presence: { allowEmpty: true }, + presence: false, inclusion: [], }, }, @@ -67,7 +67,7 @@ export const FIELDS = { type: "link", constraints: { type: "array", - presence: { allowEmpty: true }, + presence: false, }, }, } From d916de9b7f9c64f904e64776bd0a5abae220a65e Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Mon, 12 Oct 2020 14:48:30 +0100 Subject: [PATCH 2/7] Settings >URL select handles Record detail urls --- .../builderStore/fetchBindableProperties.js | 2 + .../userInterface/ScreenSelect.svelte | 68 ++++++++++++++++++- .../userInterface/temporaryPanelStructure.js | 6 +- 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/builderStore/fetchBindableProperties.js b/packages/builder/src/builderStore/fetchBindableProperties.js index 92359ae63..fbb3b1b30 100644 --- a/packages/builder/src/builderStore/fetchBindableProperties.js +++ b/packages/builder/src/builderStore/fetchBindableProperties.js @@ -90,6 +90,8 @@ const contextToBindables = (models, walkResult) => context => { runtimeBinding: `${contextParentPath}data.${key}`, // how the binding exressions looks to the user of the builder readableBinding: `${context.instance._instanceName}.${model.name}.${key}`, + // model / view info + model: context.model, }) // see ModelViewSelect.svelte for the format of context.model diff --git a/packages/builder/src/components/userInterface/ScreenSelect.svelte b/packages/builder/src/components/userInterface/ScreenSelect.svelte index 412f0719f..baff9a782 100644 --- a/packages/builder/src/components/userInterface/ScreenSelect.svelte +++ b/packages/builder/src/components/userInterface/ScreenSelect.svelte @@ -1,18 +1,80 @@ + {#each urls as url} + {/each} diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js index 3f853efcf..b628e86e2 100644 --- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js +++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js @@ -356,7 +356,7 @@ export default { { label: "destinationUrl", key: "destinationUrl", - control: Input, + control: ScreenSelect, placeholder: "/table/_id", }, ], @@ -405,7 +405,7 @@ export default { { label: "Link Url", key: "linkUrl", - control: Input, + control: ScreenSelect, placeholder: "Link URL", }, { @@ -480,7 +480,7 @@ export default { { label: "Link Url", key: "linkUrl", - control: Input, + control: ScreenSelect, placeholder: "Link URL", }, { From 4a32c7981ac740ed44e6ea19b1865c06b53bee16 Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Mon, 12 Oct 2020 15:32:49 +0100 Subject: [PATCH 3/7] fix: view filter displaying incorrect options --- .../components/backend/DataTable/popovers/FilterPopover.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte index 3d6241f0a..0a76ee1ef 100644 --- a/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte +++ b/packages/builder/src/components/backend/DataTable/popovers/FilterPopover.svelte @@ -79,7 +79,7 @@ } function fieldOptions(field) { - return viewModel.schema[field].type === "string" + return viewModel.schema[field].type === "options" ? viewModel.schema[field].constraints.inclusion : [true, false] } From cc8a53f40b449d483825fe76a4cd8f0f690b3974 Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Mon, 12 Oct 2020 15:51:03 +0100 Subject: [PATCH 4/7] Analytics - record screen template used --- .../src/components/userInterface/NewScreenModal.svelte | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/userInterface/NewScreenModal.svelte b/packages/builder/src/components/userInterface/NewScreenModal.svelte index 0a9bc8198..0fb31edcd 100644 --- a/packages/builder/src/components/userInterface/NewScreenModal.svelte +++ b/packages/builder/src/components/userInterface/NewScreenModal.svelte @@ -3,6 +3,7 @@ import { Input, Button, Spacer, Select, ModalContent } from "@budibase/bbui" import getTemplates from "builderStore/store/screenTemplates" import { some } from "lodash/fp" + import analytics from "analytics" const CONTAINER = "@budibase/standard-components/container" @@ -29,7 +30,7 @@ const templateChanged = newTemplateIndex => { if (newTemplateIndex === undefined) return - + const template = templates[newTemplateIndex] draftScreen = templates[newTemplateIndex].create() if (draftScreen.props._instanceName) { name = draftScreen.props._instanceName @@ -63,6 +64,13 @@ store.createScreen(draftScreen) + if (templateIndex !== undefined) { + const template = templates[templateIndex] + analytics.captureEvent("Screen Created", { + template: template.id || template.name, + }) + } + finished() } From 98138296c731d45dc0a3d3fca4e5f0d658d9e032 Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Mon, 12 Oct 2020 16:26:54 +0100 Subject: [PATCH 5/7] unused "options" member in prop types --- .../builder/src/components/userInterface/pagesParsing/types.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/components/userInterface/pagesParsing/types.js b/packages/builder/src/components/userInterface/pagesParsing/types.js index b5f073e68..b8867cc8d 100644 --- a/packages/builder/src/components/userInterface/pagesParsing/types.js +++ b/packages/builder/src/components/userInterface/pagesParsing/types.js @@ -10,7 +10,6 @@ export const TYPE_MAP = { }, options: { default: [], - options: [], }, event: { default: [], From 376b8b40d73522eb4056ef08ee63431b6323e46f Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Mon, 12 Oct 2020 16:27:34 +0100 Subject: [PATCH 6/7] fix: Default props were mutated - cause very strange issue with event handlers --- .../components/userInterface/pagesParsing/createProps.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/userInterface/pagesParsing/createProps.js b/packages/builder/src/components/userInterface/pagesParsing/createProps.js index 44d23c5c3..b628b6e15 100644 --- a/packages/builder/src/components/userInterface/pagesParsing/createProps.js +++ b/packages/builder/src/components/userInterface/pagesParsing/createProps.js @@ -1,4 +1,4 @@ -import { isString, isUndefined } from "lodash/fp" +import { isString, isUndefined, cloneDeep } from "lodash/fp" import { TYPE_MAP } from "./types" import { assign } from "lodash" import { uuid } from "builderStore/uuid" @@ -83,13 +83,13 @@ const parsePropDef = propDef => { if (isString(propDef)) { if (!TYPE_MAP[propDef]) return error(`Type ${propDef} is not recognised.`) - return TYPE_MAP[propDef].default + return cloneDeep(TYPE_MAP[propDef].default) } const type = TYPE_MAP[propDef.type] if (!type) return error(`Type ${propDef.type} is not recognised.`) - return propDef.default + return cloneDeep(propDef.default) } export const arrayElementComponentName = (parentComponentName, arrayPropName) => From 26b2fda6167b0b281f44f8312faffbbc8fa7ac5e Mon Sep 17 00:00:00 2001 From: Michael Shanks Date: Mon, 12 Oct 2020 16:28:37 +0100 Subject: [PATCH 7/7] code reivew - unused code --- .../builder/src/components/userInterface/ScreenSelect.svelte | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/builder/src/components/userInterface/ScreenSelect.svelte b/packages/builder/src/components/userInterface/ScreenSelect.svelte index baff9a782..8bc22e95a 100644 --- a/packages/builder/src/components/userInterface/ScreenSelect.svelte +++ b/packages/builder/src/components/userInterface/ScreenSelect.svelte @@ -33,11 +33,6 @@ models: $backendUiStore.models, }) - const idBindingForModel = modelId => { - for (let bindableProp of bindableProperties) { - } - } - const detailScreens = $store.screens.filter(screen => screen.props._component.endsWith("/rowdetail") )