@budibase/server 2.4.42-alpha.3 → 2.4.42

package/src/api/controllers/static/index.ts

@@ -11,12 +11,10 @@ import {
 } from "../../../utilities/fileSystem"
 import env from "../../../environment"
 import { DocumentType } from "../../../db/utils"
-import { context, objectStore, utils, configs } from "@budibase/backend-core"
+import { context, objectStore, utils } from "@budibase/backend-core"
 import AWS from "aws-sdk"
 import fs from "fs"
 import sdk from "../../../sdk"
-import * as pro from "@budibase/pro"
-
 const send = require("koa-send")
 
 async function prepareUpload({ s3Key, bucket, metadata, file }: any) {
@@ -100,74 +98,33 @@ export const deleteObjects = async function (ctx: any) {
 }
 
 export const serveApp = async function (ctx: any) {
-  //Public Settings
-  const { config } = await configs.getSettingsConfigDoc()
-  const branding = await pro.branding.getBrandingConfig(config)
-
-  let db
-  try {
-    db = context.getAppDB({ skip_setup: true })
-    const appInfo = await db.get(DocumentType.APP_METADATA)
-    let appId = context.getAppId()
+  const db = context.getAppDB({ skip_setup: true })
+  const appInfo = await db.get(DocumentType.APP_METADATA)
+  let appId = context.getAppId()
 
-    if (!env.isJest()) {
-      const App = require("./templates/BudibaseApp.svelte").default
-      const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins)
-      const { head, html, css } = App.render({
-        metaImage:
-          branding?.metaImageUrl ||
-          "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
-        metaDescription: branding?.metaDescription || "",
-        metaTitle:
-          branding?.metaTitle || `${appInfo.name} - built with Budibase`,
-        title: appInfo.name,
-        production: env.isProd(),
-        appId,
-        clientLibPath: objectStore.clientLibraryUrl(appId!, appInfo.version),
-        usedPlugins: plugins,
-        favicon:
-          branding.faviconUrl !== ""
-            ? objectStore.getGlobalFileUrl("settings", "faviconUrl")
-            : "",
-        logo:
-          config?.logoUrl !== ""
-            ? objectStore.getGlobalFileUrl("settings", "logoUrl")
-            : "",
-      })
-      const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`)
-      ctx.body = await processString(appHbs, {
-        head,
-        body: html,
-        style: css.code,
-        appId,
-      })
-    } else {
-      // just return the app info for jest to assert on
-      ctx.body = appInfo
-    }
-  } catch (error) {
-    if (!env.isJest()) {
-      const App = require("./templates/BudibaseApp.svelte").default
-      const { head, html, css } = App.render({
-        title: branding?.metaTitle,
-        metaTitle: branding?.metaTitle,
-        metaImage:
-          branding?.metaImageUrl ||
-          "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
-        metaDescription: branding?.metaDescription || "",
-        favicon:
-          branding.faviconUrl !== ""
-            ? objectStore.getGlobalFileUrl("settings", "faviconUrl")
-            : "",
-      })
+  if (!env.isJest()) {
+    const App = require("./templates/BudibaseApp.svelte").default
+    const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins)
+    const { head, html, css } = App.render({
+      metaImage:
+        "https://res.cloudinary.com/daog6scxm/image/upload/v1666109324/meta-images/budibase-meta-image_uukc1m.png",
+      title: appInfo.name,
+      production: env.isProd(),
+      appId,
+      clientLibPath: objectStore.clientLibraryUrl(appId!, appInfo.version),
+      usedPlugins: plugins,
+    })
 
-      const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`)
-      ctx.body = await processString(appHbs, {
-        head,
-        body: html,
-        style: css.code,
-      })
-    }
+    const appHbs = loadHandlebarsFile(`${__dirname}/templates/app.hbs`)
+    ctx.body = await processString(appHbs, {
+      head,
+      body: html,
+      style: css.code,
+      appId,
+    })
+  } else {
+    // just return the app info for jest to assert on
+    ctx.body = appInfo
   }
 }
 

package/src/api/controllers/static/templates/BudibaseApp.svelte

@@ -1,10 +1,7 @@
 <script>
   export let title = ""
   export let favicon = ""
-
   export let metaImage = ""
-  export let metaTitle = ""
-  export let metaDescription = ""
 
   export let clientLibPath
   export let usedPlugins
