diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
similarity index 93%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
index a467a954a2..75702b7cdb 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewSelect.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte
@@ -19,6 +19,7 @@
let drawer
export let value = {}
+ export let otherSources
$: tables = $backendUiStore.tables.map(m => ({
label: m.name,
@@ -88,7 +89,7 @@
class="dropdownbutton"
bind:this={anchorRight}
on:click={dropdownRight.show}>
- {value?.label ? value.label : 'Choose option'}
+ {value?.label ?? 'Choose option'}
{#if value?.type === 'query'}
@@ -175,6 +176,22 @@
{/each}
+
+ {#if otherSources?.length}
+
+
+ Other
+
+
+ {#each otherSources as source}
+ - handleSelected(source)}>
+ {source.label}
+
+ {/each}
+
+ {/if}
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte
similarity index 100%
rename from packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte
rename to packages/builder/src/components/design/PropertiesPanel/PropertyControls/FieldSelect.svelte
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiFieldSelect.svelte
new file mode 100644
index 0000000000..a735cc5f18
--- /dev/null
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiFieldSelect.svelte
@@ -0,0 +1,5 @@
+
+
+
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiTableViewFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiTableViewFieldSelect.svelte
deleted file mode 100644
index 7d2f17a02b..0000000000
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/MultiTableViewFieldSelect.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SchemaSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SchemaSelect.svelte
new file mode 100644
index 0000000000..d1890f883f
--- /dev/null
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SchemaSelect.svelte
@@ -0,0 +1,7 @@
+
+
+
diff --git a/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
index c3577e3259..430e622c4f 100644
--- a/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/SettingsView.svelte
@@ -11,11 +11,12 @@
import LayoutSelect from "./PropertyControls/LayoutSelect.svelte"
import RoleSelect from "./PropertyControls/RoleSelect.svelte"
import OptionSelect from "./PropertyControls/OptionSelect.svelte"
- import MultiTableViewFieldSelect from "./PropertyControls/MultiTableViewFieldSelect.svelte"
import Checkbox from "./PropertyControls/Checkbox.svelte"
import TableSelect from "./PropertyControls/TableSelect.svelte"
- import TableViewSelect from "./PropertyControls/TableViewSelect.svelte"
- import TableViewFieldSelect from "./PropertyControls/TableViewFieldSelect.svelte"
+ import DatasourceSelect from "./PropertyControls/DatasourceSelect.svelte"
+ import FieldSelect from "./PropertyControls/FieldSelect.svelte"
+ import MultiFieldSelect from "./PropertyControls/MultiFieldSelect.svelte"
+ import SchemaSelect from "./PropertyControls/SchemaSelect.svelte"
import EventsEditor from "./PropertyControls/EventsEditor"
import ScreenSelect from "./PropertyControls/ScreenSelect.svelte"
import DetailScreenSelect from "./PropertyControls/DetailScreenSelect.svelte"
@@ -60,7 +61,7 @@
const controlMap = {
text: Input,
select: OptionSelect,
- datasource: TableViewSelect,
+ datasource: DatasourceSelect,
screen: ScreenSelect,
detailScreen: DetailScreenSelect,
boolean: Checkbox,
@@ -69,8 +70,9 @@
table: TableSelect,
color: ColorPicker,
icon: IconSelect,
- field: TableViewFieldSelect,
- multifield: MultiTableViewFieldSelect,
+ field: FieldSelect,
+ multifield: MultiFieldSelect,
+ schema: SchemaSelect,
"field/string": StringFieldSelect,
"field/number": NumberFieldSelect,
"field/options": OptionsFieldSelect,
diff --git a/packages/standard-components/manifest.json b/packages/standard-components/manifest.json
index 624fcd5829..a57acf0114 100644
--- a/packages/standard-components/manifest.json
+++ b/packages/standard-components/manifest.json
@@ -1045,12 +1045,11 @@
"styleable": true,
"hasChildren": true,
"dataProvider": true,
- "datasourceSetting": "datasource",
"actions": ["ValidateForm"],
"settings": [
{
- "type": "datasource",
- "label": "Data",
+ "type": "schema",
+ "label": "Schema",
"key": "datasource"
},
{