@budibase/server 3.26.3 → 3.27.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "3.26.3",
+  "version": "3.27.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -61,7 +61,7 @@
     "@elastic/elasticsearch": "7.10.0",
     "@google-cloud/firestore": "7.8.0",
     "@koa/cors": "5.0.0",
-    "@koa/router": "13.1.1",
+    "@koa/router": "15.3.0",
     "@octokit/rest": "^20.0.0",
     "@socket.io/redis-adapter": "^8.2.1",
     "@types/xml2js": "^0.4.14",
@@ -148,7 +148,6 @@
     "@types/koa": "2.13.4",
     "@types/koa-send": "^4.1.6",
     "@types/koa__cors": "5.0.0",
-    "@types/koa__router": "12.0.4",
     "@types/lodash": "4.14.200",
     "@types/mailparser": "^3.4.6",
     "@types/mssql": "9.1.5",
@@ -226,5 +225,5 @@
       }
     }
   },
-  "gitHead": "69ab5e17bf9ccdac19b3bccd30352b936942129a"
+  "gitHead": "7fc04647584c83a2d70f302fa88f2569580f7539"
 }

package/src/api/controllers/assets.ts

@@ -8,5 +8,6 @@ import send from "koa-send"
 export const serveBuilderAssets = async function (ctx: Ctx<void, void>) {
   let topLevelPath = env.isDev() ? DEV_ASSET_PATH : TOP_LEVEL_PATH
   const builderPath = join(topLevelPath, "builder")
-  await send(ctx, ctx.file, { root: builderPath })
+  const file = ctx.file || "index.html"
+  await send(ctx, file, { root: builderPath })
 }

package/src/api/controllers/dev.ts

@@ -17,7 +17,9 @@ async function redirect(
   method: "GET" | "POST" | "DELETE",
   path = "global"
 ) {
-  const { devPath } = ctx.params
+  const devPath = Array.isArray(ctx.params.devPath)
+    ? ctx.params.devPath.join("/")
+    : ctx.params.devPath
   const queryString = ctx.originalUrl.split("?")[1] || ""
   const response = await fetch(
     checkSlashesInUrl(

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

@@ -406,7 +406,9 @@ export const serveClientLibrary = async function (
 }
 
 export const serve3rdPartyFile = async function (ctx: Ctx) {
-  const { file } = ctx.params
+  const file = Array.isArray(ctx.params.file)
+    ? ctx.params.file.join("/")
+    : ctx.params.file
 
   const workspaceId = context.getWorkspaceId()
   if (!workspaceId) {

package/src/api/controllers/view/viewsV2.ts

@@ -205,7 +205,7 @@ async function handleViewEvents(existingView: ViewV2, view: ViewV2) {
     for (const column in view.schema[key]?.columns ?? []) {
       // if the new column is visible and it wasn't before
       if (
-        !existingView?.schema?.[key].columns?.[column].visible &&
+        !existingView?.schema?.[key].columns?.[column]?.visible &&
         view.schema?.[key].columns?.[column].visible
       ) {
         // new view join exposing a column

package/src/api/routes/assets.ts

@@ -6,6 +6,7 @@ const router: Router = new Router()
 
 addFileManagement(router)
 
-router.get("/builder/:file*", serveBuilderAssets)
+router.get("/builder", serveBuilderAssets)
+router.get("/builder/*file", serveBuilderAssets)
 
 export default router

package/src/api/routes/dev.ts

@@ -4,9 +4,9 @@ import { builderRoutes, publicRoutes } from "./endpointGroups"
 
 function redirectPath(path: string) {
   publicRoutes
-    .get(`/api/${path}/:devPath(.*)`, controller.buildRedirectGet(path))
-    .post(`/api/${path}/:devPath(.*)`, controller.buildRedirectPost(path))
-    .delete(`/api/${path}/:devPath(.*)`, controller.buildRedirectDelete(path))
+    .get(`/api/${path}/*devPath`, controller.buildRedirectGet(path))
+    .post(`/api/${path}/*devPath`, controller.buildRedirectPost(path))
+    .delete(`/api/${path}/*devPath`, controller.buildRedirectDelete(path))
 }
 
 if (env.isDev() || env.isTest()) {

package/src/api/routes/static.ts

@@ -18,7 +18,7 @@ router
     ctx.redirect("/builder/bblogo.png")
   })
   .get("/api/assets/:appId/client", controller.serveClientLibrary)
-  .get("/api/assets/:appId/:file(.*)", controller.serve3rdPartyFile)
+  .get("/api/assets/:appId/*file", controller.serve3rdPartyFile)
   .get("/api/apps/:appId/manifest.json", controller.servePwaManifest)
   .post("/api/attachments/process", authorized(BUILDER), controller.uploadFile)
   .post("/api/pwa/process-zip", authorized(BUILDER), controller.processPWAZip)
@@ -35,8 +35,10 @@ router
     controller.serveBuilderPreview
   )
   .get("/app/service-worker.js", controller.serveServiceWorker)
-  .get("/app/:appUrl/:path*", controller.serveApp)
-  .get(`/${devAppIdPath}/:path*`, controller.serveApp)
+  .get("/app/:appUrl", controller.serveApp)
+  .get("/app/:appUrl/*path", controller.serveApp)
+  .get(`/${devAppIdPath}`, controller.serveApp)
+  .get(`/${devAppIdPath}/*path`, controller.serveApp)
   .post(
     "/api/attachments/:datasourceId/url",
     recaptcha,

package/src/api/utils.ts

@@ -6,7 +6,11 @@ import Router from "@koa/router"
 export function addFileManagement(router: Router) {
   /* istanbul ignore next */
   router.param("file", async (file: any, ctx: any, next: () => void) => {
-    ctx.file = file && file.includes(".") ? file : "index.html"
+    const normalizedFile = Array.isArray(file) ? file.join("/") : file
+    ctx.file =
+      normalizedFile && normalizedFile.includes(".")
+        ? normalizedFile
+        : "index.html"
     if (!ctx.file.startsWith("budibase-client")) {
       return next()
     }

package/src/constants/paths.ts

@@ -1,3 +1,3 @@
 import { DocumentType } from "@budibase/types"
 
-export const devAppIdPath = `:appId(${DocumentType.WORKSPACE_DEV}_.+)`
+export const devAppIdPath = `${DocumentType.WORKSPACE_DEV}_:appId`

package/src/sdk/workspace/rows/queryUtils.ts

@@ -68,6 +68,7 @@ export const getQueryableFields = async (
         continue
       }
       if (isRelationship) {
+        result.push(field)
         try {
           const relatedTable = await sdk.tables.getTable(subSchema.tableId)
           const relatedFields = await extractTableFields(

package/src/sdk/workspace/tables/duplicate.ts

@@ -23,6 +23,7 @@ export async function duplicate(table: Table, userId?: string): Promise<Table> {
     sourceType: table.sourceType,
     sourceId: table.sourceId,
     schema: { ...table.schema },
+    primaryDisplay: table.primaryDisplay,
     views: {},
     indexes: table.indexes ? { ...table.indexes } : undefined,
     // Don't include any data/rows - this is intentionally empty