@@ -16,33 +13,18 @@
     name="viewport"
     content="width=device-width, initial-scale=1.0, viewport-fit=cover"
   />
-
-  <!-- Primary Meta Tags -->
-  <meta name="title" content={metaTitle} />
-  <meta name="description" content={metaDescription} />
-
   <!-- Opengraph Meta Tags -->
+  <meta name="twitter:card" content="summary_large_image" />
+  <meta name="twitter:site" content="@budibase" />
+  <meta name="twitter:image" content={metaImage} />
+  <meta name="twitter:title" content="{title} - built with Budibase" />
   <meta property="og:site_name" content="Budibase" />
   <meta property="og:title" content="{title} - built with Budibase" />
-  <meta property="og:description" content={metaDescription} />
   <meta property="og:type" content="website" />
   <meta property="og:image" content={metaImage} />
 
-  <!-- Twitter -->
-  <meta property="twitter:card" content="summary_large_image" />
-  <meta property="twitter:site" content="@budibase" />
-  <meta property="twitter:image" content={metaImage} />
-  <meta property="twitter:image:alt" content="{title} - built with Budibase" />
-  <meta property="twitter:title" content="{title} - built with Budibase" />
-  <meta property="twitter:description" content={metaDescription} />
-
   <title>{title}</title>
-  {#if favicon !== ""}
-    <link rel="icon" type="image/png" href={favicon} />
-  {:else}
-    <link rel="icon" type="image/png" href="https://i.imgur.com/Xhdt1YP.png" />
-  {/if}
-
+  <link rel="icon" type="image/png" href={favicon} />
   <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
   <link rel="preconnect" href="https://fonts.gstatic.com" />
   <link
@@ -101,16 +83,11 @@
 
 <body id="app">
   <div id="error">
-    {#if clientLibPath}
-      <h1>There was an error loading your app</h1>
-      <h2>
-        The Budibase client library could not be loaded. Try republishing your
-        app.
-      </h2>
-    {:else}
-      <h2>We couldn't find that application</h2>
-      <p />
-    {/if}
+    <h1>There was an error loading your app</h1>
+    <h2>
+      The Budibase client library could not be loaded. Try republishing your
+      app.
+    </h2>
   </div>
   <script type="application/javascript">
     window.INIT_TIME = Date.now()

package/src/api/controllers/table/utils.ts

@@ -109,6 +109,7 @@ export function importToRows(data: any, table: any, user: any = {}) {
       noAutoRelationships: true,
     })
     row = processed.row
+    table = processed.table
 
     let fieldName: any
     let schema: any

package/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap

@@ -1,48 +1,48 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`viewBuilder Calculate and filter creates a view with the calculation statistics and filter schema 1`] = `
-{
+Object {
   "map": "function (doc) {
-      if ((doc.tableId === "14f1c4e94d6a47b682ce89d35d4c78b0" && !(
-      doc["myField"] === undefined ||
-      doc["myField"] === null ||
-      doc["myField"] === "" ||
-      (Array.isArray(doc["myField"]) && doc["myField"].length === 0)
-  )) && (doc["age"] > 17)) {
-        emit(doc["_id"], doc["myField"]);
+      if ((doc.tableId === \\"14f1c4e94d6a47b682ce89d35d4c78b0\\" && !(
+      doc[\\"myField\\"] === undefined ||
+      doc[\\"myField\\"] === null ||
+      doc[\\"myField\\"] === \\"\\" ||
+      (Array.isArray(doc[\\"myField\\"]) && doc[\\"myField\\"].length === 0)
+  )) && (doc[\\"age\\"] > 17)) {
+        emit(doc[\\"_id\\"], doc[\\"myField\\"]);
       }
     }",
-  "meta": {
+  "meta": Object {
     "calculation": "stats",
     "field": "myField",
-    "filters": [
-      {
+    "filters": Array [
+      Object {
         "condition": "MT",
         "key": "age",
         "value": 17,
       },
     ],
     "groupBy": undefined,
-    "schema": {
-      "avg": {
+    "schema": Object {
+      "avg": Object {
         "type": "number",
       },
-      "count": {
+      "count": Object {
         "type": "number",
       },
-      "field": {
+      "field": Object {
         "type": "string",
       },
-      "max": {
+      "max": Object {
         "type": "number",
       },
-      "min": {
+      "min": Object {
         "type": "number",
       },
-      "sum": {
+      "sum": Object {
         "type": "number",
       },
-      "sumsqr": {
+      "sumsqr": Object {
         "type": "number",
       },
     },
@@ -53,42 +53,42 @@ exports[`viewBuilder Calculate and filter creates a view with the calculation st
 `;
 
 exports[`viewBuilder Calculate creates a view with the calculation statistics schema 1`] = `
