From 06839700a284950b86d0556a7e18bd9d92fa9597 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 24 Feb 2021 15:34:31 +0000 Subject: [PATCH 1/5] Fixing some CSS bugs in the automation bindings popover. --- .../automation/SetupPanel/GenericBindingPopover.svelte | 10 +++++++++- .../builder/src/components/common/BindableInput.svelte | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte index e6818518ad..06013cfea2 100644 --- a/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte +++ b/packages/builder/src/components/automation/SetupPanel/GenericBindingPopover.svelte @@ -143,10 +143,18 @@ margin-top: 0; } .bindings__wrapper { - overflow-y: auto; + overflow-y: scroll; + overflow-x: hidden; position: relative; flex: 1 1 auto; + -ms-overflow-style: none; } + + .bindings__wrapper::-webkit-scrollbar { + width: 0; + height: 0; + } + .bindings__list { position: absolute; width: 100%; diff --git a/packages/builder/src/components/common/BindableInput.svelte b/packages/builder/src/components/common/BindableInput.svelte index 6234e3e046..a8df019869 100644 --- a/packages/builder/src/components/common/BindableInput.svelte +++ b/packages/builder/src/components/common/BindableInput.svelte @@ -24,7 +24,7 @@
- +
Date: Wed, 24 Feb 2021 15:34:52 +0000 Subject: [PATCH 2/5] Formatting. --- .../PropertyControls/DatasourceSelect.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte index bf0c30b184..0a62d34075 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/DatasourceSelect.svelte @@ -37,8 +37,10 @@ return [...acc, ...viewsArr] }, []) $: queries = $backendUiStore.queries - .filter(query => showAllQueries || (query.queryVerb === "read" || query.readable)) - .map(query => ({ + .filter( + query => showAllQueries || query.queryVerb === "read" || query.readable + ) + .map(query => ({ label: query.name, name: query.name, tableId: query._id, From 0905d35ef23b4d157923e3bc1891697362f5ca80 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 24 Feb 2021 16:31:47 +0000 Subject: [PATCH 3/5] SSL config for mysql, remove rickroll --- .../IntegrationConfigForm.svelte | 6 ++- .../integration/KeyValueBuilder.svelte | 3 +- packages/server/src/constants/layouts.js | 6 +-- packages/server/src/constants/screens.js | 49 ------------------- packages/server/src/integrations/mysql.js | 9 +++- 5 files changed, 16 insertions(+), 57 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 2db5490678..c084e8413e 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -10,10 +10,12 @@
{#each Object.keys(schema) as configKey} - {#if typeof schema[configKey].type === 'object'} + {#if schema[configKey].type === 'object'} - + {:else}
diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte index c8ee3a9897..b104f5676d 100644 --- a/packages/builder/src/components/integration/KeyValueBuilder.svelte +++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte @@ -1,7 +1,8 @@