diff --git a/packages/account-portal b/packages/account-portal index c167c331ff9..66c72d3c850 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit c167c331ff9b8161fc18e2ecbaaf1ea5815ba964 +Subproject commit 66c72d3c8506b061f6dd0ef6e141ed07d51a097a diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/Azure.svelte b/packages/builder/src/components/backend/DatasourceNavigator/icons/Azure.svelte new file mode 100644 index 00000000000..27931e011d9 --- /dev/null +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/Azure.svelte @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js index 88359c27829..2413aec9d52 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js @@ -15,6 +15,7 @@ import GoogleSheets from "./GoogleSheets.svelte" import Firebase from "./Firebase.svelte" import Redis from "./Redis.svelte" import Snowflake from "./Snowflake.svelte" +import Azure from "./Azure.svelte" import Custom from "./Custom.svelte" import { integrations } from "stores/builder" import { get } from "svelte/store" @@ -28,6 +29,7 @@ const ICONS = { COUCHDB: CouchDB, SQL_SERVER: SqlServer, S3: S3, + AZURE: Azure, AIRTABLE: Airtable, MYSQL: MySQL, ARANGODB: ArangoDB, diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js index 2a5483d77c0..9dfe4e2563a 100644 --- a/packages/builder/src/components/design/settings/componentSettings.js +++ b/packages/builder/src/components/design/settings/componentSettings.js @@ -2,7 +2,7 @@ import { Checkbox, Select, RadioGroup, Stepper, Input } from "@budibase/bbui" import { licensing } from "stores/portal" import { get } from "svelte/store" import DataSourceSelect from "./controls/DataSourceSelect/DataSourceSelect.svelte" -import S3DataSourceSelect from "./controls/S3DataSourceSelect.svelte" +import ObjectStoreSelect from "./controls/ObjectStoreSelect.svelte" import DataProviderSelect from "./controls/DataProviderSelect.svelte" import ButtonActionEditor from "./controls/ButtonActionEditor/ButtonActionEditor.svelte" import TableSelect from "./controls/TableSelect.svelte" @@ -37,7 +37,7 @@ const componentMap = { select: Select, radio: RadioGroup, dataSource: DataSourceSelect, - "dataSource/s3": S3DataSourceSelect, + "dataSource/objectStore": ObjectStoreSelect, dataProvider: DataProviderSelect, boolean: Checkbox, number: Stepper, @@ -70,6 +70,7 @@ const componentMap = { "field/longform": FormFieldSelect, "field/datetime": FormFieldSelect, "field/attachment": FormFieldSelect, + "field/upload": Input, "field/attachment_single": FormFieldSelect, "field/s3": Input, "field/link": FormFieldSelect, diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FileUpload.svelte similarity index 88% rename from packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FileUpload.svelte index 11bd58a860c..5844c1b1d0c 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FileUpload.svelte @@ -6,12 +6,12 @@ export let parameters $: components = findAllMatchingComponents($selectedScreen?.props, component => - component._component.endsWith("s3upload") + component._component.endsWith("fileupload") )
- +