-{
+Object {
   "map": "function (doc) {
-      if ((doc.tableId === "14f1c4e94d6a47b682ce89d35d4c78b0" && !(
-      doc["myField"] === undefined ||
-      doc["myField"] === null ||
-      doc["myField"] === "" ||
-      (Array.isArray(doc["myField"]) && doc["myField"].length === 0)
+      if ((doc.tableId === \\"14f1c4e94d6a47b682ce89d35d4c78b0\\" && !(
+      doc[\\"myField\\"] === undefined ||
+      doc[\\"myField\\"] === null ||
+      doc[\\"myField\\"] === \\"\\" ||
+      (Array.isArray(doc[\\"myField\\"]) && doc[\\"myField\\"].length === 0)
   )) ) {
-        emit(doc["_id"], doc["myField"]);
+        emit(doc[\\"_id\\"], doc[\\"myField\\"]);
       }
     }",
-  "meta": {
+  "meta": Object {
     "calculation": "stats",
     "field": "myField",
-    "filters": [],
+    "filters": Array [],
     "groupBy": undefined,
-    "schema": {
-      "avg": {
+    "schema": Object {
+      "avg": Object {
         "type": "number",
       },
-      "count": {
+      "count": Object {
         "type": "number",
       },
-      "field": {
+      "field": Object {
         "type": "string",
       },
-      "max": {
+      "max": Object {
         "type": "number",
       },
-      "min": {
+      "min": Object {
         "type": "number",
       },
-      "sum": {
+      "sum": Object {
         "type": "number",
       },
-      "sumsqr": {
+      "sumsqr": Object {
         "type": "number",
       },
     },
@@ -99,22 +99,22 @@ exports[`viewBuilder Calculate creates a view with the calculation statistics sc
 `;
 
 exports[`viewBuilder Filter creates a view with multiple filters and conjunctions 1`] = `
-{
+Object {
   "map": "function (doc) {
-      if (doc.tableId === "14f1c4e94d6a47b682ce89d35d4c78b0" && (doc["Name"] === "Test" || doc["Yes"] > "Value")) {
-        emit(doc["_id"], doc["undefined"]);
+      if (doc.tableId === \\"14f1c4e94d6a47b682ce89d35d4c78b0\\" && (doc[\\"Name\\"] === \\"Test\\" || doc[\\"Yes\\"] > \\"Value\\")) {
+        emit(doc[\\"_id\\"], doc[\\"undefined\\"]);
       }
     }",
-  "meta": {
+  "meta": Object {
     "calculation": undefined,
     "field": undefined,
-    "filters": [
-      {
+    "filters": Array [
+      Object {
         "condition": "EQUALS",
         "key": "Name",
         "value": "Test",
       },
-      {
+      Object {
         "condition": "MT",
         "conjunction": "OR",
         "key": "Yes",
@@ -129,16 +129,16 @@ exports[`viewBuilder Filter creates a view with multiple filters and conjunction
 `;
 
 exports[`viewBuilder Group By creates a view emitting the group by field 1`] = `
-{
+Object {
   "map": "function (doc) {
-      if (doc.tableId === "14f1c4e94d6a47b682ce89d35d4c78b0" ) {
-        emit(doc["age"], doc["score"]);
+      if (doc.tableId === \\"14f1c4e94d6a47b682ce89d35d4c78b0\\" ) {
+        emit(doc[\\"age\\"], doc[\\"score\\"]);
       }
     }",
-  "meta": {
+  "meta": Object {
     "calculation": undefined,
     "field": "score",
-    "filters": [],
+    "filters": Array [],
     "groupBy": "age",
     "schema": null,
     "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",

package/src/api/routes/public/index.ts

@@ -1,5 +1,4 @@
 import appEndpoints from "./applications"
-import metricEndpoints from "./metrics"
 import queryEndpoints from "./queries"
 import tableEndpoints from "./tables"
 import rowEndpoints from "./rows"
@@ -13,7 +12,7 @@ import env from "../../../environment"
 // below imports don't have declaration files
 const Router = require("@koa/router")
 const { RateLimit, Stores } = require("koa2-ratelimit")
-import { middleware, redis, permissions } from "@budibase/backend-core"
+import { redis, permissions } from "@budibase/backend-core"
 const { PermissionType, PermissionLevel } = permissions
 
 const PREFIX = "/api/public/v1"
@@ -92,13 +91,6 @@ function addToRouter(endpoints: any) {
   }
 }
 
-function applyAdminRoutes(endpoints: any) {
-  addMiddleware(endpoints.read, middleware.builderOrAdmin)
-  addMiddleware(endpoints.write, middleware.builderOrAdmin)
-  addToRouter(endpoints.read)
-  addToRouter(endpoints.write)
-}
-
 function applyRoutes(
   endpoints: any,
   permType: string,
@@ -127,7 +119,6 @@ function applyRoutes(
   addToRouter(endpoints.write)
 }
 
-applyAdminRoutes(metricEndpoints)
 applyRoutes(appEndpoints, PermissionType.APP, "appId")
 applyRoutes(tableEndpoints, PermissionType.TABLE, "tableId")
 applyRoutes(userEndpoints, PermissionType.USER, "userId")

package/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap

@@ -1,21 +1,21 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`/datasources fetch returns all the datasources from the server 1`] = `
-[
-  {
-    "config": {},
-    "entities": [
-      {
+Array [
+  Object {
+    "config": Object {},
+    "entities": Array [
+      Object {
         "_id": "ta_users",
         "_rev": "1-2375e1bc58aeec664dc1b1f04ad43e44",
         "createdAt": "2020-01-01T00:00:00.000Z",
         "name": "Users",
         "primaryDisplay": "email",
-        "schema": {
-          "email": {
-            "constraints": {
+        "schema": Object {
+          "email": Object {
+            "constraints": Object {
               "email": true,
-              "length": {
+              "length": Object {
                 "maximum": "",
               },
               "presence": true,
@@ -25,8 +25,8 @@ exports[`/datasources fetch returns all the datasources from the server 1`] = `
             "name": "email",
             "type": "string",
           },
-          "firstName": {
-            "constraints": {
+          "firstName": Object {
+            "constraints": Object {
               "presence": false,
               "type": "string",
             },
@@ -34,8 +34,8 @@ exports[`/datasources fetch returns all the datasources from the server 1`] = `
             "name": "firstName",
             "type": "string",
           },
-          "lastName": {
-            "constraints": {
+          "lastName": Object {
+            "constraints": Object {
               "presence": false,
               "type": "string",
             },
@@ -43,9 +43,9 @@ exports[`/datasources fetch returns all the datasources from the server 1`] = `
             "name": "lastName",
             "type": "string",
           },
-          "roleId": {
-            "constraints": {
-              "inclusion": [
+          "roleId": Object {
+            "constraints": Object {
+              "inclusion": Array [
                 "ADMIN",
                 "POWER",
                 "BASIC",
@@ -58,9 +58,9 @@ exports[`/datasources fetch returns all the datasources from the server 1`] = `
             "name": "roleId",
             "type": "options",
           },
-          "status": {
-            "constraints": {
-              "inclusion": [
+          "status": Object {
+            "constraints": Object {
+              "inclusion": Array [
                 "active",
                 "inactive",
               ],
@@ -74,15 +74,15 @@ exports[`/datasources fetch returns all the datasources from the server 1`] = `
         },
         "type": "table",
         "updatedAt": "2020-01-01T00:00:00.000Z",
-        "views": {},
+        "views": Object {},
       },
     ],
     "name": "Budibase DB",
     "source": "BUDIBASE",
     "type": "budibase",
   },
-  {
-    "config": {},
+  Object {
+    "config": Object {},
     "createdAt": "2020-01-01T00:00:00.000Z",
     "name": "Test",
     "source": "POSTGRES",

package/src/api/routes/tests/__snapshots__/view.spec.js.snap

@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`/views query returns data for the created view 1`] = `
-[
-  {
+Array [
+  Object {
     "avg": 2333.3333333333335,
     "count": 3,
     "group": null,
@@ -15,8 +15,8 @@ exports[`/views query returns data for the created view 1`] = `
 `;
 
 exports[`/views query returns data for the created view using a group by 1`] = `
-[
-  {
+Array [
+  Object {
     "avg": 1500,
     "count": 2,
     "group": "One",
@@ -25,7 +25,7 @@ exports[`/views query returns data for the created view using a group by 1`] = `
     "sum": 3000,
     "sumsqr": 5000000,
   },
-  {
+  Object {
     "avg": 4000,
     "count": 1,
     "group": "Two",

package/src/api/routes/tests/internalSearch.spec.js

@@ -1,7 +1,6 @@
-const fetch = require("node-fetch")
-fetch.mockSearch()
 const search = require("../../controllers/row/internalSearch")
 // this will be mocked out for _search endpoint
+const fetch = require("node-fetch")
 const PARAMS = {
   tableId: "ta_12345679abcdef",
   version: "1",
@@ -21,7 +20,7 @@ function checkLucene(resp, expected, params = PARAMS) {
     expect(json.bookmark).toBe(PARAMS.bookmark)
   }
   expect(json.include_docs).toBe(true)
-  expect(json.q).toBe(`${expected} AND tableId:"${params.tableId}"`)
+  expect(json.q).toBe(`(${expected}) AND tableId:"${params.tableId}"`)
   expect(json.limit).toBe(params.limit || 50)
 }
 
@@ -60,7 +59,7 @@ describe("internal search", () => {
         "column": "1",
       }
     }, PARAMS)
-    checkLucene(response, `(column:"2" OR !column:"1")`)
+    checkLucene(response, `column:"2" OR !column:"1"`)
   })
 
   it("test AND query", async () => {
@@ -72,7 +71,7 @@ describe("internal search", () => {
         "column": "1",
       }
     }, PARAMS)
-    checkLucene(response, `(*:* AND column:"2" AND !column:"1")`)
+    checkLucene(response, `*:* AND column:"2" AND !column:"1"`)
   })
 
   it("test pagination query", async () => {
@@ -133,7 +132,7 @@ describe("internal search", () => {
         "colArr": [1, 2, 3],
       },
     }, PARAMS)
-    checkLucene(response, `(*:* AND column:a AND colArr:(1 AND 2 AND 3))`, PARAMS)
+    checkLucene(response, `*:* AND column:a AND colArr:(1 AND 2 AND 3)`, PARAMS)
   })
 
   it("test multiple of same column", async () => {
@@ -145,7 +144,7 @@ describe("internal search", () => {
         "3:column": "c",
       },
     }, PARAMS)
-    checkLucene(response, `(column:"a" OR column:"b" OR column:"c")`, PARAMS)
+    checkLucene(response, `column:"a" OR column:"b" OR column:"c"`, PARAMS)
   })
 
   it("check a weird case for lucene building", async () => {
@@ -192,6 +191,6 @@ describe("internal search", () => {
       expect(json.bookmark).toBe(PARAMS.bookmark)
     }
     expect(json.include_docs).toBe(true)
-    expect(json.q).toBe(`*:* AND column:"1" AND tableId:${PARAMS.tableId}`)
+    expect(json.q).toBe(`(*:* AND column:"1") AND tableId:${PARAMS.tableId}`)
   })
 })

package/src/app.ts

@@ -27,7 +27,7 @@ import * as api from "./api"
 import * as automations from "./automations"
 import { Thread } from "./threads"
 import * as redis from "./utilities/redis"
-import { events, logging, middleware, timers } from "@budibase/backend-core"
+import { events, logging, middleware } from "@budibase/backend-core"
 import { initialise as initialiseWebsockets } from "./websocket"
 import { startup } from "./startup"
 const Sentry = require("@sentry/node")
@@ -84,7 +84,6 @@ server.on("close", async () => {
   }
   shuttingDown = true
   console.log("Server Closed")
-  timers.cleanup()
   await automations.shutdown()
   await redis.shutdown()
   events.shutdown()

package/src/automations/automationUtils.ts

@@ -23,7 +23,7 @@ import { LoopStep, LoopStepType, LoopInput } from "../definitions/automations"
  * @returns {object} The inputs object which has had all the various types supported by this function converted to their
  * primitive types.
  */
-export function cleanInputValues(inputs: Record<string, any>, schema?: any) {
+export function cleanInputValues(inputs: Record<string, any>, schema: any) {
   if (schema == null) {
     return inputs
   }