@budibase/server 2.2.4-alpha.1 → 2.2.5

package/src/api/controllers/auth.ts

@@ -3,7 +3,7 @@ import { InternalTables } from "../../db/utils"
 import { getFullUser } from "../../utilities/users"
 import { roles, context } from "@budibase/backend-core"
 import { groups } from "@budibase/pro"
-import { ContextUser, User, Row, UserCtx } from "@budibase/types"
+import { ContextUser, User, Row } from "@budibase/types"
 
 const PUBLIC_ROLE = roles.BUILTIN_ROLE_IDS.PUBLIC
 
@@ -16,7 +16,7 @@ const addSessionAttributesToUser = (ctx: any) => {
   }
 }
 
-export async function fetchSelf(ctx: UserCtx) {
+export async function fetchSelf(ctx: any) {
   let userId = ctx.user.userId || ctx.user._id
   /* istanbul ignore next */
   if (!userId || !ctx.isAuthenticated) {

package/src/api/controllers/cloud.ts

@@ -5,8 +5,8 @@ import { stringToReadStream } from "../../utilities"
 import { getDocParams, DocumentType, isDevAppID } from "../../db/utils"
 import { create } from "./application"
 import { join } from "path"
+import { App, BBContext, Database } from "@budibase/types"
 import sdk from "../../sdk"
-import { App, Ctx, Database } from "@budibase/types"
 
 async function createApp(appName: string, appDirectory: string) {
   const ctx = {
@@ -35,7 +35,7 @@ async function getAllDocType(db: Database, docType: string) {
   return response.rows.map(row => row.doc)
 }
 
-export async function exportApps(ctx: Ctx) {
+export async function exportApps(ctx: BBContext) {
   if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
     ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
   }
@@ -65,13 +65,13 @@ async function checkHasBeenImported() {
   return apps.length !== 0
 }
 
-export async function hasBeenImported(ctx: Ctx) {
+export async function hasBeenImported(ctx: BBContext) {
   ctx.body = {
     imported: await checkHasBeenImported(),
   }
 }
 
-export async function importApps(ctx: Ctx) {
+export async function importApps(ctx: BBContext) {
   if (!env.SELF_HOSTED || env.MULTI_TENANCY) {
     ctx.throw(400, "Importing only allowed in self hosted environments.")
   }
@@ -82,16 +82,12 @@ export async function importApps(ctx: Ctx) {
       "Import file is required and environment must be fresh to import apps."
     )
   }
-  const file = ctx.request.files.importFile
-  if (Array.isArray(file)) {
-    ctx.throw(400, "Single file is required")
-  }
-  if (file.type !== "application/gzip") {
+  if (ctx.request.files.importFile.type !== "application/gzip") {
     ctx.throw(400, "Import file must be a gzipped tarball.")
   }
 
   // initially get all the app databases out of the tarball
-  const tmpPath = sdk.backups.untarFile(file)
+  const tmpPath = sdk.backups.untarFile(ctx.request.files.importFile)
   const globalDbImport = sdk.backups.getGlobalDBFile(tmpPath)
   const appNames = sdk.backups.getListOfAppsInMulti(tmpPath)
 

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

@@ -1,14 +1,10 @@
 import { npmUpload, urlUpload, githubUpload, fileUpload } from "./uploaders"
-import {
-  plugins as pluginCore,
-  db as dbCore,
-  tenancy,
-  objectStore,
-} from "@budibase/backend-core"
-import { PluginType, FileType, PluginSource, Plugin } from "@budibase/types"
+import { plugins as pluginCore, tenancy } from "@budibase/backend-core"
+import { PluginType, FileType, PluginSource } from "@budibase/types"
 import env from "../../../environment"
 import { ClientAppSocket } from "../../../websocket"
-import { sdk as pro } from "@budibase/pro"
+import { db as dbCore } from "@budibase/backend-core"
+import { plugins } from "@budibase/pro"
 
 export async function getPlugins(type?: PluginType) {
   const db = tenancy.getGlobalDB()
@@ -17,10 +13,9 @@ export async function getPlugins(type?: PluginType) {
       include_docs: true,
     })
   )
-  let plugins = response.rows.map((row: any) => row.doc) as Plugin[]
-  plugins = objectStore.enrichPluginURLs(plugins)
+  const plugins = response.rows.map((row: any) => row.doc)
   if (type) {
-    return plugins.filter((plugin: Plugin) => plugin.schema?.type === type)
+    return plugins.filter((plugin: any) => plugin.schema?.type === type)
   } else {
     return plugins
   }
@@ -89,7 +84,7 @@ export async function create(ctx: any) {
       )
     }
 
-    const doc = await pro.plugins.storePlugin(metadata, directory, source)
+    const doc = await plugins.storePlugin(metadata, directory, source)
 
     ClientAppSocket.emit("plugins-update", { name, hash: doc.hash })
     ctx.body = {
@@ -112,7 +107,7 @@ export async function destroy(ctx: any) {
   const { pluginId } = ctx.params
 
   try {
-    await pro.plugins.deletePlugin(pluginId)
+    await plugins.deletePlugin(pluginId)
 
     ctx.body = { message: `Plugin ${ctx.params.pluginId} deleted.` }
   } catch (err: any) {
@@ -132,7 +127,7 @@ export async function processUploadedPlugin(
     throw new Error("Only component plugins are supported outside of self-host")
   }
 
-  const doc = await pro.plugins.storePlugin(metadata, directory, source)
+  const doc = await plugins.storePlugin(metadata, directory, source)
   ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash })
   return doc
 }

package/src/api/controllers/row/ExternalRequest.ts

@@ -21,6 +21,7 @@ import { getDatasourceAndQuery } from "./utils"
 import { FieldTypes, RelationshipTypes } from "../../../constants"
 import { breakExternalTableId, isSQL } from "../../../integrations/utils"
 import { processObjectSync } from "@budibase/string-templates"
+// @ts-ignore
 import { cloneDeep } from "lodash/fp"
 import { processFormulas, processDates } from "../../../utilities/rowProcessor"
 import { context } from "@budibase/backend-core"

package/src/api/controllers/row/internal.ts

@@ -13,7 +13,7 @@ import {
   cleanupAttachments,
 } from "../../../utilities/rowProcessor"
 import { FieldTypes } from "../../../constants"
-import * as utils from "./utils"
+import { validate as rowValidate, findRow } from "./utils"
 import { fullSearch, paginatedSearch } from "./internalSearch"
 import { getGlobalUsersFromMetadata } from "../../../utilities/global"
 import * as inMemoryViews from "../../../db/inMemoryView"
@@ -30,8 +30,7 @@ import { finaliseRow, updateRelatedFormula } from "./staticFormula"
 import * as exporters from "../view/exporters"
 import { apiFileReturn } from "../../../utilities/fileSystem"
 import {
-  Ctx,
-  UserCtx,
+  BBContext,
   Database,
   LinkDocumentValue,
   Row,
@@ -70,7 +69,7 @@ async function getView(db: Database, viewName: string) {
   return viewInfo
 }
 
-async function getRawTableData(ctx: Ctx, db: Database, tableId: string) {
+async function getRawTableData(ctx: BBContext, db: Database, tableId: string) {
   let rows
   if (tableId === InternalTables.USER_METADATA) {
     await userController.fetchMetadata(ctx)
@@ -86,7 +85,7 @@ async function getRawTableData(ctx: Ctx, db: Database, tableId: string) {
   return rows as Row[]
 }
 
-export async function patch(ctx: UserCtx) {
+export async function patch(ctx: BBContext) {
   const db = context.getAppDB()
   const inputs = ctx.request.body
   const tableId = inputs.tableId
@@ -96,7 +95,7 @@ export async function patch(ctx: UserCtx) {
     let dbTable = await db.get(tableId)
     oldRow = await outputProcessing(
       dbTable,
-      await utils.findRow(ctx, tableId, inputs._id)
+      await findRow(ctx, tableId, inputs._id)
     )
   } catch (err) {
     if (isUserTable) {
@@ -118,8 +117,8 @@ export async function patch(ctx: UserCtx) {
   }
 
   // this returns the table and row incase they have been updated
-  let { table, row } = inputProcessing(ctx.user, dbTable, combinedRow)
-  const validateResult = await utils.validate({
+  let { table, row } = inputProcessing(ctx.user!, dbTable, combinedRow)
+  const validateResult = await rowValidate({
     row,
     table,
   })
@@ -151,7 +150,7 @@ export async function patch(ctx: UserCtx) {
   })
 }
 
-export async function save(ctx: UserCtx) {
+export async function save(ctx: BBContext) {
   const db = context.getAppDB()
   let inputs = ctx.request.body
   inputs.tableId = ctx.params.tableId
@@ -162,8 +161,8 @@ export async function save(ctx: UserCtx) {
 
   // this returns the table and row incase they have been updated
   const dbTable = await db.get(inputs.tableId)
-  let { table, row } = inputProcessing(ctx.user, dbTable, inputs)
-  const validateResult = await utils.validate({
+  let { table, row } = inputProcessing(ctx.user!, dbTable, inputs)
+  const validateResult = await rowValidate({
     row,
     table,
   })
@@ -186,7 +185,7 @@ export async function save(ctx: UserCtx) {
   })
 }
 
-export async function fetchView(ctx: Ctx) {
+export async function fetchView(ctx: BBContext) {
   const viewName = ctx.params.viewName
 
   // if this is a table view being looked for just transfer to that
@@ -253,7 +252,7 @@ export async function fetchView(ctx: Ctx) {
   return rows
 }
 
-export async function fetch(ctx: Ctx) {
+export async function fetch(ctx: BBContext) {
   const db = context.getAppDB()
 
   const tableId = ctx.params.tableId
@@ -262,15 +261,15 @@ export async function fetch(ctx: Ctx) {
   return outputProcessing(table, rows)
 }
 
-export async function find(ctx: Ctx) {
+export async function find(ctx: BBContext) {
   const db = dbCore.getDB(ctx.appId)
   const table = await db.get(ctx.params.tableId)
-  let row = await utils.findRow(ctx, ctx.params.tableId, ctx.params.rowId)
+  let row = await findRow(ctx, ctx.params.tableId, ctx.params.rowId)
   row = await outputProcessing(table, row)
   return row
 }
 
-export async function destroy(ctx: Ctx) {
+export async function destroy(ctx: BBContext) {
   const db = context.getAppDB()
   const { _id } = ctx.request.body
   let row = await db.get(_id)
@@ -306,7 +305,7 @@ export async function destroy(ctx: Ctx) {
   return { response, row }
 }
 
-export async function bulkDestroy(ctx: Ctx) {
+export async function bulkDestroy(ctx: BBContext) {
   const db = context.getAppDB()
   const tableId = ctx.params.tableId
   const table = await db.get(tableId)
@@ -345,7 +344,7 @@ export async function bulkDestroy(ctx: Ctx) {
   return { response: { ok: true }, rows: processedRows }
 }
 
-export async function search(ctx: Ctx) {
+export async function search(ctx: BBContext) {
   // Fetch the whole table when running in cypress, as search doesn't work
   if (!env.COUCH_DB_URL && env.isCypress()) {
     return { rows: await fetch(ctx) }
@@ -377,14 +376,14 @@ export async function search(ctx: Ctx) {
   return response
 }
 
-export async function validate(ctx: Ctx) {
-  return utils.validate({
+export async function validate(ctx: BBContext) {
+  return rowValidate({
     tableId: ctx.params.tableId,
     row: ctx.request.body,
   })
 }
 
-export async function exportRows(ctx: Ctx) {
+export async function exportRows(ctx: BBContext) {
   const db = context.getAppDB()
   const table = await db.get(ctx.params.tableId)
   const rowIds = ctx.request.body.rows
@@ -422,14 +421,14 @@ export async function exportRows(ctx: Ctx) {
   return apiFileReturn(exporter(headers, rows))
 }
 
-export async function fetchEnrichedRow(ctx: Ctx) {
+export async function fetchEnrichedRow(ctx: BBContext) {
   const db = context.getAppDB()
   const tableId = ctx.params.tableId
   const rowId = ctx.params.rowId
   // need table to work out where links go in row
   let [table, row] = await Promise.all([
     db.get(tableId),
-    utils.findRow(ctx, tableId, rowId),
+    findRow(ctx, tableId, rowId),
   ])
   // get the link docs
   const linkVals = (await linkRows.getLinkDocuments({

package/src/api/controllers/row/staticFormula.ts

@@ -16,10 +16,7 @@ const { cloneDeep } = require("lodash/fp")
  * updated.
  * NOTE: this will only for affect static formulas.
  */
-export async function updateRelatedFormula(
-  table: Table,
-  enrichedRows: Row[] | Row
-) {
+export async function updateRelatedFormula(table: Table, enrichedRows: Row[]) {
   const db = context.getAppDB()
   // no formula to update, we're done
   if (!table.relatedFormula) {
@@ -158,7 +155,7 @@ export async function finaliseRow(
   enrichedRow = await processFormulas(table, enrichedRow, { dynamic: false })
   // this updates the related formulas in other rows based on the relations to this row
   if (updateFormula) {
-    await updateRelatedFormula(table, enrichedRow)
+    await exports.updateRelatedFormula(table, enrichedRow)
   }
   return { row: enrichedRow, table }
 }

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

@@ -7,7 +7,6 @@ import { BBContext, Row, Table } from "@budibase/types"
 export { removeKeyNumbering } from "../../../integrations/base/utils"
 const validateJs = require("validate.js")
 const { cloneDeep } = require("lodash/fp")
-import { Ctx } from "@budibase/types"
 
 validateJs.extend(validateJs.validators.datetime, {
   parse: function (value: string) {
@@ -26,7 +25,7 @@ export async function getDatasourceAndQuery(json: any) {
   return makeExternalQuery(datasource, json)
 }
 
-export async function findRow(ctx: Ctx, tableId: string, rowId: string) {
+export async function findRow(ctx: BBContext, tableId: string, rowId: string) {
   const db = context.getAppDB()
   let row
   // TODO remove special user case in future

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

@@ -1,9 +1,11 @@
+import { enrichPluginURLs } from "../../../utilities/plugins"
+
 require("svelte/register")
 
 const send = require("koa-send")
 const { resolve, join } = require("../../../utilities/centralPath")
 const uuid = require("uuid")
-import { ObjectStoreBuckets } from "../../../constants"
+const { ObjectStoreBuckets } = require("../../../constants")
 const { processString } = require("@budibase/string-templates")
 const {
   loadHandlebarsFile,
@@ -11,6 +13,8 @@ const {
   TOP_LEVEL_PATH,
 } = require("../../../utilities/fileSystem")
 const env = require("../../../environment")
+const { clientLibraryPath } = require("../../../utilities")
+const { attachmentsRelativeURL } = require("../../../utilities")
 const { DocumentType } = require("../../../db/utils")
 const { context, objectStore, utils } = require("@budibase/backend-core")
 const AWS = require("aws-sdk")
@@ -29,7 +33,7 @@ async function prepareUpload({ s3Key, bucket, metadata, file }: any) {
   return {
     size: file.size,
     name: file.name,
-    url: objectStore.getAppFileUrl(s3Key),
+    url: attachmentsRelativeURL(response.Key),
     extension: [...file.name.split(".")].pop(),
     key: response.Key,
   }
@@ -81,7 +85,7 @@ export const uploadFile = async function (ctx: any) {
 
     return prepareUpload({
       file,
-      s3Key: `${context.getProdAppId()}/attachments/${processedFileName}`,
+      s3Key: `${ctx.appId}/attachments/${processedFileName}`,
       bucket: ObjectStoreBuckets.APPS,
     })
   })
@@ -103,14 +107,14 @@ export const serveApp = async function (ctx: any) {
 
   if (!env.isJest()) {
     const App = require("./templates/BudibaseApp.svelte").default
-    const plugins = objectStore.enrichPluginURLs(appInfo.usedPlugins)
+    const plugins = 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),
+      clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
       usedPlugins: plugins,
     })
 
@@ -135,7 +139,7 @@ export const serveBuilderPreview = async function (ctx: any) {
     let appId = context.getAppId()
     const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`)
     ctx.body = await processString(previewHbs, {
-      clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version),
+      clientLibPath: clientLibraryPath(appId, appInfo.version, ctx),
     })
   } else {
     // just return the app info for jest to assert on

package/src/api/routes/index.ts

@@ -26,14 +26,13 @@ import cloudRoutes from "./cloud"
 import migrationRoutes from "./migrations"
 import pluginRoutes from "./plugin"
 import Router from "@koa/router"
-import { api as pro } from "@budibase/pro"
+import { api } from "@budibase/pro"
 
 export { default as staticRoutes } from "./static"
 export { default as publicRoutes } from "./public"
 
-const appBackupRoutes = pro.appBackups
-const scheduleRoutes = pro.schedules
-
+const appBackupRoutes = api.appBackups
+const scheduleRoutes = api.schedules
 export const mainRoutes: Router[] = [
   appBackupRoutes,
   backupRoutes,

package/src/api/routes/tests/{application.spec.ts → application.spec.js}

@@ -12,11 +12,13 @@ jest.mock("../../../utilities/redis", () => ({
   shutdown: jest.fn(),
 }))
 
-import { clearAllApps, checkBuilderEndpoint } from "./utilities/TestFunctions"
-import * as setup from "./utilities"
-import { AppStatus } from "../../../db/utils"
-import { events } from "@budibase/backend-core"
-import env from "../../../environment"
+const {
+  clearAllApps,
+  checkBuilderEndpoint,
+} = require("./utilities/TestFunctions")
+const setup = require("./utilities")
+const { AppStatus } = require("../../../db/utils")
+const { events } = require("@budibase/backend-core")
 
 describe("/applications", () => {
   let request = setup.getRequest()
@@ -232,39 +234,4 @@ describe("/applications", () => {
       expect(getRes.body.application.updatedAt).toBeDefined()
     })
   })
-
-  describe("sync", () => {
-    it("app should sync correctly", async () => {
-      const res = await request
-        .post(`/api/applications/${config.getAppId()}/sync`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-      expect(res.body.message).toEqual("App sync completed successfully.")
-    })
-
-    it("app should not sync if production", async () => {
-      const res = await request
-        .post(`/api/applications/app_123456/sync`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(400)
-      expect(res.body.message).toEqual(
-        "This action cannot be performed for production apps"
-      )
-    })
-
-    it("app should not sync if sync is disabled", async () => {
-      env._set("DISABLE_AUTO_PROD_APP_SYNC", true)
-      const res = await request
-        .post(`/api/applications/${config.getAppId()}/sync`)
-        .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
-        .expect(200)
-      expect(res.body.message).toEqual(
-        "App sync disabled. You can reenable with the DISABLE_AUTO_PROD_APP_SYNC environment variable."
-      )
-      env._set("DISABLE_AUTO_PROD_APP_SYNC", false)
-    })
-  })
 })

package/src/api/routes/tests/{backup.spec.ts → backup.spec.js}

@@ -8,10 +8,10 @@ jest.mock("@budibase/backend-core", () => {
   }
 })
 
-import * as setup from "./utilities"
-import { events } from "@budibase/backend-core"
-import sdk from "../../../sdk"
-import { checkBuilderEndpoint } from "./utilities/TestFunctions"
+const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
+const setup = require("./utilities")
+const { events } = require("@budibase/backend-core")
+
 describe("/backups", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
@@ -30,7 +30,7 @@ describe("/backups", () => {
         .expect(200)
       expect(res.text).toBeDefined()
       expect(res.headers["content-type"]).toEqual("application/gzip")
-      expect(events.app.exported).toBeCalledTimes(1)
+      expect(events.app.exported.mock.calls.length).toBe(1)
     })
 
     it("should apply authorization to endpoint", async () => {
@@ -41,15 +41,4 @@ describe("/backups", () => {
       })
     })
   })
-
-  describe("calculateBackupStats", () => {
-    it("should be able to calculate the backup statistics", async () => {
-      config.createAutomation()
-      config.createScreen()
-      let res = await sdk.backups.calculateBackupStats(config.getAppId())
-      expect(res.automations).toEqual(1)
-      expect(res.datasources).toEqual(1)
-      expect(res.screens).toEqual(1)
-    })
-  })
-})
+})

package/src/api/routes/tests/{datasource.spec.ts → datasource.spec.js}

@@ -1,16 +1,16 @@
 jest.mock("pg")
-import * as setup from "./utilities"
-import { checkBuilderEndpoint } from "./utilities/TestFunctions"
-import { checkCacheForDynamicVariable } from "../../../threads/utils"
-import { events } from "@budibase/backend-core"
 
+let setup = require("./utilities")
 let { basicDatasource } = setup.structures
+let { checkBuilderEndpoint } = require("./utilities/TestFunctions")
 const pg = require("pg")
+const { checkCacheForDynamicVariable } = require("../../../threads/utils")
+const { events } = require("@budibase/backend-core") 
 
 describe("/datasources", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
-  let datasource: any
+  let datasource
 
   afterAll(setup.afterAll)
 
@@ -26,7 +26,7 @@ describe("/datasources", () => {
         .post(`/api/datasources`)
         .send(basicDatasource())
         .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
+        .expect('Content-Type', /json/)
         .expect(200)
 
       expect(res.body.datasource.name).toEqual("Test")
@@ -42,7 +42,7 @@ describe("/datasources", () => {
         .put(`/api/datasources/${datasource._id}`)
         .send(datasource)
         .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
+        .expect('Content-Type', /json/)
         .expect(200)
 
       expect(res.body.datasource.name).toEqual("Updated Test")
@@ -51,34 +51,25 @@ describe("/datasources", () => {
     })
 
     describe("dynamic variables", () => {
-      async function preview(
-        datasource: any,
-        fields: { path: string; queryString: string }
-      ) {
+      async function preview(datasource, fields) {
         return config.previewQuery(request, config, datasource, fields)
       }
 
       it("should invalidate changed or removed variables", async () => {
         const { datasource, query } = await config.dynamicVariableDatasource()
         // preview once to cache variables
-        await preview(datasource, {
-          path: "www.test.com",
-          queryString: "test={{ variable3 }}",
-        })
+        await preview(datasource, { path: "www.test.com", queryString: "test={{ variable3 }}" })
         // check variables in cache
-        let contents = await checkCacheForDynamicVariable(
-          query._id,
-          "variable3"
-        )
+        let contents = await checkCacheForDynamicVariable(query._id, "variable3")
         expect(contents.rows.length).toEqual(1)
-
+        
         // update the datasource to remove the variables
         datasource.config.dynamicVariables = []
         const res = await request
           .put(`/api/datasources/${datasource._id}`)
           .send(datasource)
           .set(config.defaultHeaders())
-          .expect("Content-Type", /json/)
+          .expect('Content-Type', /json/)
           .expect(200)
         expect(res.body.errors).toBeUndefined()
 
@@ -94,7 +85,7 @@ describe("/datasources", () => {
       const res = await request
         .get(`/api/datasources`)
         .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
+        .expect('Content-Type', /json/)
         .expect(200)
 
       const datasources = res.body
@@ -169,7 +160,7 @@ describe("/datasources", () => {
       const res = await request
         .get(`/api/datasources`)
         .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
+        .expect('Content-Type', /json/)
         .expect(200)
 
       expect(res.body.length).toEqual(1)
@@ -183,5 +174,6 @@ describe("/datasources", () => {
         url: `/api/datasources/${datasource._id}/${datasource._rev}`,
       })
     })
+
   })
 })

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

@@ -9,6 +9,7 @@ const route = "/test"
 // there are checks which are disabled in test env,
 // these checks need to be enabled for this test
 
+
 describe("/routing", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()

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

@@ -10,7 +10,6 @@ const {
   StaticQuotaName,
   MonthlyQuotaName,
 } = require("@budibase/types")
-const { structures } = require("@budibase/backend-core/tests");
 
 describe("/rows", () => {
   let request = setup.getRequest()
@@ -495,13 +494,12 @@ describe("/rows", () => {
   describe("attachments", () => {
     it("should allow enriching attachment rows", async () => {
       const table = await config.createAttachmentTable()
-      const attachmentId = `${structures.uuid()}.csv`
       const row = await config.createRow({
         name: "test",
         description: "test",
         attachment: [
           {
-            key: `${config.getAppId()}/attachments/${attachmentId}`,
+            key: `${config.getAppId()}/attachments/test/thing.csv`,
           },
         ],
         tableId: table._id,
@@ -511,7 +509,7 @@ describe("/rows", () => {
         context.doInAppContext(config.getAppId(), async () => {
           const enriched = await outputProcessing(table, [row])
           expect(enriched[0].attachment[0].url).toBe(
-            `/files/signed/prod-budi-app-assets/${config.getProdAppId()}/attachments/${attachmentId}`
+            `/prod-budi-app-assets/${config.getAppId()}/attachments/test/thing.csv`
           )
         })
       })