@budibase/worker 3.2.25 → 3.2.27

package/src/tests/api/users.ts

@@ -9,14 +9,9 @@ import {
 } from "@budibase/types"
 import structures from "../structures"
 import { generator } from "@budibase/backend-core/tests"
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"
 
 export class UserAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   // INVITE
 
   sendUserInvite = async (sendMailMock: any, email: string, status = 200) => {
@@ -178,11 +173,7 @@ export class UserAPI extends TestAPI {
       .expect(opts?.status ? opts.status : 200)
   }
 
-  grantBuilderToApp = (
-    userId: string,
-    appId: string,
-    statusCode: number = 200
-  ) => {
+  grantBuilderToApp = (userId: string, appId: string, statusCode = 200) => {
     return this.request
       .post(`/api/global/users/${userId}/app/${appId}/builder`)
       .set(this.config.defaultHeaders())

package/src/tests/controllers.ts

@@ -1,5 +1,4 @@
 export * as email from "../api/controllers/global/email"
-export * as workspaces from "../api/controllers/global/workspaces"
 export * as config from "../api/controllers/global/configs"
 export * as templates from "../api/controllers/global/templates"
 export * as users from "../api/controllers/global/users"

package/src/utilities/email.ts

@@ -1,9 +1,14 @@
 import env from "../environment"
-import { EmailTemplatePurpose, TemplateType } from "../constants"
+import { TemplateType } from "../constants"
 import { getTemplateByPurpose, EmailTemplates } from "../constants/templates"
 import { getSettingsTemplateContext } from "./templates"
 import { processString } from "@budibase/string-templates"
-import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types"
+import {
+  User,
+  SendEmailOpts,
+  SMTPInnerConfig,
+  EmailTemplatePurpose,
+} from "@budibase/types"
 import { configs, cache, objectStore } from "@budibase/backend-core"
 import ical from "ical-generator"
 import _ from "lodash"

package/src/utilities/templates.ts

@@ -1,9 +1,6 @@
 import { tenancy, configs } from "@budibase/backend-core"
-import {
-  InternalTemplateBinding,
-  LOGO_URL,
-  EmailTemplatePurpose,
-} from "../constants"
+import { EmailTemplatePurpose } from "@budibase/types"
+import { InternalTemplateBinding, LOGO_URL } from "../constants"
 import { checkSlashesInUrl } from "./index"
 
 const BASE_COMPANY = "Budibase"

package/tsconfig.build.json

@@ -1,24 +1,7 @@
 {
+  "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2020"],
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true,
-    "types": ["node", "jest"],
-    "outDir": "dist",
-    "skipLibCheck": true,
-    "paths": {
-      "@budibase/types": ["../types/src"],
-      "@budibase/backend-core": ["../backend-core/src"],
-      "@budibase/backend-core/*": ["../backend-core/*"],
-      "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/src"],
-      "@budibase/string-templates": ["../string-templates/src"]
-    }
+    "target": "es2020"
   },
   "include": ["src/**/*"],
   "exclude": [

package/tsconfig.json

@@ -1,9 +1,5 @@
 {
   "extends": "./tsconfig.build.json",
-  "compilerOptions": {
-    "composite": true,
-    "baseUrl": "."
-  },
   "ts-node": {
     "require": ["tsconfig-paths/register"]
   },

package/src/api/controllers/global/workspaces.ts

@@ -1,53 +0,0 @@
-import { tenancy, db as dbCore } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
-
-export async function save(ctx: BBContext) {
-  const db = tenancy.getGlobalDB()
-  const workspaceDoc = ctx.request.body
-
-  // workspace does not exist yet
-  if (!workspaceDoc._id) {
-    workspaceDoc._id = dbCore.generateWorkspaceID()
-  }
-
-  try {
-    const response = await db.put(workspaceDoc)
-    ctx.body = {
-      _id: response.id,
-      _rev: response.rev,
-    }
-  } catch (err: any) {
-    ctx.throw(err.status, err)
-  }
-}
-
-export async function fetch(ctx: BBContext) {
-  const db = tenancy.getGlobalDB()
-  const response = await db.allDocs(
-    dbCore.getWorkspaceParams(undefined, {
-      include_docs: true,
-    })
-  )
-  ctx.body = response.rows.map(row => row.doc)
-}
-
-export async function find(ctx: BBContext) {
-  const db = tenancy.getGlobalDB()
-  try {
-    ctx.body = await db.get(ctx.params.id)
-  } catch (err: any) {
-    ctx.throw(err.status, err)
-  }
-}
-
-export async function destroy(ctx: BBContext) {
-  const db = tenancy.getGlobalDB()
-  const { id, rev } = ctx.params
-
-  try {
-    await db.remove(id, rev)
-    ctx.body = { message: "Workspace deleted successfully" }
-  } catch (err: any) {
-    ctx.throw(err.status, err)
-  }
-}

package/src/api/routes/global/workspaces.ts

@@ -1,37 +0,0 @@
-import Router from "@koa/router"
-import * as controller from "../../controllers/global/workspaces"
-import { auth } from "@budibase/backend-core"
-import Joi from "joi"
-
-const router: Router = new Router()
-
-function buildWorkspaceSaveValidation() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    _id: Joi.string().optional(),
-    _rev: Joi.string().optional(),
-    name: Joi.string().required(),
-    users: Joi.array().required(),
-    managers: Joi.array().required(),
-    roles: Joi.object({
-      default: Joi.string().optional(),
-      app: Joi.object()
-        .pattern(/.*/, Joi.string())
-        .required()
-        .unknown(true),
-    }).unknown(true).optional(),
-  }).required().unknown(true))
-}
-
-router
-  .post(
-    "/api/global/workspaces",
-    auth.adminOnly,
-    buildWorkspaceSaveValidation(),
-    controller.save
-  )
-  .delete("/api/global/workspaces/:id", auth.adminOnly, controller.destroy)
-  .get("/api/global/workspaces", controller.fetch)
-  .get("/api/global/workspaces/:id", controller.find)
-
-export default router