Merge branch 'master' of github.com:Budibase/budibase into form-builder

README.md

@@ -103,13 +103,9 @@ The Budibase builder runs in Electron, on Mac, PC and Linux. Follow the steps be
 
 ## 🤖 Self-hosting
 
-<p align="center">
-  <img src="https://i.imgur.com/Z52cEvT.png?1" />
-</p>
-
 Budibase wants to make sure anyone can use the tools we develop and we know a lot of people need to be able to host the apps they make on their own systems - that is why we've decided to try and make self hosting as easy as possible!
 
-Currently, you can host your apps using Docker. The documentation for self-hosting can be found [here](https://docs.budibase.com/self-hosting/introduction-to-self-hosting).
+Currently, you can host your apps using Docker or Digital Ocean. The documentation for self-hosting can be found [here](https://docs.budibase.com/self-hosting/introduction-to-self-hosting).
 
 
 ## 🎓 Learning Budibase

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

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 || {})
 </script>
 

packages/standard-components/manifest.json

@@ -106,7 +106,6 @@
     "styleable": true,
     "hasChildren": true,
     "dataProvider": true,
-    "datasourceSetting": "datasource",
     "settings": [
       {
         "type": "datasource",
@@ -439,7 +438,6 @@
     "styleable": true,
     "hasChildren": true,
     "dataProvider": true,
-    "datasourceSetting": "table",
     "settings": [
       {
         "type": "table",
@@ -455,7 +453,6 @@
     "hasChildren": true,
     "styleable": true,
     "dataProvider": true,
-    "datasourceSetting": "table",
     "settings": [
       {
         "type": "table",