@budibase/server 2.1.32-alpha.7 → 2.1.32

package/src/api/controllers/{apikeys.ts → apikeys.js}

@@ -1,10 +1,10 @@
-import { db as dbCore, tenancy } from "@budibase/backend-core"
-import { BBContext, Document } from "@budibase/types"
+const { StaticDatabases } = require("@budibase/backend-core/db")
+const { getGlobalDB } = require("@budibase/backend-core/tenancy")
 
-const KEYS_DOC = dbCore.StaticDatabases.GLOBAL.docs.apiKeys
+const KEYS_DOC = StaticDatabases.GLOBAL.docs.apiKeys
 
 async function getBuilderMainDoc() {
-  const db = tenancy.getGlobalDB()
+  const db = getGlobalDB()
   try {
     return await db.get(KEYS_DOC)
   } catch (err) {
@@ -15,24 +15,24 @@ async function getBuilderMainDoc() {
   }
 }
 
-async function setBuilderMainDoc(doc: Document) {
+async function setBuilderMainDoc(doc) {
   // make sure to override the ID
   doc._id = KEYS_DOC
-  const db = tenancy.getGlobalDB()
+  const db = getGlobalDB()
   return db.put(doc)
 }
 
-export async function fetch(ctx: BBContext) {
+exports.fetch = async function (ctx) {
   try {
     const mainDoc = await getBuilderMainDoc()
     ctx.body = mainDoc.apiKeys ? mainDoc.apiKeys : {}
-  } catch (err: any) {
+  } catch (err) {
     /* istanbul ignore next */
     ctx.throw(400, err)
   }
 }
 
-export async function update(ctx: BBContext) {
+exports.update = async function (ctx) {
   const key = ctx.params.key
   const value = ctx.request.body.value
 
@@ -47,7 +47,7 @@ export async function update(ctx: BBContext) {
       _id: resp.id,
       _rev: resp.rev,
     }
-  } catch (err: any) {
+  } catch (err) {
     /* istanbul ignore next */
     ctx.throw(400, err)
   }

package/src/api/controllers/application.ts

@@ -14,36 +14,35 @@ import {
   DocumentType,
   AppStatus,
 } from "../../db/utils"
-import {
-  db as dbCore,
-  roles,
-  cache,
-  tenancy,
-  context,
-  errors,
-  events,
-  migrations,
-} from "@budibase/backend-core"
+const {
+  BUILTIN_ROLE_IDS,
+  AccessController,
+} = require("@budibase/backend-core/roles")
+const { CacheKeys, bustCache } = require("@budibase/backend-core/cache")
+const {
+  getAllApps,
+  isDevAppID,
+  getProdAppID,
+  Replication,
+} = require("@budibase/backend-core/db")
 import { USERS_TABLE_SCHEMA } from "../../constants"
-import { buildDefaultDocs } from "../../db/defaultData/datasource_bb_default"
-
 import { removeAppFromUserRoles } from "../../utilities/workerRequests"
-import {
-  clientLibraryPath,
-  stringToReadStream,
-  isQsTrue,
-} from "../../utilities"
+import { clientLibraryPath, stringToReadStream } from "../../utilities"
 import { getLocksById } from "../../utilities/redis"
 import {
   updateClientLibrary,
   backupClientLibrary,
   revertClientLibrary,
 } from "../../utilities/fileSystem/clientLibrary"
+const { getTenantId, isMultiTenant } = require("@budibase/backend-core/tenancy")
 import { syncGlobalUsers } from "./user"
+const { app: appCache } = require("@budibase/backend-core/cache")
 import { cleanupAutomations } from "../../automations/utils"
+import { context } from "@budibase/backend-core"
 import { checkAppMetadata } from "../../automations/logging"
 import { getUniqueRows } from "../../utilities/usageQuota/rows"
 import { quotas, groups } from "@budibase/pro"
+import { errors, events, migrations } from "@budibase/backend-core"
 import { App, Layout, Screen, MigrationType } from "@budibase/types"
 import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts"
 import { enrichPluginURLs } from "../../utilities/plugins"
@@ -76,7 +75,7 @@ async function getScreens() {
 
 function getUserRoleId(ctx: any) {
   return !ctx.user.role || !ctx.user.role._id
-    ? roles.BUILTIN_ROLE_IDS.PUBLIC
+    ? BUILTIN_ROLE_IDS.PUBLIC
     : ctx.user.role._id
 }
 
@@ -123,8 +122,8 @@ const checkAppName = (
   }
 }
 
-async function createInstance(template: any, includeSampleData: boolean) {
-  const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null
+async function createInstance(template: any) {
+  const tenantId = isMultiTenant() ? getTenantId() : null
   const baseAppId = generateAppID(tenantId)
   const appId = generateDevAppID(baseAppId)
   await context.updateAppId(appId)
@@ -155,27 +154,15 @@ async function createInstance(template: any, includeSampleData: boolean) {
   } else {
     // create the users table
     await db.put(USERS_TABLE_SCHEMA)
-
-    if (includeSampleData) {
-      // create ootb stock db
-      await addDefaultTables(db)
-    }
   }
 
   return { _id: appId }
 }
 
-const addDefaultTables = async (db: any) => {
-  const defaultDbDocs = buildDefaultDocs()
-
-  // add in the default db data docs - tables, datasource, rows and links
-  await db.bulkDocs([...defaultDbDocs])
-}
-
 export const fetch = async (ctx: any) => {
   const dev = ctx.query && ctx.query.status === AppStatus.DEV
   const all = ctx.query && ctx.query.status === AppStatus.ALL
-  const apps = (await dbCore.getAllApps({ dev, all })) as App[]
+  const apps = await getAllApps({ dev, all })
 
   const appIds = apps
     .filter((app: any) => app.status === "development")
@@ -200,7 +187,7 @@ export const fetch = async (ctx: any) => {
 export const fetchAppDefinition = async (ctx: any) => {
   const layouts = await getLayouts()
   const userRoleId = getUserRoleId(ctx)
-  const accessController = new roles.AccessController()
+  const accessController = new AccessController()
   const screens = await accessController.checkScreensAccess(
     await getScreens(),
     userRoleId
@@ -224,7 +211,7 @@ export const fetchAppPackage = async (ctx: any) => {
   // Only filter screens if the user is not a builder
   if (!(ctx.user.builder && ctx.user.builder.global)) {
     const userRoleId = getUserRoleId(ctx)
-    const accessController = new roles.AccessController()
+    const accessController = new AccessController()
     screens = await accessController.checkScreensAccess(screens, userRoleId)
   }
 
@@ -237,7 +224,7 @@ export const fetchAppPackage = async (ctx: any) => {
 }
 
 const performAppCreate = async (ctx: any) => {
-  const apps = await dbCore.getAllApps({ dev: true })
+  const apps = await getAllApps({ dev: true })
   const name = ctx.request.body.name
   checkAppName(ctx, apps, name)
   const url = getAppUrl(ctx)
@@ -252,8 +239,7 @@ const performAppCreate = async (ctx: any) => {
   if (ctx.request.files && ctx.request.files.templateFile) {
     instanceConfig.file = ctx.request.files.templateFile
   }
-  const includeSampleData = isQsTrue(ctx.request.body.sampleData)
-  const instance = await createInstance(instanceConfig, includeSampleData)
+  const instance = await createInstance(instanceConfig)
   const appId = instance._id
   const db = context.getAppDB()
 
@@ -268,7 +254,7 @@ const performAppCreate = async (ctx: any) => {
     url: url,
     template: templateKey,
     instance,
-    tenantId: tenancy.getTenantId(),
+    tenantId: getTenantId(),
     updatedAt: new Date().toISOString(),
     createdAt: new Date().toISOString(),
     status: AppStatus.DEV,
@@ -327,7 +313,7 @@ const performAppCreate = async (ctx: any) => {
     await createApp(appId)
   }
 
-  await cache.app.invalidateAppMetadata(appId, newApplication)
+  await appCache.invalidateAppMetadata(appId, newApplication)
   return newApplication
 }
 
@@ -357,7 +343,7 @@ const creationEvents = async (request: any, app: App) => {
 }
 
 const appPostCreate = async (ctx: any, app: App) => {
-  const tenantId = tenancy.getTenantId()
+  const tenantId = getTenantId()
   await migrations.backPopulateMigrations({
     type: MigrationType.APP,
     tenantId,
@@ -370,9 +356,7 @@ const appPostCreate = async (ctx: any, app: App) => {
     const rowCount = rows ? rows.length : 0
     if (rowCount) {
       try {
-        await context.doInAppContext(app.appId, () => {
-          return quotas.addRows(rowCount)
-        })
+        await quotas.addRows(rowCount)
       } catch (err: any) {
         if (err.code && err.code === errors.codes.USAGE_LIMIT_EXCEEDED) {
           // this import resulted in row usage exceeding the quota
@@ -390,7 +374,7 @@ const appPostCreate = async (ctx: any, app: App) => {
 export const create = async (ctx: any) => {
   const newApplication = await quotas.addApp(() => performAppCreate(ctx))
   await appPostCreate(ctx, newApplication)
-  await cache.bustCache(cache.CacheKeys.CHECKLIST)
+  await bustCache(CacheKeys.CHECKLIST)
   ctx.body = newApplication
   ctx.status = 200
 }
@@ -398,7 +382,7 @@ export const create = async (ctx: any) => {
 // This endpoint currently operates as a PATCH rather than a PUT
 // Thus name and url fields are handled only if present
 export const update = async (ctx: any) => {
-  const apps = await dbCore.getAllApps({ dev: true })
+  const apps = await getAllApps({ dev: true })
   // validation
   const name = ctx.request.body.name
   if (name) {
@@ -471,7 +455,7 @@ const destroyApp = async (ctx: any) => {
   let isUnpublish = ctx.query && ctx.query.unpublish
 
   if (isUnpublish) {
-    appId = dbCore.getProdAppID(appId)
+    appId = getProdAppID(appId)
   }
 
   const db = isUnpublish ? context.getProdAppDB() : context.getAppDB()
@@ -497,7 +481,7 @@ const destroyApp = async (ctx: any) => {
   else {
     await removeAppFromUserRoles(ctx, appId)
   }
-  await cache.app.invalidateAppMetadata(appId)
+  await appCache.invalidateAppMetadata(appId)
   return result
 }
 
@@ -533,17 +517,19 @@ export const sync = async (ctx: any, next: any) => {
   }
 
   const appId = ctx.params.appId
-  if (!dbCore.isDevAppID(appId)) {
+  if (!isDevAppID(appId)) {
     ctx.throw(400, "This action cannot be performed for production apps")
   }
 
   // replicate prod to dev
-  const prodAppId = dbCore.getProdAppID(appId)
+  const prodAppId = getProdAppID(appId)
 
-  // specific case, want to make sure setup is skipped
-  const prodDb = context.getProdAppDB({ skip_setup: true })
-  const exists = await prodDb.exists()
-  if (!exists) {
+  try {
+    // specific case, want to make sure setup is skipped
+    const prodDb = context.getProdAppDB({ skip_setup: true })
+    const info = await prodDb.info()
+    if (info.error) throw info.error
+  } catch (err) {
     // the database doesn't exist. Don't replicate
     ctx.status = 200
     ctx.body = {
@@ -552,7 +538,7 @@ export const sync = async (ctx: any, next: any) => {
     return next()
   }
 
-  const replication = new dbCore.Replication({
+  const replication = new Replication({
     source: prodAppId,
     target: appId,
   })
@@ -593,7 +579,7 @@ export const updateAppPackage = async (appPackage: any, appId: any) => {
 
     await db.put(newAppPackage)
     // remove any cached metadata, so that it will be updated
-    await cache.app.invalidateAppMetadata(appId)
+    await appCache.invalidateAppMetadata(appId)
     return newAppPackage
   })
 }

package/src/api/controllers/auth.ts

@@ -3,7 +3,6 @@ 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 } from "@budibase/types"
 
 const PUBLIC_ROLE = roles.BUILTIN_ROLE_IDS.PUBLIC
 
@@ -25,7 +24,7 @@ export async function fetchSelf(ctx: any) {
   }
 
   const appId = context.getAppId()
-  const user: ContextUser = await getFullUser(ctx, userId)
+  const user = await getFullUser(ctx, userId)
   // this shouldn't be returned by the app self
   delete user.roles
   // forward the csrf token from the session
@@ -35,7 +34,7 @@ export async function fetchSelf(ctx: any) {
     const db = context.getAppDB()
     // check for group permissions
     if (!user.roleId || user.roleId === PUBLIC_ROLE) {
-      const groupRoleId = await groups.getGroupRoleId(user as User, appId)
+      const groupRoleId = await groups.getGroupRoleId(user, appId)
       user.roleId = groupRoleId || user.roleId
     }
     // remove the full roles structure
@@ -43,7 +42,7 @@ export async function fetchSelf(ctx: any) {
     try {
       const userTable = await db.get(InternalTables.USER_METADATA)
       // specifically needs to make sure is enriched
-      ctx.body = await outputProcessing(userTable, user as Row)
+      ctx.body = await outputProcessing(userTable, user)
     } catch (err: any) {
       let response
       // user didn't exist in app, don't pretend they do

package/src/api/controllers/{automation.ts → automation.js}

@@ -1,21 +1,26 @@
-import actions from "../../automations/actions"
-import triggers from "../../automations/triggers"
-import {
+const actions = require("../../automations/actions")
+const triggers = require("../../automations/triggers")
+const {
   getAutomationParams,
   generateAutomationID,
   DocumentType,
-} from "../../db/utils"
-import {
+} = require("../../db/utils")
+const {
   checkForWebhooks,
   updateTestHistory,
   removeDeprecated,
-} from "../../automations/utils"
-import { deleteEntityMetadata } from "../../utilities"
-import { MetadataTypes } from "../../constants"
-import { setTestFlag, clearTestFlag } from "../../utilities/redis"
-import { context, cache, events } from "@budibase/backend-core"
-import { automations } from "@budibase/pro"
-import { Automation, BBContext } from "@budibase/types"
+} = require("../../automations/utils")
+const { deleteEntityMetadata } = require("../../utilities")
+const { MetadataTypes } = require("../../constants")
+const { setTestFlag, clearTestFlag } = require("../../utilities/redis")
+const {
+  getAppDB,
+  getProdAppDB,
+  doInAppContext,
+} = require("@budibase/backend-core/context")
+const { events } = require("@budibase/backend-core")
+const { app } = require("@budibase/backend-core/cache")
+const { automations } = require("@budibase/pro")
 
 const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS)
 const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
@@ -26,7 +31,7 @@ const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
  *                       *
  *************************/
 
-async function cleanupAutomationMetadata(automationId: string) {
+async function cleanupAutomationMetadata(automationId) {
   await deleteEntityMetadata(MetadataTypes.AUTOMATION_TEST_INPUT, automationId)
   await deleteEntityMetadata(
     MetadataTypes.AUTOMATION_TEST_HISTORY,
@@ -34,7 +39,7 @@ async function cleanupAutomationMetadata(automationId: string) {
   )
 }
 
-function cleanAutomationInputs(automation: Automation) {
+function cleanAutomationInputs(automation) {
   if (automation == null) {
     return automation
   }
@@ -58,14 +63,14 @@ function cleanAutomationInputs(automation: Automation) {
   return automation
 }
 
-export async function create(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.create = async function (ctx) {
+  const db = getAppDB()
   let automation = ctx.request.body
   automation.appId = ctx.appId
 
   // call through to update if already exists
   if (automation._id && automation._rev) {
-    return update(ctx)
+    return exports.update(ctx)
   }
 
   automation._id = generateAutomationID()
@@ -92,23 +97,17 @@ export async function create(ctx: BBContext) {
   }
 }
 
-export function getNewSteps(oldAutomation: Automation, automation: Automation) {
+const getNewSteps = (oldAutomation, automation) => {
   const oldStepIds = oldAutomation.definition.steps.map(s => s.id)
   return automation.definition.steps.filter(s => !oldStepIds.includes(s.id))
 }
 
-export function getDeletedSteps(
-  oldAutomation: Automation,
-  automation: Automation
-) {
+const getDeletedSteps = (oldAutomation, automation) => {
   const stepIds = automation.definition.steps.map(s => s.id)
   return oldAutomation.definition.steps.filter(s => !stepIds.includes(s.id))
 }
 
-export async function handleStepEvents(
-  oldAutomation: Automation,
-  automation: Automation
-) {
+const handleStepEvents = async (oldAutomation, automation) => {
   // new steps
   const newSteps = getNewSteps(oldAutomation, automation)
   for (let step of newSteps) {
@@ -122,8 +121,8 @@ export async function handleStepEvents(
   }
 }
 
-export async function update(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.update = async function (ctx) {
+  const db = getAppDB()
   let automation = ctx.request.body
   automation.appId = ctx.appId
   const oldAutomation = await db.get(automation._id)
@@ -147,8 +146,9 @@ export async function update(ctx: BBContext) {
   if (oldAutoTrigger && oldAutoTrigger.id !== newAutoTrigger.id) {
     await events.automation.triggerUpdated(automation)
     await deleteEntityMetadata(
+      ctx.appId,
       MetadataTypes.AUTOMATION_TEST_INPUT,
-      automation._id!
+      automation._id
     )
   }
 
@@ -165,8 +165,8 @@ export async function update(ctx: BBContext) {
   }
 }
 
-export async function fetch(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.fetch = async function (ctx) {
+  const db = getAppDB()
   const response = await db.allDocs(
     getAutomationParams(null, {
       include_docs: true,
@@ -175,13 +175,13 @@ export async function fetch(ctx: BBContext) {
   ctx.body = response.rows.map(row => row.doc)
 }
 
-export async function find(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.find = async function (ctx) {
+  const db = getAppDB()
   ctx.body = await db.get(ctx.params.id)
 }
 
-export async function destroy(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.destroy = async function (ctx) {
+  const db = getAppDB()
   const automationId = ctx.params.id
   const oldAutomation = await db.get(automationId)
   await checkForWebhooks({
@@ -193,14 +193,14 @@ export async function destroy(ctx: BBContext) {
   await events.automation.deleted(oldAutomation)
 }
 
-export async function logSearch(ctx: BBContext) {
+exports.logSearch = async function (ctx) {
   ctx.body = await automations.logs.logSearch(ctx.request.body)
 }
 
-export async function clearLogError(ctx: BBContext) {
+exports.clearLogError = async function (ctx) {
   const { automationId, appId } = ctx.request.body
-  await context.doInAppContext(appId, async () => {
-    const db = context.getProdAppDB()
+  await doInAppContext(appId, async () => {
+    const db = getProdAppDB()
     const metadata = await db.get(DocumentType.APP_METADATA)
     if (!automationId) {
       delete metadata.automationErrors
@@ -211,20 +211,20 @@ export async function clearLogError(ctx: BBContext) {
       delete metadata.automationErrors[automationId]
     }
     await db.put(metadata)
-    await cache.app.invalidateAppMetadata(metadata.appId, metadata)
+    await app.invalidateAppMetadata(metadata.appId, metadata)
     ctx.body = { message: `Error logs cleared.` }
   })
 }
 
-export async function getActionList(ctx: BBContext) {
+exports.getActionList = async function (ctx) {
   ctx.body = ACTION_DEFS
 }
 
-export async function getTriggerList(ctx: BBContext) {
+exports.getTriggerList = async function (ctx) {
   ctx.body = TRIGGER_DEFS
 }
 
-export async function getDefinitionList(ctx: BBContext) {
+module.exports.getDefinitionList = async function (ctx) {
   ctx.body = {
     trigger: TRIGGER_DEFS,
     action: ACTION_DEFS,
@@ -237,8 +237,8 @@ export async function getDefinitionList(ctx: BBContext) {
  *                   *
  *********************/
 
-export async function trigger(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.trigger = async function (ctx) {
+  const db = getAppDB()
   let automation = await db.get(ctx.params.id)
   await triggers.externalTrigger(automation, {
     ...ctx.request.body,
@@ -250,7 +250,7 @@ export async function trigger(ctx: BBContext) {
   }
 }
 
-function prepareTestInput(input: any) {
+function prepareTestInput(input) {
   // prepare the test parameters
   if (input.id && input.row) {
     input.row._id = input.id
@@ -261,8 +261,8 @@ function prepareTestInput(input: any) {
   return input
 }
 
-export async function test(ctx: BBContext) {
-  const db = context.getAppDB()
+exports.test = async function (ctx) {
+  const db = getAppDB()
   let automation = await db.get(ctx.params.id)
   await setTestFlag(automation._id)
   const testInput = prepareTestInput(ctx.request.body)

package/src/api/controllers/{cloud.ts → cloud.js}

@@ -1,14 +1,14 @@
-import env from "../../environment"
-import { db as dbCore, tenancy } from "@budibase/backend-core"
-import { streamFile } from "../../utilities/fileSystem"
-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"
+const env = require("../../environment")
+const { getAllApps, getGlobalDBName } = require("@budibase/backend-core/db")
+const { getGlobalDB } = require("@budibase/backend-core/tenancy")
+const { streamFile } = require("../../utilities/fileSystem")
+const { stringToReadStream } = require("../../utilities")
+const { getDocParams, DocumentType, isDevAppID } = require("../../db/utils")
+const { create } = require("./application")
+const { join } = require("path")
+const sdk = require("../../sdk")
 
-async function createApp(appName: string, appDirectory: string) {
+async function createApp(appName, appDirectory) {
   const ctx = {
     request: {
       body: {
@@ -25,7 +25,7 @@ async function createApp(appName: string, appDirectory: string) {
   return create(ctx)
 }
 
-async function getAllDocType(db: Database, docType: string) {
+async function getAllDocType(db, docType) {
   const response = await db.allDocs(
     getDocParams(docType, null, {
       include_docs: true,
@@ -34,19 +34,19 @@ async function getAllDocType(db: Database, docType: string) {
   return response.rows.map(row => row.doc)
 }
 
-export async function exportApps(ctx: BBContext) {
+exports.exportApps = async ctx => {
   if (env.SELF_HOSTED || !env.MULTI_TENANCY) {
     ctx.throw(400, "Exporting only allowed in multi-tenant cloud environments.")
   }
-  const apps = (await dbCore.getAllApps({ all: true })) as App[]
-  const globalDBString = await sdk.backups.exportDB(dbCore.getGlobalDBName(), {
-    filter: (doc: any) => !doc._id.startsWith(DocumentType.USER),
+  const apps = await getAllApps({ all: true })
+  const globalDBString = await sdk.backups.exportDB(getGlobalDBName(), {
+    filter: doc => !doc._id.startsWith(DocumentType.USER),
   })
   // only export the dev apps as they will be the latest, the user can republish the apps
   // in their self-hosted environment
   let appMetadata = apps
-    .filter((app: App) => isDevAppID(app.appId || app._id))
-    .map((app: App) => ({ appId: (app.appId || app._id)!, name: app.name }))
+    .filter(app => isDevAppID(app.appId || app._id))
+    .map(app => ({ appId: app.appId || app._id, name: app.name }))
   const tmpPath = await sdk.backups.exportMultipleApps(
     appMetadata,
     globalDBString
@@ -56,25 +56,25 @@ export async function exportApps(ctx: BBContext) {
   ctx.body = streamFile(tmpPath)
 }
 
-async function checkHasBeenImported() {
+async function hasBeenImported() {
   if (!env.SELF_HOSTED || env.MULTI_TENANCY) {
     return true
   }
-  const apps = await dbCore.getAllApps({ all: true })
+  const apps = await getAllApps({ all: true })
   return apps.length !== 0
 }
 
-export async function hasBeenImported(ctx: BBContext) {
+exports.hasBeenImported = async ctx => {
   ctx.body = {
-    imported: await checkHasBeenImported(),
+    imported: await hasBeenImported(),
   }
 }
 
-export async function importApps(ctx: BBContext) {
+exports.importApps = async ctx => {
   if (!env.SELF_HOSTED || env.MULTI_TENANCY) {
     ctx.throw(400, "Importing only allowed in self hosted environments.")
   }
-  const beenImported = await checkHasBeenImported()
+  const beenImported = await hasBeenImported()
   if (beenImported || !ctx.request.files || !ctx.request.files.importFile) {
     ctx.throw(
       400,
@@ -90,7 +90,7 @@ export async function importApps(ctx: BBContext) {
   const globalDbImport = sdk.backups.getGlobalDBFile(tmpPath)
   const appNames = sdk.backups.getListOfAppsInMulti(tmpPath)
 
-  const globalDb = tenancy.getGlobalDB()
+  const globalDb = getGlobalDB()
   // load the global db first
   await globalDb.load(stringToReadStream(globalDbImport))
   for (let appName of appNames) {

package/src/api/controllers/component.ts

@@ -2,9 +2,8 @@ import { DocumentType } from "../../db/utils"
 import { Plugin } from "@budibase/types"
 import { db as dbCore, context, tenancy } from "@budibase/backend-core"
 import { getComponentLibraryManifest } from "../../utilities/fileSystem"
-import { BBContext } from "@budibase/types"
 
-export async function fetchAppComponentDefinitions(ctx: BBContext) {
+exports.fetchAppComponentDefinitions = async function (ctx: any) {
   try {
     const db = context.getAppDB()
     const app = await db.get(DocumentType.APP_METADATA)