@budibase/server 1.2.58-alpha.6 → 1.2.58

package/dist/utilities/fileSystem/index.js

@@ -14,7 +14,7 @@ const { join } = require("path");
 const uuid = require("uuid/v4");
 const { doWithDB, dangerousGetDB, closeDB, } = require("@budibase/backend-core/db");
 const { ObjectStoreBuckets } = require("../../constants");
-const { upload, retrieve, retrieveToTmp, streamUpload, deleteFolder, downloadTarball, deleteFiles, } = require("./utilities");
+const { upload, retrieve, retrieveToTmp, streamUpload, deleteFolder, downloadTarball, } = require("./utilities");
 const { updateClientLibrary } = require("./clientLibrary");
 const env = require("../../environment");
 const { USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX, TABLE_ROW_PREFIX, } = require("../../db/utils");
@@ -291,6 +291,5 @@ exports.cleanup = appIds => {
 exports.upload = upload;
 exports.retrieve = retrieve;
 exports.retrieveToTmp = retrieveToTmp;
-exports.deleteFiles = deleteFiles;
 exports.TOP_LEVEL_PATH = TOP_LEVEL_PATH;
 exports.NODE_MODULES_PATH = NODE_MODULES_PATH;

package/dist/utilities/redis.js

@@ -30,7 +30,6 @@ exports.shutdown = () => __awaiter(void 0, void 0, void 0, function* () {
         yield debounceClient.finish();
     if (flagClient)
         yield flagClient.finish();
-    console.log("Redis shutdown");
 });
 exports.doesUserHaveLock = (devAppId, user) => __awaiter(void 0, void 0, void 0, function* () {
     const value = yield devAppClient.get(devAppId);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.58-alpha.6",
+  "version": "1.2.58",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.58-alpha.6",
-    "@budibase/client": "1.2.58-alpha.6",
-    "@budibase/pro": "1.2.58-alpha.5",
-    "@budibase/string-templates": "1.2.58-alpha.6",
-    "@budibase/types": "1.2.58-alpha.6",
+    "@budibase/backend-core": "^1.2.58",
+    "@budibase/client": "^1.2.58",
+    "@budibase/pro": "1.2.57",
+    "@budibase/string-templates": "^1.2.58",
+    "@budibase/types": "^1.2.58",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -107,7 +107,7 @@
     "google-auth-library": "7.12.0",
     "google-spreadsheet": "3.2.0",
     "jimp": "0.16.1",
-    "joi": "17.6.0",
+    "joi": "17.2.1",
     "js-yaml": "4.1.0",
     "jsonschema": "1.4.0",
     "knex": "0.95.15",
@@ -196,5 +196,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "6225d7d6a9d66f5675411db8292acadb3d78446f"
+  "gitHead": "2922b47620173f41097d36b9dc5b1c0f8f7b063a"
 }

package/src/api/controllers/application.ts

@@ -47,14 +47,7 @@ import { checkAppMetadata } from "../../automations/logging"
 import { getUniqueRows } from "../../utilities/usageQuota/rows"
 import { quotas } from "@budibase/pro"
 import { errors, events, migrations } from "@budibase/backend-core"
-import {
-  App,
-  Layout,
-  Screen,
-  MigrationType,
-  AppNavigation,
-} from "@budibase/types"
-import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts"
+import { App, MigrationType } from "@budibase/types"
 
 const URL_REGEX_SLASH = /\/|\\/g
 
@@ -250,19 +243,27 @@ const performAppCreate = async (ctx: any) => {
   }
   const instance = await createInstance(instanceConfig)
   const appId = instance._id
-  const db = context.getAppDB()
 
-  let newApplication: App = {
+  const db = context.getAppDB()
+  let _rev
+  try {
+    // if template there will be an existing doc
+    const existing = await db.get(DocumentType.APP_METADATA)
+    _rev = existing._rev
+  } catch (err) {
+    // nothing to do
+  }
+  const newApplication: App = {
     _id: DocumentType.APP_METADATA,
-    _rev: undefined,
-    appId,
+    _rev,
+    appId: instance._id,
     type: "app",
     version: packageJson.version,
     componentLibraries: ["@budibase/standard-components"],
     name: name,
     url: url,
-    template: templateKey,
-    instance,
+    template: ctx.request.body.template,
+    instance: instance,
     tenantId: getTenantId(),
     updatedAt: new Date().toISOString(),
     createdAt: new Date().toISOString(),
@@ -284,36 +285,6 @@ const performAppCreate = async (ctx: any) => {
       buttonBorderRadius: "16px",
     },
   }
-
-  // If we used a template or imported an app there will be an existing doc.
-  // Fetch and migrate some metadata from the existing app.
-  try {
-    const existing: App = await db.get(DocumentType.APP_METADATA)
-    const keys: (keyof App)[] = [
-      "_rev",
-      "navigation",
-      "theme",
-      "customTheme",
-      "icon",
-    ]
-    keys.forEach(key => {
-      if (existing[key]) {
-        // @ts-ignore
-        newApplication[key] = existing[key]
-      }
-    })
-
-    // Migrate navigation settings and screens if required
-    if (existing && !existing.navigation) {
-      const navigation = await migrateAppNavigation()
-      if (navigation) {
-        newApplication.navigation = navigation
-      }
-    }
-  } catch (err) {
-    // Nothing to do
-  }
-
   const response = await db.put(newApplication, { force: true })
   newApplication._rev = response.rev
 
@@ -596,55 +567,3 @@ const updateAppPackage = async (appPackage: any, appId: any) => {
     return newAppPackage
   })
 }
-
-const migrateAppNavigation = async () => {
-  const db = context.getAppDB()
-  const existing: App = await db.get(DocumentType.APP_METADATA)
-  const layouts: Layout[] = await getLayouts()
-  const screens: Screen[] = await getScreens()
-
-  // Migrate all screens, removing custom layouts
-  for (let screen of screens) {
-    if (!screen.layoutId) {
-      return
-    }
-    const layout = layouts.find(layout => layout._id === screen.layoutId)
-    screen.layoutId = undefined
-    screen.showNavigation = layout?.props.navigation !== "None"
-    screen.width = layout?.props.width || "Large"
-    await db.put(screen)
-  }
-
-  // Migrate layout navigation settings
-  const { name, customTheme } = existing
-  const layout = layouts?.find(
-    (layout: Layout) => layout._id === BASE_LAYOUT_PROP_IDS.PRIVATE
-  )
-  if (layout) {
-    let navigationSettings: any = {
-      navigation: "Top",
-      title: name,
-      navWidth: "Large",
-      navBackground:
-        customTheme?.navBackground || "var(--spectrum-global-color-gray-50)",
-      navTextColor:
-        customTheme?.navTextColor || "var(--spectrum-global-color-gray-800)",
-    }
-    if (layout) {
-      navigationSettings.hideLogo = layout.props.hideLogo
-      navigationSettings.hideTitle = layout.props.hideTitle
-      navigationSettings.title = layout.props.title || name
-      navigationSettings.logoUrl = layout.props.logoUrl
-      navigationSettings.links = layout.props.links
-      navigationSettings.navigation = layout.props.navigation || "Top"
-      navigationSettings.sticky = layout.props.sticky
-      navigationSettings.navWidth = layout.props.width || "Large"
-      if (navigationSettings.navigation === "None") {
-        navigationSettings.navigation = "Top"
-      }
-    }
-    return navigationSettings
-  } else {
-    return null
-  }
-}

package/src/api/controllers/row/internalSearch.js

@@ -1,5 +1,4 @@
 const { SearchIndexes } = require("../../../db/utils")
-const { removeKeyNumbering } = require("./utils")
 const fetch = require("node-fetch")
 const { getCouchInfo } = require("@budibase/backend-core/db")
 const { getAppId } = require("@budibase/backend-core/context")
@@ -21,8 +20,6 @@ class QueryBuilder {
       notEmpty: {},
       oneOf: {},
       contains: {},
-      notContains: {},
-      containsAny: {},
       ...base,
     }
     this.limit = 50
@@ -128,16 +125,6 @@ class QueryBuilder {
     return this
   }
 
-  addNotContains(key, value) {
-    this.query.notContains[key] = value
-    return this
-  }
-
-  addContainsAny(key, value) {
-    this.query.containsAny[key] = value
-    return this
-  }
-
   /**
    * Preprocesses a value before going into a lucene search.
    * Transforms strings to lowercase and wraps strings and bools in quotes.
@@ -183,29 +170,11 @@ class QueryBuilder {
       return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
     }
 
-    const contains = (key, value, mode = "AND") => {
-      if (Array.isArray(value) && value.length === 0) {
+    const contains = (key, value) => {
+      if (!value && value !== 0) {
         return null
       }
-      if (!Array.isArray(value)) {
-        return `${key}:${value}`
-      }
-      let statement = `${builder.preprocess(value[0], { escape: true })}`
-      for (let i = 1; i < value.length; i++) {
-        statement += ` ${mode} ${builder.preprocess(value[i], {
-          escape: true,
-        })}`
-      }
-      return `${key}:(${statement})`
-    }
-
-    const notContains = (key, value) => {
-      const allPrefix = allOr === "" ? "*:* AND" : ""
-      return allPrefix + "NOT " + contains(key, value)
-    }
-
-    const containsAny = (key, value) => {
-      return contains(key, value, "OR")
+      return `${key}:${builder.preprocess(value, { escape: true })}`
     }
 
     const oneOf = (key, value) => {
@@ -228,8 +197,6 @@ class QueryBuilder {
 
     function build(structure, queryFn) {
       for (let [key, value] of Object.entries(structure)) {
-        // check for new format - remove numbering if needed
-        key = removeKeyNumbering(key)
         key = builder.preprocess(key.replace(/ /g, "_"), {
           escape: true,
         })
@@ -308,12 +275,6 @@ class QueryBuilder {
     if (this.query.contains) {
       build(this.query.contains, contains)
     }
-    if (this.query.notContains) {
-      build(this.query.notContains, notContains)
-    }
-    if (this.query.containsAny) {
-      build(this.query.containsAny, containsAny)
-    }
     // make sure table ID is always added as an AND
     if (tableId) {
       query = `(${query})`
@@ -349,9 +310,6 @@ class QueryBuilder {
   }
 }
 
-// exported for unit testing
-exports.QueryBuilder = QueryBuilder
-
 /**
  * Executes a lucene search query.
  * @param url The query URL

package/src/api/controllers/row/utils.js

@@ -3,9 +3,8 @@ const { cloneDeep } = require("lodash/fp")
 const { InternalTables } = require("../../../db/utils")
 const userController = require("../user")
 const { FieldTypes } = require("../../../constants")
+const { makeExternalQuery } = require("../../../integrations/base/utils")
 const { getAppDB } = require("@budibase/backend-core/context")
-const { makeExternalQuery } = require("../../../integrations/base/query")
-const { removeKeyNumbering } = require("../../../integrations/base/utils")
 
 validateJs.extend(validateJs.validators.datetime, {
   parse: function (value) {
@@ -17,8 +16,6 @@ validateJs.extend(validateJs.validators.datetime, {
   },
 })
 
-exports.removeKeyNumbering = removeKeyNumbering
-
 exports.getDatasourceAndQuery = async json => {
   const datasourceId = json.endpoint.datasourceId
   const db = getAppDB()

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

@@ -12,7 +12,7 @@ const {
 } = require("../../../utilities/fileSystem")
 const env = require("../../../environment")
 const { clientLibraryPath } = require("../../../utilities")
-const { upload, deleteFiles } = require("../../../utilities/fileSystem")
+const { upload } = require("../../../utilities/fileSystem")
 const { attachmentsRelativeURL } = require("../../../utilities")
 const { DocumentType } = require("../../../db/utils")
 const { getAppDB, getAppId } = require("@budibase/backend-core/context")
@@ -97,10 +97,6 @@ export const uploadFile = async function (ctx: any) {
   ctx.body = await Promise.all(uploads)
 }
 
-export const deleteObjects = async function (ctx: any) {
-  ctx.body = await deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys)
-}
-
 export const serveApp = async function (ctx: any) {
   const db = getAppDB({ skip_setup: true })
   const appInfo = await db.get(DocumentType.APP_METADATA)
@@ -128,22 +124,6 @@ export const serveApp = async function (ctx: any) {
   }
 }
 
-export const serveBuilderPreview = async function (ctx: any) {
-  const db = getAppDB({ skip_setup: true })
-  const appInfo = await db.get(DocumentType.APP_METADATA)
-
-  if (!env.isJest()) {
-    let appId = getAppId()
-    const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`)
-    ctx.body = await processString(previewHbs, {
-      clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
-    })
-  } else {
-    // just return the app info for jest to assert on
-    ctx.body = { ...appInfo, builderPreview: true }
-  }
-}
-
 export const serveClientLibrary = async function (ctx: any) {
   return send(ctx, "budibase-client.js", {
     root: join(NODE_MODULES_PATH, "@budibase", "client", "dist"),

package/src/api/controllers/table/external.js

@@ -14,7 +14,7 @@ const {
   FieldTypes,
   RelationshipTypes,
 } = require("../../../constants")
-const { makeExternalQuery } = require("../../../integrations/base/query")
+const { makeExternalQuery } = require("../../../integrations/base/utils")
 const { cloneDeep } = require("lodash/fp")
 const csvParser = require("../../../utilities/csvParser")
 const { handleRequest } = require("../row/external")

package/src/api/routes/static.ts

@@ -38,11 +38,6 @@ router
   // TODO: for now this builder endpoint is not authorized/secured, will need to be
   .get("/builder/:file*", controller.serveBuilder)
   .post("/api/attachments/process", authorized(BUILDER), controller.uploadFile)
-  .post(
-    "/api/attachments/delete",
-    authorized(BUILDER),
-    controller.deleteObjects
-  )
   .post("/api/beta/:feature", controller.toggleBetaUiFeature)
   .post(
     "/api/attachments/:tableId/upload",
@@ -50,13 +45,6 @@ router
     authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
     controller.uploadFile
   )
-  .post(
-    "/api/attachments/:tableId/delete",
-    paramResource("tableId"),
-    authorized(PermissionTypes.TABLE, PermissionLevels.WRITE),
-    controller.deleteObjects
-  )
-  .get("/preview", authorized(BUILDER), controller.serveBuilderPreview)
   .get("/:appId/:path*", controller.serveApp)
   .get("/app/:appUrl/:path*", controller.serveApp)
   .post(

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

@@ -17,7 +17,6 @@ const {
   checkBuilderEndpoint,
 } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
-const { basicScreen, basicLayout } = setup.structures
 const { AppStatus } = require("../../../db/utils")
 const { events } = require("@budibase/backend-core")
 
@@ -82,31 +81,6 @@ describe("/applications", () => {
         body: { name: "My App" },
       })
     })
-
-    it("migrates navigation settings from old apps", async () => {
-      const res = await request
-        .post("/api/applications")
-        .field("name", "Old App")
-        .field("useTemplate", "true")
-        .set(config.defaultHeaders())
-        .attach("templateFile", "src/api/routes/tests/data/old-app.txt")
-        .expect("Content-Type", /json/)
-        .expect(200)
-      expect(res.body._id).toBeDefined()
-      expect(res.body.navigation).toBeDefined()
-      expect(res.body.navigation.hideLogo).toBe(true)
-      expect(res.body.navigation.title).toBe("Custom Title")
-      expect(res.body.navigation.hideLogo).toBe(true)
-      expect(res.body.navigation.navigation).toBe("Left")
-      expect(res.body.navigation.navBackground).toBe(
-        "var(--spectrum-global-color-blue-600)"
-      )
-      expect(res.body.navigation.navTextColor).toBe(
-        "var(--spectrum-global-color-gray-50)"
-      )
-      expect(events.app.created).toBeCalledTimes(1)
-      expect(events.app.fileImported).toBeCalledTimes(1)
-    })
   })
 
   describe("fetch", () => {

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

@@ -40,6 +40,7 @@ describe("/static", () => {
   })
 
   describe("/app", () => {
+
     beforeEach(() => {
       jest.clearAllMocks()
     })
@@ -59,7 +60,7 @@ describe("/static", () => {
     it("should serve the app by url", async () => {
       const headers = config.defaultHeaders()
       delete headers[constants.Headers.APP_ID]
-
+      
       const res = await request
         .get(`/app${config.prodApp.url}`)
         .set(headers)
@@ -81,7 +82,7 @@ describe("/static", () => {
   describe("/attachments", () => {
     describe("generateSignedUrls", () => {
       let datasource
-
+  
       beforeEach(async () => {
         datasource = await config.createDatasource({
           datasource: {
@@ -92,7 +93,7 @@ describe("/static", () => {
           },
         })
       })
-
+  
       it("should be able to generate a signed upload URL", async () => {
         const bucket = "foo"
         const key = "bar"
@@ -107,7 +108,7 @@ describe("/static", () => {
           `https://${bucket}.s3.eu-west-1.amazonaws.com/${key}`
         )
       })
-
+  
       it("should handle an invalid datasource ID", async () => {
         const res = await request
           .post(`/api/attachments/foo/url`)
@@ -122,7 +123,7 @@ describe("/static", () => {
           "The specified datasource could not be found"
         )
       })
-
+  
       it("should require a bucket parameter", async () => {
         const res = await request
           .post(`/api/attachments/${datasource._id}/url`)
@@ -135,7 +136,7 @@ describe("/static", () => {
           .expect(400)
         expect(res.body.message).toEqual("bucket and key values are required")
       })
-
+  
       it("should require a key parameter", async () => {
         const res = await request
           .post(`/api/attachments/${datasource._id}/url`)
@@ -150,17 +151,4 @@ describe("/static", () => {
     })
   })
 
-  describe("/preview", () => {
-    beforeEach(() => {
-      jest.clearAllMocks()
-    })
-
-    it("should serve the builder preview", async () => {
-      const headers = config.defaultHeaders()
-      const res = await request.get(`/preview`).set(headers).expect(200)
-
-      expect(res.body.appId).toBe(config.appId)
-      expect(res.body.builderPreview).toBe(true)
-    })
-  })
 })

package/src/app.ts

@@ -83,7 +83,9 @@ server.on("close", async () => {
     return
   }
   shuttingDown = true
-  console.log("Server Closed")
+  if (!env.isTest()) {
+    console.log("Server Closed")
+  }
   await automations.shutdown()
   await redis.shutdown()
   await events.shutdown()
@@ -165,7 +167,3 @@ process.on("uncaughtException", err => {
 process.on("SIGTERM", () => {
   shutdown()
 })
-
-process.on("SIGINT", () => {
-  shutdown()
-})

package/src/automations/bullboard.js

@@ -53,7 +53,6 @@ exports.shutdown = async () => {
     await automationQueue.close()
     automationQueue = null
   }
-  console.log("Bull shutdown")
 }
 
 exports.queue = automationQueue

package/src/automations/logging/index.ts

@@ -23,9 +23,6 @@ export async function checkAppMetadata(apps: App[]) {
     for (let [key, errors] of Object.entries(metadata.automationErrors)) {
       const updated = []
       for (let error of errors) {
-        if (!error) {
-          continue
-        }
         const startDate = error.split(dbUtils.SEPARATOR)[2]
         if (startDate > maxStartDate) {
           updated.push(error)