From 0687d7c235e510a841b91f531df666504547d41a Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Wed, 10 Aug 2022 16:27:53 +0100 Subject: [PATCH 1/2] fixing wrong filter, excluding just bb_internal --- .../controls/ButtonActionEditor/actions/ExecuteQuery.svelte | 6 ++---- packages/builder/src/constants/backend/index.js | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte index 042a55d761..e19a975ef9 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte @@ -3,7 +3,7 @@ import { datasources, integrations, queries } from "stores/backend" import BindingBuilder from "components/integration/QueryBindingBuilder.svelte" import IntegrationQueryEditor from "components/integration/index.svelte" - import { IntegrationTypes } from "constants/backend" + import { BUDIBASE_DATASOURCE_ID } from "constants/backend" export let parameters export let bindings = [] @@ -14,9 +14,7 @@ ) // Executequery action just works on PostgreSQL and MongoDB datasources $: executeQueryDatasources = $datasources.list.filter( - x => - x.source === IntegrationTypes.POSTGRES || - x.source === IntegrationTypes.MONGODB + x => x._id !== BUDIBASE_DATASOURCE_ID ) function fetchQueryDefinition(query) { diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js index d8d09d592f..28ce35d9f7 100644 --- a/packages/builder/src/constants/backend/index.js +++ b/packages/builder/src/constants/backend/index.js @@ -163,6 +163,8 @@ export const SWITCHABLE_TYPES = [ ...ALLOWABLE_NUMBER_TYPES, ] +export const BUDIBASE_DATASOURCE_ID = "bb_internal" + export const IntegrationTypes = { POSTGRES: "POSTGRES", MONGODB: "MONGODB", From 60e61f1107ec6a851dd24bb3207d4630990b8ca8 Mon Sep 17 00:00:00 2001 From: NEOLPAR Date: Wed, 10 Aug 2022 16:30:26 +0100 Subject: [PATCH 2/2] wrong comment --- .../controls/ButtonActionEditor/actions/ExecuteQuery.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte index e19a975ef9..6b9efa76d3 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte @@ -12,7 +12,7 @@ $: datasource = $datasources.list.find( ds => ds._id === parameters.datasourceId ) - // Executequery action just works on PostgreSQL and MongoDB datasources + // Executequery must exclude budibase datasource $: executeQueryDatasources = $datasources.list.filter( x => x._id !== BUDIBASE_DATASOURCE_ID )