From bcdcc689189021ffc02ead9a61e04168017ebe04 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 26 Jan 2021 10:57:57 +0000 Subject: [PATCH 1/4] Fix settings to select fields and fix chart settings not showing fields --- packages/builder/src/builderStore/dataBinding.js | 2 +- .../PropertyControls/TableViewFieldSelect.svelte | 2 +- packages/standard-components/manifest.json | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 004c7170d3..022e78c637 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -46,7 +46,7 @@ export const getDatasourceForProvider = component => { // Extract datasource from component instance const datasourceSetting = def.settings.find(setting => { - return setting.key === def.datasourceSetting + return setting.type === "datasource" || setting.type === "table" }) if (!datasourceSetting) { return null diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte index 0e93c3e73a..32935d8d0a 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte @@ -12,7 +12,7 @@ export let multiselect = false $: datasource = getDatasourceForProvider(componentInstance) - $: schema = getSchemaForDatasource(datasource) + $: schema = getSchemaForDatasource(datasource).schema $: options = Object.keys(schema || {}) diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json index 901ea0df3c..65352761b9 100644 --- a/packages/standard-components/manifest.json +++ b/packages/standard-components/manifest.json @@ -106,7 +106,6 @@ "styleable": true, "hasChildren": true, "dataProvider": true, - "datasourceSetting": "datasource", "settings": [ { "type": "datasource", @@ -418,7 +417,6 @@ "styleable": true, "hasChildren": true, "dataProvider": true, - "datasourceSetting": "table", "settings": [ { "type": "table", @@ -434,7 +432,6 @@ "hasChildren": true, "styleable": true, "dataProvider": true, - "datasourceSetting": "table", "settings": [ { "type": "table", From b52a2efef01ab0e463673760cfa4b1395b3438f9 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 26 Jan 2021 11:07:30 +0000 Subject: [PATCH 2/4] MySQL integration and self hosted deploy event --- .../DatasourceNavigator/icons/MySQL.svelte | 83 +++++++++++++++++++ .../DatasourceNavigator/icons/index.js | 2 + .../start/BuilderSettingsModal.svelte | 5 +- .../builder/src/constants/backend/index.js | 5 ++ .../pages/[application]/deploy/index.svelte | 6 +- packages/server/package.json | 3 +- packages/server/src/integrations/index.js | 4 +- packages/server/src/integrations/mysql.js | 80 ++++++++++++++++++ packages/server/yarn.lock | 42 +++++++--- 9 files changed, 214 insertions(+), 16 deletions(-) create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/icons/MySQL.svelte create mode 100644 packages/server/src/integrations/mysql.js diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/MySQL.svelte b/packages/builder/src/components/backend/DatasourceNavigator/icons/MySQL.svelte new file mode 100644 index 0000000000..d2e612e7e3 --- /dev/null +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/MySQL.svelte @@ -0,0 +1,83 @@ + + + + + + + diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js index afedb9e78f..4f8d79dbf4 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js @@ -6,6 +6,7 @@ import CouchDB from "./CouchDB.svelte" import S3 from "./S3.svelte" import Airtable from "./Airtable.svelte" import SqlServer from "./SQLServer.svelte" +import MySQL from "./MySQL.svelte" export default { POSTGRES: Postgres, @@ -16,4 +17,5 @@ export default { SQL_SERVER: SqlServer, S3: S3, AIRTABLE: Airtable, + MYSQL: MySQL, } diff --git a/packages/builder/src/components/start/BuilderSettingsModal.svelte b/packages/builder/src/components/start/BuilderSettingsModal.svelte index 57cdef0c29..6be420b5f9 100644 --- a/packages/builder/src/components/start/BuilderSettingsModal.svelte +++ b/packages/builder/src/components/start/BuilderSettingsModal.svelte @@ -1,6 +1,7 @@