diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 9b4e5e36f6..1b52e35314 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -25,21 +25,21 @@
return !!schema.constraints?.inclusion?.length
}
- const handleAttachmentParams = keyValuObj => {
+ function handleAttachmentParams(keyValueObj) {
let params = {}
if (
schema.type === FieldType.ATTACHMENT_SINGLE &&
- Object.keys(keyValuObj).length === 0
+ Object.keys(keyValueObj).length === 0
) {
return []
}
- if (!Array.isArray(keyValuObj)) {
- keyValuObj = [keyValuObj]
+ if (!Array.isArray(keyValueObj) && keyValueObj) {
+ keyValueObj = [keyValueObj]
}
- if (keyValuObj.length) {
- for (let param of keyValuObj) {
+ if (keyValueObj.length) {
+ for (let param of keyValueObj) {
params[param.url] = param.filename
}
}
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 1ec32cb3fd..4ff8ae994b 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -14,9 +14,8 @@
import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
import Editor from "../../integration/QueryEditor.svelte"
- export let defaultValue
export let meta
- export let value = defaultValue || (meta.type === "boolean" ? false : "")
+ export let value
export let readonly
export let error
diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index 77229f3a17..26972ede16 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -1,5 +1,6 @@
-
+{#if editableColumn}
+
+{/if}
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
index 7b8b2c0975..edd39cc49f 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
@@ -86,8 +86,9 @@ export const createValidatedConfigStore = (integration, config) => {
([$configStore, $errorsStore, $selectedValidatorsStore]) => {
const validatedConfig = []
+ const allowedRestKeys = ["rejectUnauthorized", "downloadImages"]
Object.entries(integration.datasource).forEach(([key, properties]) => {
- if (integration.name === "REST" && key !== "rejectUnauthorized") {
+ if (integration.name === "REST" && !allowedRestKeys.includes(key)) {
return
}
diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
index b7fa243c07..318f459f46 100644
--- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
@@ -59,13 +59,17 @@
value: FieldType.ATTACHMENTS,
},
{
- label: "User",
+ label: "Users",
value: `${FieldType.BB_REFERENCE}${BBReferenceFieldSubType.USER}`,
},
{
label: "Users",
value: `${FieldType.BB_REFERENCE}${BBReferenceFieldSubType.USERS}`,
},
+ {
+ label: "User",
+ value: `${FieldType.BB_REFERENCE_SINGLE}${BBReferenceFieldSubType.USER}`,
+ },
]
$: {
diff --git a/packages/builder/src/components/common/Dropzone.spec.js b/packages/builder/src/components/common/Dropzone.spec.js
new file mode 100644
index 0000000000..8bf202223b
--- /dev/null
+++ b/packages/builder/src/components/common/Dropzone.spec.js
@@ -0,0 +1,50 @@
+import { it, expect, describe, vi } from "vitest"
+import Dropzone from "./Dropzone.svelte"
+import { render, fireEvent } from "@testing-library/svelte"
+import { notifications } from "@budibase/bbui"
+import { admin } from "stores/portal"
+
+vi.spyOn(notifications, "error").mockImplementation(() => {})
+
+describe("Dropzone", () => {
+ let instance = null
+
+ afterEach(() => {
+ vi.restoreAllMocks()
+ })
+
+ it("that the Dropzone is rendered", () => {
+ instance = render(Dropzone, {})
+ expect(instance).toBeDefined()
+ })
+
+ it("Ensure the correct error message is shown when uploading the file in cloud", async () => {
+ admin.subscribe = vi.fn().mockImplementation(callback => {
+ callback({ cloud: true })
+ return () => {}
+ })
+ instance = render(Dropzone, { props: { fileSizeLimit: 1000000 } }) // 1MB
+ const fileInput = instance.getByLabelText("Select a file to upload")
+ const file = new File(["hello".repeat(2000000)], "hello.png", {
+ type: "image/png",
+ })
+ await fireEvent.change(fileInput, { target: { files: [file] } })
+ expect(notifications.error).toHaveBeenCalledWith(
+ "Files cannot exceed 1MB. Please try again with smaller files."
+ )
+ })
+
+ it("Ensure the file size error message is not shown when running on self host", async () => {
+ admin.subscribe = vi.fn().mockImplementation(callback => {
+ callback({ cloud: false })
+ return () => {}
+ })
+ instance = render(Dropzone, { props: { fileSizeLimit: 1000000 } }) // 1MB
+ const fileInput = instance.getByLabelText("Select a file to upload")
+ const file = new File(["hello".repeat(2000000)], "hello.png", {
+ type: "image/png",
+ })
+ await fireEvent.change(fileInput, { target: { files: [file] } })
+ expect(notifications.error).not.toHaveBeenCalled()
+ })
+})
diff --git a/packages/builder/src/components/common/Dropzone.svelte b/packages/builder/src/components/common/Dropzone.svelte
index a864e1d028..37569df0d5 100644
--- a/packages/builder/src/components/common/Dropzone.svelte
+++ b/packages/builder/src/components/common/Dropzone.svelte
@@ -1,9 +1,11 @@
@@ -14,12 +15,16 @@
-
-
-
-
+ {#if !disabled}
+
+
+
+
+
+
+ {:else}
-
+ {/if}
+
+
+ Changelog
+
+
+ import { Button, Label, Icon, Input, notifications } from "@budibase/bbui"
+ import { AppStatus } from "constants"
+ import { appStore, initialise } from "stores/builder"
+ import { appsStore } from "stores/portal"
+ import { API } from "api"
+ import { writable } from "svelte/store"
+ import { createValidationStore } from "helpers/validation/yup"
+ import * as appValidation from "helpers/validation/yup/app"
+ import EditableIcon from "components/common/EditableIcon.svelte"
+ import { isEqual } from "lodash"
+ import { createEventDispatcher } from "svelte"
+
+ export let alignActions = "left"
+
+ const values = writable({})
+ const validation = createValidationStore()
+ const dispatch = createEventDispatcher()
+
+ let updating = false
+ let edited = false
+ let initialised = false
+
+ $: filteredApps = $appsStore.apps.filter(app => app.devId == $appStore.appId)
+ $: app = filteredApps.length ? filteredApps[0] : {}
+ $: appDeployed = app?.status === AppStatus.DEPLOYED
+
+ $: appName = $appStore.name
+ $: appURL = $appStore.url
+ $: appIconName = $appStore.icon?.name
+ $: appIconColor = $appStore.icon?.color
+
+ $: appMeta = {
+ name: appName,
+ url: appURL,
+ iconName: appIconName,
+ iconColor: appIconColor,
+ }
+
+ const initForm = appMeta => {
+ edited = false
+ values.set({
+ ...appMeta,
+ })
+
+ if (!initialised) {
+ setupValidation()
+ initialised = true
+ }
+ }
+
+ const validate = (vals, appMeta) => {
+ const { url } = vals || {}
+ validation.check({
+ ...vals,
+ url: url?.[0] === "/" ? url.substring(1, url.length) : url,
+ })
+ edited = !isEqual(vals, appMeta)
+ }
+
+ // On app/apps update, reset the state.
+ $: initForm(appMeta)
+ $: validate($values, appMeta)
+
+ const resolveAppUrl = (template, name) => {
+ let parsedName
+ const resolvedName = resolveAppName(null, name)
+ parsedName = resolvedName ? resolvedName.toLowerCase() : ""
+ const parsedUrl = parsedName ? parsedName.replace(/\s+/g, "-") : ""
+ return encodeURI(parsedUrl)
+ }
+
+ const nameToUrl = appName => {
+ let resolvedUrl = resolveAppUrl(null, appName)
+ tidyUrl(resolvedUrl)
+ }
+
+ const resolveAppName = (template, name) => {
+ if (template && !name) {
+ return template.name
+ }
+ return name ? name.trim() : null
+ }
+
+ const tidyUrl = url => {
+ if (url && !url.startsWith("/")) {
+ url = `/${url}`
+ }
+ $values.url = url === "" ? null : url
+ }
+
+ const updateIcon = e => {
+ const { name, color } = e.detail
+ $values.iconColor = color
+ $values.iconName = name
+ }
+
+ const setupValidation = async () => {
+ appValidation.name(validation, {
+ apps: $appsStore.apps,
+ currentApp: app,
+ })
+ appValidation.url(validation, {
+ apps: $appsStore.apps,
+ currentApp: app,
+ })
+ }
+
+ async function updateApp() {
+ try {
+ await appsStore.save($appStore.appId, {
+ name: $values.name?.trim(),
+ url: $values.url?.trim(),
+ icon: {
+ name: $values.iconName,
+ color: $values.iconColor,
+ },
+ })
+
+ await initialiseApp()
+ notifications.success("App update successful")
+ } catch (error) {
+ console.error(error)
+ notifications.error("Error updating app")
+ }
+ }
+
+ const initialiseApp = async () => {
+ const applicationPkg = await API.fetchAppPackage($appStore.appId)
+ await initialise(applicationPkg)
+ }
+
+
+
+
+
diff --git a/packages/builder/src/components/common/UpdateAppTopNav.svelte b/packages/builder/src/components/common/UpdateAppTopNav.svelte
new file mode 100644
index 0000000000..f4a76c4576
--- /dev/null
+++ b/packages/builder/src/components/common/UpdateAppTopNav.svelte
@@ -0,0 +1,68 @@
+
+
+
+
+
+
{
+ formPopover.show()
+ }}
+ >
+
+
+
+
+
+
+ {
+ formPopover.hide()
+ }}
+ />
+
+
+
+
+
diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 105d1ed958..bb950983a6 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -8,13 +8,11 @@
ActionButton,
Icon,
Link,
- Modal,
StatusLight,
AbsTooltip,
} from "@budibase/bbui"
import RevertModal from "components/deploy/RevertModal.svelte"
import VersionModal from "components/deploy/VersionModal.svelte"
- import UpdateAppModal from "components/start/UpdateAppModal.svelte"
import { processStringSync } from "@budibase/string-templates"
import ConfirmDialog from "components/common/ConfirmDialog.svelte"
import analytics, { Events, EventSource } from "analytics"
@@ -26,7 +24,6 @@
isOnlyUser,
appStore,
deploymentStore,
- initialise,
sortedScreens,
} from "stores/builder"
import TourWrap from "components/portal/onboarding/TourWrap.svelte"
@@ -37,7 +34,6 @@
export let loaded
let unpublishModal
- let updateAppModal
let revertModal
let versionModal
let appActionPopover
@@ -61,11 +57,6 @@
$: canPublish = !publishing && loaded && $sortedScreens.length > 0
$: lastDeployed = getLastDeployedString($deploymentStore, lastOpened)
- const initialiseApp = async () => {
- const applicationPkg = await API.fetchAppPackage($appStore.devId)
- await initialise(applicationPkg)
- }
-
const getLastDeployedString = deployments => {
return deployments?.length
? processStringSync("Published {{ duration time 'millisecond' }} ago", {
@@ -247,16 +238,12 @@
appActionPopover.hide()
if (isPublished) {
viewApp()
- } else {
- updateAppModal.show()
}
}}
>
{$appStore.url}
{#if isPublished}
- {:else}
-
{/if}
+
+
+
+
+
+
+
+
+Implementa Budibase self-hosted nella tua infrastruttura esistente, utilizzando Docker, Kubernetes e Digital Ocean.
+Oppure utilizza Budibase Cloud se non hai bisogno di auto-ospitare e desideri iniziare rapidamente.
+
+### [Inizia con Budibase](https://budibase.com)
+
+
+
+ 
+ 
+ 
+ 
+