From 615b207fbb831f1986d1bb6001a3ed174f2aa9c5 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 16 Jun 2021 18:39:59 +0100 Subject: [PATCH] Formatting. --- packages/builder/src/builderStore/api.js | 30 +++--- .../builderStore/store/automation/index.js | 7 +- .../common/bindings/BindingPanel.svelte | 8 +- .../common/bindings/ServerBindingPanel.svelte | 4 +- .../PropertyControls/DataSourceSelect.svelte | 5 +- .../EventsEditor/actions/ExecuteQuery.svelte | 5 +- .../stores/backend/tests/fixtures/queries.js | 6 +- .../src/api/controllers/row/external.js | 2 +- .../server/src/automations/automationUtils.js | 5 +- .../server/src/integrations/elasticsearch.js | 3 +- packages/server/src/middleware/authorized.js | 92 ++++++++++--------- packages/server/src/middleware/currentapp.js | 8 +- .../standard-components/src/Button.svelte | 2 +- .../src/forms/validation.js | 16 ++-- .../worker/src/api/controllers/admin/email.js | 11 +-- .../src/api/controllers/admin/groups.js | 7 +- .../worker/src/api/controllers/admin/users.js | 7 +- 17 files changed, 100 insertions(+), 118 deletions(-) diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js index 2e683238bc..ae81df10f6 100644 --- a/packages/builder/src/builderStore/api.js +++ b/packages/builder/src/builderStore/api.js @@ -2,23 +2,21 @@ import { store } from "./index" import { get as svelteGet } from "svelte/store" import { removeCookie, Cookies } from "./cookies" -const apiCall = method => async ( - url, - body, - headers = { "Content-Type": "application/json" } -) => { - headers["x-budibase-app-id"] = svelteGet(store).appId - const json = headers["Content-Type"] === "application/json" - const resp = await fetch(url, { - method: method, - body: json ? JSON.stringify(body) : body, - headers, - }) - if (resp.status === 403) { - removeCookie(Cookies.Auth) +const apiCall = + method => + async (url, body, headers = { "Content-Type": "application/json" }) => { + headers["x-budibase-app-id"] = svelteGet(store).appId + const json = headers["Content-Type"] === "application/json" + const resp = await fetch(url, { + method: method, + body: json ? JSON.stringify(body) : body, + headers, + }) + if (resp.status === 403) { + removeCookie(Cookies.Auth) + } + return resp } - return resp -} export const post = apiCall("POST") export const get = apiCall("GET") diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/builderStore/store/automation/index.js index 7a01bccfab..c372f27bb7 100644 --- a/packages/builder/src/builderStore/store/automation/index.js +++ b/packages/builder/src/builderStore/store/automation/index.js @@ -100,9 +100,10 @@ const automationActions = store => ({ }, deleteAutomationBlock: block => { store.update(state => { - const idx = state.selectedAutomation.automation.definition.steps.findIndex( - x => x.id === block.id - ) + const idx = + state.selectedAutomation.automation.definition.steps.findIndex( + x => x.id === block.id + ) state.selectedAutomation.deleteBlock(block.id) // Select next closest step diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 37e7f520f3..01e0c5918b 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -59,9 +59,7 @@
Columns