Merge branch 'master' of github.com:Budibase/budibase into fix/sql-many-relationships

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.31.2",
+  "version": "2.31.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

packages/account-portal

@@ -1 +1 @@
-Subproject commit 516b27b74cbcb7069a25f5e738dc91c22d7c4538
+Subproject commit c403315c5fa09a05dfd8fa4cd1890acfd8de0430

packages/bbui/src/Modal/Modal.svelte

@@ -10,7 +10,7 @@
   export let inline = false
   export let disableCancel = false
   export let autoFocus = true
-  export let zIndex = 999
+  export let zIndex = 1001
 
   const dispatch = createEventDispatcher()
   let visible = fixed || inline

packages/pro

@@ -1 +1 @@
-Subproject commit 51a83b791a7a11b1d51c1fdb91f2ac246298279e
+Subproject commit f2862855dcfeb4f4a28d6902daf411ec8f4a28e8

packages/server/src/middleware/trimViewRowInfo.ts

@@ -1,10 +1,10 @@
-import { Ctx, Row } from "@budibase/types"
+import { Ctx, Row, ViewV2 } from "@budibase/types"
 
 import sdk from "../sdk"
 import { Next } from "koa"
 import { getSourceId } from "../api/controllers/row/utils"
 
-export default async (ctx: Ctx<Row>, next: Next) => {
+export default async (ctx: Ctx<Row, Row>, next: Next) => {
   const { body } = ctx.request
   const viewId = getSourceId(ctx).viewId ?? body._viewId
 
@@ -14,22 +14,31 @@ export default async (ctx: Ctx<Row>, next: Next) => {
   }
 
   // don't need to trim delete requests
-  if (ctx?.method?.toLowerCase() !== "delete") {
-    await trimViewFields(ctx.request.body, viewId)
+  const trimFields = ctx?.method?.toLowerCase() !== "delete"
+  if (!trimFields) {
+    return next()
   }
 
-  return next()
+  const view = await sdk.views.get(viewId)
+  ctx.request.body = await trimNonViewFields(ctx.request.body, view, "WRITE")
+
+  await next()
+
+  ctx.body = await trimNonViewFields(ctx.body, view, "READ")
 }
 
 // have to mutate the koa context, can't return
-export async function trimViewFields(body: Row, viewId: string): Promise<void> {
-  const view = await sdk.views.get(viewId)
-  const allowedKeys = sdk.views.allowedFields(view)
+export async function trimNonViewFields(
+  row: Row,
+  view: ViewV2,
+  permission: "WRITE" | "READ"
+): Promise<Row> {
+  row = { ...row }
+  const allowedKeys = sdk.views.allowedFields(view, permission)
   // have to mutate the context, can't update reference
-  const toBeRemoved = Object.keys(body).filter(
-    key => !allowedKeys.includes(key)
-  )
+  const toBeRemoved = Object.keys(row).filter(key => !allowedKeys.includes(key))
   for (let removeKey of toBeRemoved) {
-    delete body[removeKey]
+    delete row[removeKey]
   }
+  return row
 }

packages/server/src/sdk/app/views/index.ts

@@ -13,7 +13,6 @@ import {
   PROTECTED_EXTERNAL_COLUMNS,
   PROTECTED_INTERNAL_COLUMNS,
 } from "@budibase/shared-core"
-import { cloneDeep } from "lodash/fp"
 
 import * as utils from "../../../db/utils"
 import { isExternalTableID } from "../../../integrations/utils"
@@ -139,14 +138,20 @@ export async function remove(viewId: string): Promise<ViewV2> {
   return pickApi(tableId).remove(viewId)
 }
 
-export function allowedFields(view: View | ViewV2) {
+export function allowedFields(
+  view: View | ViewV2,
+  permission: "WRITE" | "READ"
+) {
   return [
     ...Object.keys(view?.schema || {}).filter(key => {
       if (!isV2(view)) {
         return true
       }
       const fieldSchema = view.schema![key]
-      return fieldSchema.visible && !fieldSchema.readonly
+      if (permission === "WRITE") {
+        return fieldSchema.visible && !fieldSchema.readonly
+      }
+      return fieldSchema.visible
     }),
     ...PROTECTED_EXTERNAL_COLUMNS,
     ...PROTECTED_INTERNAL_COLUMNS,
@@ -157,17 +162,19 @@ export function enrichSchema(
   view: ViewV2,
   tableSchema: TableSchema
 ): ViewV2Enriched {
-  let schema = cloneDeep(tableSchema)
+  let schema: TableSchema = {}
   const anyViewOrder = Object.values(view.schema || {}).some(
     ui => ui.order != null
   )
-  for (const key of Object.keys(schema)) {
+  for (const key of Object.keys(tableSchema).filter(
+    key => tableSchema[key].visible !== false
+  )) {
     // if nothing specified in view, then it is not visible
     const ui = view.schema?.[key] || { visible: false }
     schema[key] = {
-      ...schema[key],
+      ...tableSchema[key],
       ...ui,
-      order: anyViewOrder ? ui?.order ?? undefined : schema[key].order,
+      order: anyViewOrder ? ui?.order ?? undefined : tableSchema[key].order,
     }
   }
 

packages/server/src/sdk/app/views/tests/views.spec.ts

@@ -101,14 +101,6 @@ describe("table sdk", () => {
               type: "number",
             },
           },
-          hiddenField: {
-            type: "string",
-            name: "hiddenField",
-            visible: false,
-            constraints: {
-              type: "string",
-            },
-          },
         },
       })
     })
@@ -143,10 +135,6 @@ describe("table sdk", () => {
             ...basicTable.schema.id,
             visible: true,
           },
-          hiddenField: {
-            ...basicTable.schema.hiddenField,
-            visible: false,
-          },
         },
       })
     })
@@ -181,10 +169,6 @@ describe("table sdk", () => {
             ...basicTable.schema.id,
             visible: false,
           },
-          hiddenField: {
-            ...basicTable.schema.hiddenField,
-            visible: false,
-          },
         },
       })
     })
@@ -209,7 +193,6 @@ describe("table sdk", () => {
         expect.objectContaining({
           ...view,
           schema: {
-            ...basicTable.schema,
             name: {
               type: "string",
               name: "name",
@@ -264,7 +247,6 @@ describe("table sdk", () => {
         expect.objectContaining({
           ...view,
           schema: {
-            ...basicTable.schema,
             name: {
               type: "string",
               name: "name",