Lint with prettier

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 (
+const apiCall =
-  url,
+  method =>
-  body,
+  async (url, body, headers = { "Content-Type": "application/json" }) => {
-  headers = { "Content-Type": "application/json" }
+    headers["x-budibase-app-id"] = svelteGet(store).appId
-) => {
+    const json = headers["Content-Type"] === "application/json"
-  headers["x-budibase-app-id"] = svelteGet(store).appId
+    const resp = await fetch(url, {
-  const json = headers["Content-Type"] === "application/json"
+      method: method,
-  const resp = await fetch(url, {
+      body: json ? JSON.stringify(body) : body,
-    method: method,
+      headers,
-    body: json ? JSON.stringify(body) : body,
+    })
-    headers,
+    if (resp.status === 403) {
-  })
+      removeCookie(Cookies.Auth)
-  if (resp.status === 403) {
+    }
-    removeCookie(Cookies.Auth)
+    return resp
   }
-  return resp
-}
 
 export const post = apiCall("POST")
 export const get = apiCall("GET")

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(
+      const idx =
-        x => x.id === block.id
+        state.selectedAutomation.automation.definition.steps.findIndex(
-      )
+          x => x.id === block.id
+        )
       state.selectedAutomation.deleteBlock(block.id)
 
       // Select next closest step

packages/builder/src/components/common/bindings/BindingPanel.svelte

@@ -59,9 +59,7 @@
         <section>
           <Heading size="XS">Columns</Heading>
           <ul>
-            {#each context.filter(context =>
+            {#each context.filter( context => context.readableBinding.match(searchRgx) ) as { readableBinding }}
-              context.readableBinding.match(searchRgx)
-            ) as { readableBinding }}
               <li
                 on:click={() => {
                   value = addToText(value, getCaretPosition(), readableBinding)
@@ -77,9 +75,7 @@
         <section>
           <Heading size="XS">Components</Heading>
           <ul>
-            {#each instance.filter(instance =>
+            {#each instance.filter( instance => instance.readableBinding.match(searchRgx) ) as { readableBinding }}
-              instance.readableBinding.match(searchRgx)
-            ) as { readableBinding }}
               <li on:click={() => addToText(readableBinding)}>
                 {readableBinding}
               </li>

packages/builder/src/stores/backend/tests/fixtures/queries.js

@@ -9,8 +9,7 @@ export const SOME_QUERY = {
   queryVerb: "read",
   schema: {},
   name: "Speakers",
-  _id:
+  _id: "query_datasource_04b003a7b4a8428eadd3bb2f7eae0255_bcb8ffc6fcbc484e8d63121fc0bf986f",
-    "query_datasource_04b003a7b4a8428eadd3bb2f7eae0255_bcb8ffc6fcbc484e8d63121fc0bf986f",
   _rev: "2-941f8699eb0adf995f8bd59c99203b26",
   readable: true,
 }
@@ -75,8 +74,7 @@ export const SAVE_QUERY_RESPONSE = {
     },
   },
   name: "Speakers",
-  _id:
+  _id: "query_datasource_04b003a7b4a8428eadd3bb2f7eae0255_bcb8ffc6fcbc484e8d63121fc0bf986f",
-    "query_datasource_04b003a7b4a8428eadd3bb2f7eae0255_bcb8ffc6fcbc484e8d63121fc0bf986f",
   _rev: "3-5a64adef494b1e9c793dc91b51ce73c6",
   readable: true,
 }

packages/server/src/integrations/elasticsearch.js

@@ -2,8 +2,7 @@ const { Client } = require("@elastic/elasticsearch")
 const { QUERY_TYPES, FIELD_TYPES } = require("./Integration")
 
 const SCHEMA = {
-  docs:
+  docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
-    "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
   description:
     "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
   friendlyName: "ElasticSearch",

packages/server/src/middleware/authorized.js

@@ -14,50 +14,52 @@ const WEBHOOK_ENDPOINTS = new RegExp(
   ["webhooks/trigger", "webhooks/schema"].join("|")
 )
 
-module.exports = (permType, permLevel = null) => async (ctx, next) => {
+module.exports =
-  // webhooks don't need authentication, each webhook unique
+  (permType, permLevel = null) =>
-  if (WEBHOOK_ENDPOINTS.test(ctx.request.url)) {
+  async (ctx, next) => {
-    return next()
+    // webhooks don't need authentication, each webhook unique
-  }
+    if (WEBHOOK_ENDPOINTS.test(ctx.request.url)) {
+      return next()
+    }
 
-  if (!ctx.user) {
+    if (!ctx.user) {
-    return ctx.throw(403, "No user info found")
+      return ctx.throw(403, "No user info found")
-  }
+    }
 
-  // check general builder stuff, this middleware is a good way
+    // check general builder stuff, this middleware is a good way
-  // to find API endpoints which are builder focused
+    // to find API endpoints which are builder focused
-  await builderMiddleware(ctx, permType)
+    await builderMiddleware(ctx, permType)
-
-  const isAuthed = ctx.isAuthenticated
-  const { basePermissions, permissions } = await getUserPermissions(
-    ctx.appId,
-    ctx.roleId
-  )
-
-  // builders for now have permission to do anything
-  // TODO: in future should consider separating permissions with an require("@budibase/auth").isClient check
-  let isBuilder = ctx.user && ctx.user.builder && ctx.user.builder.global
-  const isBuilderApi = permType === PermissionTypes.BUILDER
-  if (isBuilder) {
-    return next()
-  } else if (isBuilderApi && !isBuilder) {
-    return ctx.throw(403, "Not Authorized")
-  }
 
-  if (
+    const isAuthed = ctx.isAuthenticated
-    hasResource(ctx) &&
+    const { basePermissions, permissions } = await getUserPermissions(
-    doesHaveResourcePermission(permissions, permLevel, ctx)
+      ctx.appId,
-  ) {
+      ctx.roleId
-    return next()
+    )
-  }
 
-  if (!isAuthed) {
+    // builders for now have permission to do anything
-    ctx.throw(403, "Session not authenticated")
+    // TODO: in future should consider separating permissions with an require("@budibase/auth").isClient check
-  }
+    let isBuilder = ctx.user && ctx.user.builder && ctx.user.builder.global
+    const isBuilderApi = permType === PermissionTypes.BUILDER
+    if (isBuilder) {
+      return next()
+    } else if (isBuilderApi && !isBuilder) {
+      return ctx.throw(403, "Not Authorized")
+    }
 
-  if (!doesHaveBasePermission(permType, permLevel, basePermissions)) {
+    if (
-    ctx.throw(403, "User does not have permission")
+      hasResource(ctx) &&
-  }
+      doesHaveResourcePermission(permissions, permLevel, ctx)
+    ) {
+      return next()
+    }
 
-  return next()
+    if (!isAuthed) {
-}
+      ctx.throw(403, "Session not authenticated")
+    }
+
+    if (!doesHaveBasePermission(permType, permLevel, basePermissions)) {
+      ctx.throw(403, "User does not have permission")
+    }
+
+    return next()
+  }

packages/server/src/middleware/currentapp.js

@@ -1,9 +1,5 @@
-const {
+const { getAppId, setCookie, getCookie, clearCookie } =
-  getAppId,
+  require("@budibase/auth").utils
-  setCookie,
-  getCookie,
-  clearCookie,
-} = require("@budibase/auth").utils
 const { Cookies } = require("@budibase/auth").constants
 const { getRole } = require("@budibase/auth/roles")
 const { getGlobalSelf } = require("../utilities/workerRequests")

packages/standard-components/src/forms/validation.js

@@ -90,15 +90,17 @@ const numericalConstraint = (constraint, error) => value => {
   return null
 }
 
-const inclusionConstraint = (options = []) => value => {
+const inclusionConstraint =
-  if (value == null || value === "") {
+  (options = []) =>
+  value => {
+    if (value == null || value === "") {
+      return null
+    }
+    if (!options.includes(value)) {
+      return "Invalid value"
+    }
     return null
   }
-  if (!options.includes(value)) {
-    return "Invalid value"
-  }
-  return null
-}
 
 const dateConstraint = (dateString, isEarliest) => {
   const dateLimit = Date.parse(dateString)

packages/worker/src/api/controllers/admin/email.js

@@ -5,15 +5,8 @@ const authPkg = require("@budibase/auth")
 const GLOBAL_DB = authPkg.StaticDatabases.GLOBAL.name
 
 exports.sendEmail = async ctx => {
-  const {
+  const { groupId, email, userId, purpose, contents, from, subject } =
-    groupId,
+    ctx.request.body
-    email,
-    userId,
-    purpose,
-    contents,
-    from,
-    subject,
-  } = ctx.request.body
   let user
   if (userId) {
     const db = new CouchDB(GLOBAL_DB)

packages/worker/src/api/controllers/admin/groups.js

@@ -1,9 +1,6 @@
 const CouchDB = require("../../../db")
-const {
+const { getGroupParams, generateGroupID, StaticDatabases } =
-  getGroupParams,
+  require("@budibase/auth").db
-  generateGroupID,
-  StaticDatabases,
-} = require("@budibase/auth").db
 
 const GLOBAL_DB = StaticDatabases.GLOBAL.name
 

packages/worker/src/api/controllers/admin/users.js

@@ -1,9 +1,6 @@
 const CouchDB = require("../../../db")
-const {
+const { generateGlobalUserID, getGlobalUserParams, StaticDatabases } =
-  generateGlobalUserID,
+  require("@budibase/auth").db
-  getGlobalUserParams,
-  StaticDatabases,
-} = require("@budibase/auth").db
 const { hash, getGlobalUserByEmail } = require("@budibase/auth").utils
 const { UserStatus, EmailTemplatePurpose } = require("../../../constants")
 const { checkInviteCode } = require("../../../utilities/redis")