diff --git a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml index 5d9aee261..98fdc8dfd 100644 --- a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml +++ b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml @@ -96,6 +96,10 @@ spec: value: worker-service:{{ .Values.services.worker.port }} - name: COOKIE_DOMAIN value: {{ .Values.globals.cookieDomain | quote }} + - name: ACCOUNT_PORTAL_URL + value: {{ .Values.globals.accountPortalUrl | quote }} + - name: ACCOUNT_PORTAL_API_KEY + value: {{ .Values.globals.accountPortalApiKey | quote }} image: budibase/apps imagePullPolicy: Always name: bbapps diff --git a/lerna.json b/lerna.json index c8a91b191..51bb88fd7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.151", + "version": "0.9.152-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index f9d6aa131..19da3f7b6 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.151", + "version": "0.9.152-alpha.0", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 64fb8e607..d97ef7d84 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "0.9.151", + "version": "0.9.152-alpha.0", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -78,7 +78,7 @@ "@spectrum-css/underlay": "^2.0.9", "@spectrum-css/vars": "^3.0.1", "dayjs": "^1.10.4", - "svelte-flatpickr": "^3.1.0", + "svelte-flatpickr": "^3.2.3", "svelte-portal": "^1.0.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte index 2516cb659..176db9f49 100644 --- a/packages/bbui/src/Form/Core/DatePicker.svelte +++ b/packages/bbui/src/Form/Core/DatePicker.svelte @@ -26,6 +26,7 @@ altFormat: enableTime ? "F j Y, H:i" : "F j, Y", wrap: true, appendTo, + disableMobile: "true", } const handleChange = event => { diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock index a3b20aa86..a492c8326 100644 --- a/packages/bbui/yarn.lock +++ b/packages/bbui/yarn.lock @@ -2415,10 +2415,10 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -svelte-flatpickr@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.1.0.tgz#ad83588430dbd55196a1a258b8ba27e7f9c1ee37" - integrity sha512-zKyV+ukeVuJ8CW0Ing3T19VSekc4bPkou/5Riutt1yATrLvSsanNqcgqi7Q5IePvIoOF9GJ5OtHvn1qK9Wx9BQ== +svelte-flatpickr@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.3.tgz#db5dd7ad832ef83262b45e09737955ad3d591fc8" + integrity sha512-PNkqK4Napx8nTvCwkaUXdnKo8dISThaxEOK+szTUXcY6H0dQM0TSyuoMaVWY2yX7pM+PN5cpCQCcVe8YvTRFSw== dependencies: flatpickr "^4.5.2" diff --git a/packages/builder/assets/budiworld.webp b/packages/builder/assets/budiworld.webp new file mode 100644 index 000000000..347036a79 Binary files /dev/null and b/packages/builder/assets/budiworld.webp differ diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 3c093dd1c..cbdaa2727 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -30,7 +30,7 @@ Cypress.Commands.add("login", () => { Cypress.Commands.add("createApp", name => { cy.visit(`localhost:${Cypress.env("PORT")}/builder`) cy.wait(500) - cy.contains(/Create (new )?app/).click() + cy.contains(/Start from scratch/).click() cy.get(".spectrum-Modal") .within(() => { cy.get("input").eq(0).type(name).should("have.value", name).blur() diff --git a/packages/builder/index.html b/packages/builder/index.html index eb58dc74d..e3383cda3 100644 --- a/packages/builder/index.html +++ b/packages/builder/index.html @@ -4,7 +4,7 @@ Budibase - + { if (!asset) { return } + + // Fetch full definition + component = findComponent(asset.props, component._id) + + // Ensure we aren't deleting the screen slot + if (component._component?.endsWith("/screenslot")) { + throw "You can't delete the screen slot" + } + + // Ensure we aren't deleting something that contains the screen slot + const screenslot = findComponentType( + component, + "@budibase/standard-components/screenslot" + ) + if (screenslot != null) { + throw "You can't delete a component that contains the screen slot" + } + const parent = findComponentParent(asset.props, component._id) if (parent) { parent._children = parent._children.filter( diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte index 4e51850fe..d2d67bf99 100644 --- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte +++ b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte @@ -6,7 +6,13 @@ import { Screen } from "builderStore/store/screenTemplates/utils/Screen" import { FrontendTypes } from "constants" import ConfirmDialog from "components/common/ConfirmDialog.svelte" - import { ProgressCircle, Layout, Heading, Body } from "@budibase/bbui" + import { + ProgressCircle, + Layout, + Heading, + Body, + notifications, + } from "@budibase/bbui" import ErrorSVG from "assets/error.svg?raw" import { findComponent, findComponentPath } from "builderStore/storeUtils" @@ -166,10 +172,15 @@ confirmDeleteDialog.show() } - const deleteComponent = () => { - store.actions.components.delete({ _id: idToDelete }) + const deleteComponent = async () => { + try { + await store.actions.components.delete({ _id: idToDelete }) + } catch (error) { + notifications.error(error) + } idToDelete = null } + const cancelDeleteComponent = () => { idToDelete = null } diff --git a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte b/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte index ac70fb9b2..7b36de4fa 100644 --- a/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte +++ b/packages/builder/src/components/design/AppPreview/ThemeEditor.svelte @@ -84,7 +84,7 @@
- +
- + { - await store.actions.components.delete(component) + try { + await store.actions.components.delete(component) + } catch (error) { + notifications.error(error) + } } const storeComponentForCopy = (cut = false) => { diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index 9ce9d746d..fae0f80f0 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -17,6 +17,7 @@ import { capitalise } from "helpers" import { goto } from "@roxi/routify" import { APP_NAME_REGEX } from "constants" + import TemplateList from "./TemplateList.svelte" export let template @@ -31,12 +32,16 @@ APP_NAME_REGEX, "App name must be letters, numbers and spaces only" ), - file: template ? mixed().required("Please choose a file to import") : null, + file: template?.fromFile + ? mixed().required("Please choose a file to import") + : null, } let submitting = false let valid = false + $: checkValidity($values, validator) + $: showTemplateSelection = !template?.fromFile && !template?.key onMount(async () => { await hostingStore.actions.fetchDeployedApps() @@ -73,7 +78,7 @@ submitting = true // Check a template exists if we are important - if (template && !$values.file) { + if (template?.fromFile && !$values.file) { $errors.file = "Please choose a file to import" valid = false submitting = false @@ -133,33 +138,59 @@ } - - {#if template} - { - $values.file = e.detail?.[0] - $touched.file = true +{#if showTemplateSelection} + { + showTemplateSelection = false + return false + }} + showCancelButton={false} + showCloseIcon={false} + > + Select a template below, or start from scratch. + { + if (!selected) { + showTemplateSelection = false + return + } + + template = selected }} /> - {/if} - - Give your new app a name, and choose which groups have access (paid plans - only). - - ($touched.name = true)} - label="Name" - /> - - + +{:else} + + {#if template?.fromFile} + { + $values.file = e.detail?.[0] + $touched.file = true + }} + /> + {/if} + + Give your new app a name, and choose which groups have access (paid plans + only). + + ($touched.name = true)} + label="Name" + /> + + +{/if} diff --git a/packages/builder/src/components/start/TemplateList.svelte b/packages/builder/src/components/start/TemplateList.svelte index 7e7b5c74d..576415762 100644 --- a/packages/builder/src/components/start/TemplateList.svelte +++ b/packages/builder/src/components/start/TemplateList.svelte @@ -1,5 +1,5 @@ -
- Start With a Template + {#await templatesPromise}