From 4bb9dad06e8c295cb3087801b47b09cafe890b7e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 28 Sep 2022 13:49:35 +0100 Subject: [PATCH 01/11] Add screen input to CloseScreenModal --- .../actions/CloseScreenModal.svelte | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte index 873c9ccf65..5f3b3ef639 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte @@ -1,16 +1,31 @@ +Navigate To screen, or leave blank. +
- This action doesn't require any additional settings. - - This action won't do anything if there isn't a screen modal open. - + + (parameters.url = value.detail)} + {bindings} + />
From 5e5b0955ddf0a7312e61cfedafe2112e4f0225c0 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 28 Sep 2022 13:50:23 +0100 Subject: [PATCH 02/11] Handle navigation on close modal --- packages/client/src/utils/buttonActions.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index a534ee8326..74c4504ca6 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -224,7 +224,27 @@ const changeFormStepHandler = async (action, context) => { ) } -const closeScreenModalHandler = () => { +const closeScreenModalHandler = action => { + let { url } = action.parameters + if (url) { + window.parent.addEventListener("message", event => { + const location = event.target.location + //remove any trailing slash + if (url.charAt(url.length - 1) === "/") { + url = url.substring(0, url.length - 1) + } + //need to reload if hash route has not changed + let shouldReload = + `#${url.substring(0, url.lastIndexOf("/"))}` === + location.hash?.substring(0, location.hash.lastIndexOf("/")) + + window.parent.location.href = `${location.origin}${location.pathname}#${url}` + if (shouldReload) { + window.parent.location.reload() + } + }) + } + // Emit this as a window event, so parent screens which are iframing us in // can close the modal window.parent.postMessage({ type: "close-screen-modal" }) From 380d9580afe4f33623c4ec8d671c86be34e408ea Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 29 Sep 2022 14:10:34 +0100 Subject: [PATCH 03/11] Navigate in PeekScreenDisplay --- .../overlay/PeekScreenDisplay.svelte | 3 +++ packages/client/src/utils/buttonActions.js | 21 +------------------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/packages/client/src/components/overlay/PeekScreenDisplay.svelte b/packages/client/src/components/overlay/PeekScreenDisplay.svelte index d6da9ca3f0..b9f4914624 100644 --- a/packages/client/src/components/overlay/PeekScreenDisplay.svelte +++ b/packages/client/src/components/overlay/PeekScreenDisplay.svelte @@ -45,6 +45,9 @@ }, [MessageTypes.CLOSE_SCREEN_MODAL]: () => { peekStore.actions.hidePeek() + if (message.data?.url) { + routeStore.actions.navigate(message.data.url) + } }, [MessageTypes.INVALIDATE_DATASOURCE]: () => { proxyInvalidation(message.data) diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index 74c4504ca6..e44ed2451c 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -226,28 +226,9 @@ const changeFormStepHandler = async (action, context) => { const closeScreenModalHandler = action => { let { url } = action.parameters - if (url) { - window.parent.addEventListener("message", event => { - const location = event.target.location - //remove any trailing slash - if (url.charAt(url.length - 1) === "/") { - url = url.substring(0, url.length - 1) - } - //need to reload if hash route has not changed - let shouldReload = - `#${url.substring(0, url.lastIndexOf("/"))}` === - location.hash?.substring(0, location.hash.lastIndexOf("/")) - - window.parent.location.href = `${location.origin}${location.pathname}#${url}` - if (shouldReload) { - window.parent.location.reload() - } - }) - } - // Emit this as a window event, so parent screens which are iframing us in // can close the modal - window.parent.postMessage({ type: "close-screen-modal" }) + window.parent.postMessage({ type: "close-screen-modal", url }) } const updateStateHandler = action => { From 36f122a0af45445b536986b4e148232d67b364ce Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 13 Oct 2022 11:26:25 +0100 Subject: [PATCH 04/11] Add additional timeout configuration to nginx.dev.conf.hbs --- hosting/nginx.dev.conf.hbs | 66 ++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/hosting/nginx.dev.conf.hbs b/hosting/nginx.dev.conf.hbs index 14c32b1bba..39a8dc52af 100644 --- a/hosting/nginx.dev.conf.hbs +++ b/hosting/nginx.dev.conf.hbs @@ -24,6 +24,21 @@ http { default "upgrade"; } + upstream app-service { + server {{address}}:4001; + keepalive 32; + } + + upstream worker-service { + server {{address}}:4002; + keepalive 32; + } + + upstream builder { + server {{address}}:3000; + keepalive 32; + } + server { listen 10000 default_server; server_name _; @@ -43,45 +58,78 @@ http { } location ~ ^/api/(system|admin|global)/ { - proxy_pass http://{{ address }}:4002; + proxy_pass http://worker-service; + proxy_read_timeout 120s; + proxy_connect_timeout 120s; + proxy_send_timeout 120s; + proxy_http_version 1.1; + proxy_set_header Connection ""; } location /api/ { proxy_read_timeout 120s; proxy_connect_timeout 120s; proxy_send_timeout 120s; - proxy_pass http://{{ address }}:4001; + proxy_pass http://app-service; + proxy_http_version 1.1; + proxy_set_header Connection ""; } location = / { - proxy_pass http://{{ address }}:4001; + proxy_pass http://app-service; + proxy_read_timeout 120s; + proxy_connect_timeout 120s; + proxy_send_timeout 120s; + proxy_http_version 1.1; + proxy_set_header Connection ""; } location /app_ { - proxy_pass http://{{ address }}:4001; + proxy_pass http://app-service; + proxy_read_timeout 120s; + proxy_connect_timeout 120s; + proxy_send_timeout 120s; + proxy_http_version 1.1; + proxy_set_header Connection ""; } location /app { - proxy_pass http://{{ address }}:4001; + proxy_pass http://app-service; + proxy_read_timeout 120s; + proxy_connect_timeout 120s; + proxy_send_timeout 120s; + proxy_http_version 1.1; + proxy_set_header Connection ""; } location /builder { - proxy_pass http://{{ address }}:3000; + proxy_pass http://builder; + proxy_read_timeout 120s; + proxy_connect_timeout 120s; + proxy_send_timeout 120s; + proxy_http_version 1.1; + proxy_set_header Connection ""; rewrite ^/builder(.*)$ /builder/$1 break; } location /builder/ { - proxy_pass http://{{ address }}:3000; + proxy_pass http://builder; proxy_http_version 1.1; proxy_set_header Connection $connection_upgrade; proxy_set_header Upgrade $http_upgrade; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_read_timeout 120s; + proxy_connect_timeout 120s; + proxy_send_timeout 120s; } location /vite/ { - proxy_pass http://{{ address }}:3000; + proxy_pass http://builder; + proxy_read_timeout 120s; + proxy_connect_timeout 120s; + proxy_send_timeout 120s; rewrite ^/vite(.*)$ /$1 break; } @@ -91,7 +139,7 @@ http { proxy_set_header Connection 'upgrade'; proxy_set_header Host $host; proxy_cache_bypass $http_upgrade; - proxy_pass http://{{ address }}:4001; + proxy_pass http://app-service; } location / { From e8b9b196d0a09ac519994b462e3d808b5b484d87 Mon Sep 17 00:00:00 2001 From: Gustav Weslien Date: Mon, 17 Oct 2022 20:56:30 +0200 Subject: [PATCH 05/11] Fix arangoDB connector : https://github.com/Budibase/budibase/issues/8294#issue-1412041907 --- packages/server/src/integrations/arangodb.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/server/src/integrations/arangodb.ts b/packages/server/src/integrations/arangodb.ts index 6df96501a4..e28940f36e 100644 --- a/packages/server/src/integrations/arangodb.ts +++ b/packages/server/src/integrations/arangodb.ts @@ -62,6 +62,8 @@ class ArangoDBIntegration implements IntegrationBase { constructor(config: ArangodbConfig) { const newConfig = { + url: config.url, + databaseName: config.databaseName, auth: { username: config.username, password: config.password, From ef6fadb9d4680e3325033f13bea68f8d64c6d2ee Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Mon, 17 Oct 2022 19:58:43 +0100 Subject: [PATCH 06/11] Clicking the Toggle Button of an Open Action Menu Does Not Close It --- packages/bbui/src/Actions/click_outside.js | 6 +++--- packages/bbui/src/Popover/Popover.svelte | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js index 49a15d36a3..7fd2879071 100644 --- a/packages/bbui/src/Actions/click_outside.js +++ b/packages/bbui/src/Actions/click_outside.js @@ -1,18 +1,18 @@ export default function clickOutside(element, callbackFunction) { function onClick(event) { if (!element.contains(event.target)) { - callbackFunction() + callbackFunction(event) } } - document.body.addEventListener("mousedown", onClick, true) + document.body.addEventListener("click", onClick, true) return { update(newCallbackFunction) { callbackFunction = newCallbackFunction }, destroy() { - document.body.removeEventListener("mousedown", onClick, true) + document.body.removeEventListener("click", onClick, true) }, } } diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index ded0ed6cfd..b81e76dc1f 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -33,6 +33,13 @@ open = false } + const handleOutsideClick = e => { + if (open) { + e.stopPropagation() + hide() + } + } + let open = null function handleEscape(e) { @@ -47,7 +54,7 @@