@budibase/server 2.1.32-alpha.1 → 2.1.32-alpha.11

package/src/api/controllers/query/{validation.js → validation.ts}

@@ -1,9 +1,9 @@
-const { joiValidator } = require("@budibase/backend-core/auth")
-const Joi = require("joi")
+import { auth } from "@budibase/backend-core"
+import Joi from "joi"
 
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 
-exports.queryValidation = () => {
+export function queryValidation() {
   return Joi.object({
     _id: Joi.string(),
     _rev: Joi.string(),
@@ -25,14 +25,14 @@ exports.queryValidation = () => {
   }).unknown(true)
 }
 
-exports.generateQueryValidation = () => {
+export function generateQueryValidation() {
   // prettier-ignore
-  return joiValidator.body(exports.queryValidation())
+  return auth.joiValidator.body(queryValidation())
 }
 
-exports.generateQueryPreviewValidation = () => {
+export function generateQueryPreviewValidation() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     readable: Joi.boolean().optional(),

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

@@ -1,23 +1,21 @@
-const {
-  Role,
-  getRole,
-  isBuiltin,
-  getAllRoles,
-} = require("@budibase/backend-core/roles")
-const {
+import { roles, context, events } from "@budibase/backend-core"
+import {
   generateRoleID,
   getUserMetadataParams,
   InternalTables,
-} = require("../../db/utils")
-const { getAppDB } = require("@budibase/backend-core/context")
-const { events } = require("@budibase/backend-core")
+} from "../../db/utils"
+import { BBContext, Database } from "@budibase/types"
 
 const UpdateRolesOptions = {
   CREATED: "created",
   REMOVED: "removed",
 }
 
-async function updateRolesOnUserTable(db, roleId, updateOption) {
+async function updateRolesOnUserTable(
+  db: Database,
+  roleId: string,
+  updateOption: string
+) {
   const table = await db.get(InternalTables.USER_METADATA)
   const schema = table.schema
   const remove = updateOption === UpdateRolesOptions.REMOVED
@@ -40,27 +38,25 @@ async function updateRolesOnUserTable(db, roleId, updateOption) {
   }
 }
 
-exports.fetch = async function (ctx) {
-  ctx.body = await getAllRoles()
+export async function fetch(ctx: BBContext) {
+  ctx.body = await roles.getAllRoles()
 }
 
-exports.find = async function (ctx) {
-  ctx.body = await getRole(ctx.params.roleId)
+export async function find(ctx: BBContext) {
+  ctx.body = await roles.getRole(ctx.params.roleId)
 }
 
-exports.save = async function (ctx) {
-  const db = getAppDB()
+export async function save(ctx: BBContext) {
+  const db = context.getAppDB()
   let { _id, name, inherits, permissionId } = ctx.request.body
   let isCreate = false
   if (!_id) {
     _id = generateRoleID()
     isCreate = true
-  } else if (isBuiltin(_id)) {
+  } else if (roles.isBuiltin(_id)) {
     ctx.throw(400, "Cannot update builtin roles.")
   }
-  const role = new Role(_id, name)
-    .addPermission(permissionId)
-    .addInheritance(inherits)
+  const role = new roles.Role(_id, name, permissionId).addInheritance(inherits)
   if (ctx.request.body._rev) {
     role._rev = ctx.request.body._rev
   }
@@ -76,17 +72,17 @@ exports.save = async function (ctx) {
   ctx.message = `Role '${role.name}' created successfully.`
 }
 
-exports.destroy = async function (ctx) {
-  const db = getAppDB()
+export async function destroy(ctx: BBContext) {
+  const db = context.getAppDB()
   const roleId = ctx.params.roleId
   const role = await db.get(roleId)
-  if (isBuiltin(roleId)) {
+  if (roles.isBuiltin(roleId)) {
     ctx.throw(400, "Cannot delete builtin role.")
   }
   // first check no users actively attached to role
   const users = (
     await db.allDocs(
-      getUserMetadataParams(null, {
+      getUserMetadataParams(undefined, {
         include_docs: true,
       })
     )

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

@@ -1,40 +1,41 @@
-const { getRoutingInfo } = require("../../utilities/routing")
-const {
-  getUserRoleHierarchy,
-  BUILTIN_ROLE_IDS,
-} = require("@budibase/backend-core/roles")
+import { getRoutingInfo } from "../../utilities/routing"
+import { roles } from "@budibase/backend-core"
+import { BBContext } from "@budibase/types"
 
 const URL_SEPARATOR = "/"
 
-function Routing() {
-  this.json = {}
-}
-
-Routing.prototype.getTopLevel = function (fullpath) {
-  if (fullpath.charAt(0) !== URL_SEPARATOR) {
-    fullpath = URL_SEPARATOR + fullpath
+class Routing {
+  json: any
+  constructor() {
+    this.json = {}
   }
-  // replace the first value with the home route
-  return URL_SEPARATOR + fullpath.split(URL_SEPARATOR)[1]
-}
 
-Routing.prototype.getScreensProp = function (fullpath) {
-  const topLevel = this.getTopLevel(fullpath)
-  if (!this.json[topLevel]) {
-    this.json[topLevel] = {
-      subpaths: {},
+  getTopLevel(fullpath: string) {
+    if (fullpath.charAt(0) !== URL_SEPARATOR) {
+      fullpath = URL_SEPARATOR + fullpath
     }
+    // replace the first value with the home route
+    return URL_SEPARATOR + fullpath.split(URL_SEPARATOR)[1]
   }
-  if (!this.json[topLevel].subpaths[fullpath]) {
-    this.json[topLevel].subpaths[fullpath] = {
-      screens: {},
+
+  getScreensProp(fullpath: string) {
+    const topLevel = this.getTopLevel(fullpath)
+    if (!this.json[topLevel]) {
+      this.json[topLevel] = {
+        subpaths: {},
+      }
     }
+    if (!this.json[topLevel].subpaths[fullpath]) {
+      this.json[topLevel].subpaths[fullpath] = {
+        screens: {},
+      }
+    }
+    return this.json[topLevel].subpaths[fullpath].screens
   }
-  return this.json[topLevel].subpaths[fullpath].screens
-}
 
-Routing.prototype.addScreenId = function (fullpath, roleId, screenId) {
-  this.getScreensProp(fullpath)[roleId] = screenId
+  addScreenId(fullpath: string, roleId: string, screenId: string) {
+    this.getScreensProp(fullpath)[roleId] = screenId
+  }
 }
 
 /**
@@ -55,26 +56,28 @@ async function getRoutingStructure() {
   return { routes: routing.json }
 }
 
-exports.fetch = async ctx => {
+export async function fetch(ctx: BBContext) {
   ctx.body = await getRoutingStructure()
 }
 
-exports.clientFetch = async ctx => {
+export async function clientFetch(ctx: BBContext) {
   const routing = await getRoutingStructure()
-  let roleId = ctx.user.role._id
-  const roleIds = await getUserRoleHierarchy(roleId)
-  for (let topLevel of Object.values(routing.routes)) {
+  let roleId = ctx.user?.role?._id
+  const roleIds = (await roles.getUserRoleHierarchy(roleId, {
+    idOnly: true,
+  })) as string[]
+  for (let topLevel of Object.values(routing.routes) as any) {
     for (let subpathKey of Object.keys(topLevel.subpaths)) {
       let found = false
       const subpath = topLevel.subpaths[subpathKey]
       const roleOptions = Object.keys(subpath.screens)
       if (roleOptions.length === 1 && !roleOptions[0]) {
         subpath.screenId = subpath.screens[roleOptions[0]]
-        subpath.roleId = BUILTIN_ROLE_IDS.BASIC
+        subpath.roleId = roles.BUILTIN_ROLE_IDS.BASIC
         found = true
       } else {
         for (let roleId of roleIds) {
-          if (roleOptions.indexOf(roleId) !== -1) {
+          if (roleId && roleOptions.indexOf(roleId) !== -1) {
             subpath.screenId = subpath.screens[roleId]
             subpath.roleId = roleId
             found = true

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

@@ -27,12 +27,8 @@ 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/utils"
-// @ts-ignore
-import { getAppDB } from "@budibase/backend-core/context"
+import { processFormulas, processDates } from "../../../utilities/rowProcessor"
+import { context } from "@budibase/backend-core"
 
 interface ManyRelationship {
   tableId?: string
@@ -444,7 +440,7 @@ module External {
       // Process some additional data types
       let finalRowArray = Object.values(finalRows)
       finalRowArray = processDates(table, finalRowArray)
-      finalRowArray = processFormulas(table, finalRowArray)
+      finalRowArray = processFormulas(table, finalRowArray) as Row[]
 
       return finalRowArray.map((row: Row) =>
         this.squashRelationshipColumns(table, row, relationships)
@@ -673,7 +669,7 @@ module External {
         throw "Unable to run without a table name"
       }
       if (!this.datasource) {
-        const db = getAppDB()
+        const db = context.getAppDB()
         this.datasource = await db.get(datasourceId)
         if (!this.datasource || !this.datasource.entities) {
           throw "No tables found, fetch tables before query."

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

@@ -9,7 +9,7 @@ const {
   breakRowIdField,
 } = require("../../../integrations/utils")
 const ExternalRequest = require("./ExternalRequest")
-const { getAppDB } = require("@budibase/backend-core/context")
+const { context } = require("@budibase/backend-core")
 const exporters = require("../view/exporters")
 const { apiFileReturn } = require("../../../utilities/fileSystem")
 
@@ -166,7 +166,7 @@ exports.validate = async () => {
 
 exports.exportRows = async ctx => {
   const { datasourceId } = breakExternalTableId(ctx.params.tableId)
-  const db = getAppDB()
+  const db = context.getAppDB()
   const format = ctx.query.format
   const { columns } = ctx.request.body
   const datasource = await db.get(datasourceId)
@@ -209,7 +209,7 @@ exports.fetchEnrichedRow = async ctx => {
   const id = ctx.params.rowId
   const tableId = ctx.params.tableId
   const { datasourceId, tableName } = breakExternalTableId(tableId)
-  const db = getAppDB()
+  const db = context.getAppDB()
   const datasource = await db.get(datasourceId)
   if (!datasource || !datasource.entities) {
     ctx.throw(400, "Datasource has not been configured for plus API.")

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

@@ -6,7 +6,6 @@ const {
   DocumentType,
   InternalTables,
 } = require("../../../db/utils")
-const { getDB } = require("@budibase/backend-core/db")
 const userController = require("../user")
 const {
   inputProcessing,
@@ -26,7 +25,7 @@ const {
   getFromMemoryDoc,
 } = require("../view/utils")
 const { cloneDeep } = require("lodash/fp")
-const { getAppDB } = require("@budibase/backend-core/context")
+const { context, db: dbCore } = require("@budibase/backend-core")
 const { finaliseRow, updateRelatedFormula } = require("./staticFormula")
 const exporters = require("../view/exporters")
 const { apiFileReturn } = require("../../../utilities/fileSystem")
@@ -80,7 +79,7 @@ async function getRawTableData(ctx, db, tableId) {
 }
 
 exports.patch = async ctx => {
-  const db = getAppDB()
+  const db = context.getAppDB()
   const inputs = ctx.request.body
   const tableId = inputs.tableId
   const isUserTable = tableId === InternalTables.USER_METADATA
@@ -145,7 +144,7 @@ exports.patch = async ctx => {
 }
 
 exports.save = async function (ctx) {
-  const db = getAppDB()
+  const db = context.getAppDB()
   let inputs = ctx.request.body
   inputs.tableId = ctx.params.tableId
 
@@ -188,7 +187,7 @@ exports.fetchView = async ctx => {
     return exports.fetch(ctx)
   }
 
-  const db = getAppDB()
+  const db = context.getAppDB()
   const { calculation, group, field } = ctx.query
   const viewInfo = await getView(db, viewName)
   let response
@@ -242,7 +241,7 @@ exports.fetchView = async ctx => {
 }
 
 exports.fetch = async ctx => {
-  const db = getAppDB()
+  const db = context.getAppDB()
 
   const tableId = ctx.params.tableId
   let table = await db.get(tableId)
@@ -251,7 +250,7 @@ exports.fetch = async ctx => {
 }
 
 exports.find = async ctx => {
-  const db = getDB(ctx.appId)
+  const db = dbCore.getDB(ctx.appId)
   const table = await db.get(ctx.params.tableId)
   let row = await findRow(ctx, ctx.params.tableId, ctx.params.rowId)
   row = await outputProcessing(table, row)
@@ -259,7 +258,7 @@ exports.find = async ctx => {
 }
 
 exports.destroy = async function (ctx) {
-  const db = getAppDB()
+  const db = context.getAppDB()
   const { _id } = ctx.request.body
   let row = await db.get(_id)
   let _rev = ctx.request.body._rev || row._rev
@@ -295,7 +294,7 @@ exports.destroy = async function (ctx) {
 }
 
 exports.bulkDestroy = async ctx => {
-  const db = getAppDB()
+  const db = context.getAppDB()
   const tableId = ctx.params.tableId
   const table = await db.get(tableId)
   let { rows } = ctx.request.body
@@ -338,7 +337,7 @@ exports.search = async ctx => {
   }
 
   const { tableId } = ctx.params
-  const db = getAppDB()
+  const db = context.getAppDB()
   const { paginate, query, ...params } = ctx.request.body
   params.version = ctx.version
   params.tableId = tableId
@@ -371,7 +370,7 @@ exports.validate = async ctx => {
 }
 
 exports.exportRows = async ctx => {
-  const db = getAppDB()
+  const db = context.getAppDB()
   const table = await db.get(ctx.params.tableId)
   const rowIds = ctx.request.body.rows
   let format = ctx.query.format
@@ -408,7 +407,7 @@ exports.exportRows = async ctx => {
 }
 
 exports.fetchEnrichedRow = async ctx => {
-  const db = getAppDB()
+  const db = context.getAppDB()
   const tableId = ctx.params.tableId
   const rowId = ctx.params.rowId
   // need table to work out where links go in row