Merge pull request #1014 from Budibase/fix/chart-field-settings

Fix settings to select fields and fix chart settings not showing fields

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",
@@ -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",