@budibase/server 2.5.6-alpha.22 → 2.5.6-alpha.24

package/dist/utilities/rowProcessor/utils.js

@@ -46,17 +46,16 @@ function processFormulas(table, rows, { dynamic, contextRows } = { dynamic: true
     for (let [column, schema] of Object.entries(table.schema)) {
         const isStatic = schema.formulaType === constants_1.FormulaTypes.STATIC;
         if (schema.type !== constants_1.FieldTypes.FORMULA ||
+            schema.formula == null ||
             (dynamic && isStatic) ||
             (!dynamic && !isStatic)) {
             continue;
         }
         // iterate through rows and process formula
         for (let i = 0; i < rowArray.length; i++) {
-            if (schema.formula) {
-                let row = rowArray[i];
-                let context = contextRows ? contextRows[i] : row;
-                rowArray[i] = Object.assign(Object.assign({}, row), { [column]: (0, string_templates_1.processStringSync)(schema.formula, context) });
-            }
+            let row = rowArray[i];
+            let context = contextRows ? contextRows[i] : row;
+            rowArray[i] = Object.assign(Object.assign({}, row), { [column]: (0, string_templates_1.processStringSync)(schema.formula, context) });
         }
     }
     return single ? rowArray[0] : rowArray;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.6-alpha.22",
+  "version": "2.5.6-alpha.24",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.5.6-alpha.22",
-    "@budibase/client": "2.5.6-alpha.22",
+    "@budibase/backend-core": "2.5.6-alpha.24",
+    "@budibase/client": "2.5.6-alpha.24",
     "@budibase/pro": "2.5.6-alpha.20",
-    "@budibase/shared-core": "2.5.6-alpha.22",
-    "@budibase/string-templates": "2.5.6-alpha.22",
-    "@budibase/types": "2.5.6-alpha.22",
+    "@budibase/shared-core": "2.5.6-alpha.24",
+    "@budibase/string-templates": "2.5.6-alpha.24",
+    "@budibase/types": "2.5.6-alpha.24",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -176,5 +176,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "38a2b62aadc5d16a0be0ea820b6931f62b047100"
+  "gitHead": "0dde2b68cca70b0088f7fb037f3c6949d7a3618a"
 }

package/src/api/controllers/application.ts

@@ -1,5 +1,4 @@
 import env from "../../environment"
-import packageJson from "../../../package.json"
 import {
   createLinkView,
   createRoutingView,
@@ -24,6 +23,7 @@ import {
   migrations,
   objectStore,
   ErrorCode,
+  env as envCore,
 } from "@budibase/backend-core"
 import { USERS_TABLE_SCHEMA } from "../../constants"
 import { buildDefaultDocs } from "../../db/defaultData/datasource_bb_default"
@@ -264,7 +264,7 @@ async function performAppCreate(ctx: UserCtx) {
       _rev: undefined,
       appId,
       type: "app",
-      version: packageJson.version,
+      version: envCore.VERSION,
       componentLibraries: ["@budibase/standard-components"],
       name: name,
       url: url,
@@ -433,7 +433,7 @@ export async function updateClient(ctx: UserCtx) {
   }
 
   // Update versions in app package
-  const updatedToVersion = packageJson.version
+  const updatedToVersion = envCore.VERSION
   const appPackageUpdates = {
     version: updatedToVersion,
     revertableVersion: currentVersion,

package/src/api/controllers/dev.ts

@@ -4,7 +4,7 @@ import { checkSlashesInUrl } from "../../utilities"
 import { request } from "../../utilities/workerRequests"
 import { clearLock as redisClearLock } from "../../utilities/redis"
 import { DocumentType } from "../../db/utils"
-import { context } from "@budibase/backend-core"
+import { context, env as envCore } from "@budibase/backend-core"
 import { events, db as dbCore, cache } from "@budibase/backend-core"
 
 async function redirect(ctx: any, method: string, path: string = "global") {
@@ -121,7 +121,7 @@ export async function revert(ctx: any) {
 }
 
 export async function getBudibaseVersion(ctx: any) {
-  const version = require("../../../package.json").version
+  const version = envCore.VERSION
   ctx.body = {
     version,
   }

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

@@ -1,31 +1,32 @@
 import {
+  Datasource,
+  FieldSchema,
+  FieldType,
   FilterType,
   IncludeRelationship,
   Operation,
   PaginationJson,
   RelationshipsJson,
+  RelationshipTypes,
+  Row,
   SearchFilters,
   SortJson,
-  Datasource,
-  FieldSchema,
-  Row,
-  Table,
-  RelationshipTypes,
-  FieldType,
   SortType,
+  Table,
 } from "@budibase/types"
 import {
+  breakExternalTableId,
   breakRowIdField,
+  convertRowId,
   generateRowIdField,
   isRowId,
-  convertRowId,
+  isSQL,
 } from "../../../integrations/utils"
 import { getDatasourceAndQuery } from "./utils"
 import { FieldTypes } from "../../../constants"
-import { breakExternalTableId, isSQL } from "../../../integrations/utils"
 import { processObjectSync } from "@budibase/string-templates"
 import { cloneDeep } from "lodash/fp"
-import { processFormulas, processDates } from "../../../utilities/rowProcessor"
+import { processDates, processFormulas } from "../../../utilities/rowProcessor"
 import { db as dbCore } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 
@@ -382,10 +383,18 @@ export class ExternalRequest {
       }
       const display = linkedTable.primaryDisplay
       for (let key of Object.keys(row[relationship.column])) {
-        const related: Row = row[relationship.column][key]
+        let relatedRow: Row = row[relationship.column][key]
+        // add this row as context for the relationship
+        for (let col of Object.values(linkedTable.schema)) {
+          if (col.type === FieldType.LINK && col.tableId === table._id) {
+            relatedRow[col.name] = [row]
+          }
+        }
+        relatedRow = processFormulas(linkedTable, relatedRow)
+        const relatedDisplay = display ? relatedRow[display] : undefined
         row[relationship.column][key] = {
-          primaryDisplay: display ? related[display] : undefined,
-          _id: related._id,
+          primaryDisplay: relatedDisplay || "Invalid display column",
+          _id: relatedRow._id,
         }
       }
     }

package/src/api/index.ts

@@ -1,9 +1,8 @@
 import Router from "@koa/router"
-import { auth, middleware } from "@budibase/backend-core"
+import { auth, middleware, env as envCore } from "@budibase/backend-core"
 import currentApp from "../middleware/currentapp"
 import zlib from "zlib"
 import { mainRoutes, staticRoutes, publicRoutes } from "./routes"
-import pkg from "../../package.json"
 import { middleware as pro } from "@budibase/pro"
 export { shutdown } from "./routes/public"
 const compress = require("koa-compress")
@@ -11,7 +10,7 @@ const compress = require("koa-compress")
 export const router: Router = new Router()
 
 router.get("/health", ctx => (ctx.status = 200))
-router.get("/version", ctx => (ctx.body = pkg.version))
+router.get("/version", ctx => (ctx.body = envCore.VERSION))
 
 router.use(middleware.errorHandling)
 

package/src/integration-test/postgres.spec.ts

@@ -921,6 +921,7 @@ describe("row api - postgres", () => {
             [m2mFieldName]: [
               {
                 _id: row._id,
+                primaryDisplay: "Invalid display column",
               },
             ],
           })
@@ -929,6 +930,7 @@ describe("row api - postgres", () => {
             [m2mFieldName]: [
               {
                 _id: row._id,
+                primaryDisplay: "Invalid display column",
               },
             ],
           })

package/src/integrations/base/sqlTable.ts

@@ -79,10 +79,17 @@ function generateSchema(
           if (!relatedTable) {
             throw "Referenced table doesn't exist"
           }
-          schema.integer(column.foreignKey).unsigned()
+          const relatedPrimary = relatedTable.primary[0]
+          const externalType = relatedTable.schema[relatedPrimary].externalType
+          if (externalType) {
+            schema.specificType(column.foreignKey, externalType)
+          } else {
+            schema.integer(column.foreignKey).unsigned()
+          }
+
           schema
             .foreign(column.foreignKey)
-            .references(`${tableName}.${relatedTable.primary[0]}`)
+            .references(`${tableName}.${relatedPrimary}`)
         }
         break
     }

package/src/utilities/rowProcessor/utils.ts

@@ -1,11 +1,11 @@
 import {
-  FieldTypes,
-  FormulaTypes,
   AutoFieldDefaultNames,
   AutoFieldSubTypes,
+  FieldTypes,
+  FormulaTypes,
 } from "../../constants"
 import { processStringSync } from "@budibase/string-templates"
-import { FieldSchema, Table, Row } from "@budibase/types"
+import { FieldSchema, FieldType, Row, Table } from "@budibase/types"
 
 /**
  * If the subtype has been lost for any reason this works out what
@@ -50,6 +50,7 @@ export function processFormulas(
     const isStatic = schema.formulaType === FormulaTypes.STATIC
     if (
       schema.type !== FieldTypes.FORMULA ||
+      schema.formula == null ||
       (dynamic && isStatic) ||
       (!dynamic && !isStatic)
     ) {
@@ -57,13 +58,11 @@ export function processFormulas(
     }
     // iterate through rows and process formula
     for (let i = 0; i < rowArray.length; i++) {
-      if (schema.formula) {
-        let row = rowArray[i]
-        let context = contextRows ? contextRows[i] : row
-        rowArray[i] = {
-          ...row,
-          [column]: processStringSync(schema.formula, context),
-        }
+      let row = rowArray[i]
+      let context = contextRows ? contextRows[i] : row
+      rowArray[i] = {
+        ...row,
+        [column]: processStringSync(schema.formula, context),
       }
     }
   }

package/tsconfig.build.json

@@ -8,13 +8,11 @@
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "incremental": true,
-    "types": [ "node", "jest" ],
-    "outDir": "dist",
+    "types": ["node", "jest"],
+    "outDir": "dist/src",
     "skipLibCheck": true
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "node_modules",
     "dist",

package/tsconfig.json

@@ -5,6 +5,7 @@
     "declaration": true,
     "sourceMap": true,
     "baseUrl": ".",
+    "outDir": "dist",
     "paths": {
       "@budibase/types": ["../types/src"],
       "@budibase/backend-core": ["../backend-core/src"],
@@ -23,6 +24,6 @@
     { "path": "../shared-core" },
     { "path": "../../../budibase-pro/packages/pro" }
   ],
-  "include": ["src/**/*", "specs", "package.json"],
+  "include": ["src/**/*", "specs"],
   "exclude": ["node_modules", "dist"]
 }

package/dist/package.json

@@ -1,180 +0,0 @@
-{
-    "name": "@budibase/server",
-    "email": "hi@budibase.com",
-    "version": "2.5.6-alpha.21",
-    "description": "Budibase Web Server",
-    "main": "src/index.ts",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/Budibase/budibase.git"
-    },
-    "scripts": {
-        "prebuild": "rimraf dist/",
-        "build": "tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/",
-        "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
-        "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
-        "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/",
-        "test": "bash scripts/test.sh",
-        "test:memory": "jest --maxWorkers=2 --logHeapUsage --forceExit",
-        "test:watch": "jest --watch",
-        "predocker": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client",
-        "build:docker": "yarn run predocker && docker build . -t app-service --label version=$BUDIBASE_RELEASE_VERSION",
-        "build:docs": "node ./scripts/docs/generate.js open",
-        "run:docker": "node dist/index.js",
-        "run:docker:cluster": "pm2-runtime start pm2.config.js",
-        "dev:stack:up": "node scripts/dev/manage.js up",
-        "dev:stack:down": "node scripts/dev/manage.js down",
-        "dev:stack:nuke": "node scripts/dev/manage.js nuke",
-        "dev:builder": "yarn run dev:stack:up && nodemon",
-        "dev:built": "yarn run dev:stack:up && yarn run run:docker",
-        "specs": "ts-node specs/generate.ts && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
-        "initialise": "node scripts/initialise.js",
-        "env:multi:enable": "node scripts/multiTenancy.js enable",
-        "env:multi:disable": "node scripts/multiTenancy.js disable",
-        "env:selfhost:enable": "node scripts/selfhost.js enable",
-        "env:selfhost:disable": "node scripts/selfhost.js disable",
-        "env:localdomain:enable": "node scripts/localdomain.js enable",
-        "env:localdomain:disable": "node scripts/localdomain.js disable",
-        "env:account:enable": "node scripts/account.js enable",
-        "env:account:disable": "node scripts/account.js disable"
-    },
-    "keywords": [
-        "budibase"
-    ],
-    "author": "Budibase",
-    "license": "GPL-3.0",
-    "dependencies": {
-        "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "2.5.6-alpha.21",
-        "@budibase/client": "2.5.6-alpha.21",
-        "@budibase/pro": "2.5.6-alpha.20",
-        "@budibase/shared-core": "2.5.6-alpha.21",
-        "@budibase/string-templates": "2.5.6-alpha.21",
-        "@budibase/types": "2.5.6-alpha.21",
-        "@bull-board/api": "3.7.0",
-        "@bull-board/koa": "3.9.4",
-        "@elastic/elasticsearch": "7.10.0",
-        "@google-cloud/firestore": "5.0.2",
-        "@koa/router": "8.0.8",
-        "@sendgrid/mail": "7.1.1",
-        "@sentry/node": "6.17.7",
-        "airtable": "0.10.1",
-        "arangojs": "7.2.0",
-        "aws-sdk": "2.1030.0",
-        "bcryptjs": "2.4.3",
-        "bull": "4.10.1",
-        "chmodr": "1.2.0",
-        "chokidar": "3.5.3",
-        "cookies": "0.8.0",
-        "csvtojson": "2.0.10",
-        "curlconverter": "3.21.0",
-        "dd-trace": "3.13.2",
-        "dotenv": "8.2.0",
-        "download": "8.0.0",
-        "elastic-apm-node": "3.38.0",
-        "fix-path": "3.0.0",
-        "form-data": "4.0.0",
-        "fs-extra": "8.1.0",
-        "global-agent": "3.0.0",
-        "google-auth-library": "7.12.0",
-        "google-spreadsheet": "3.2.0",
-        "jimp": "0.16.1",
-        "joi": "17.6.0",
-        "js-yaml": "4.1.0",
-        "jsonschema": "1.4.0",
-        "knex": "2.4.0",
-        "koa": "2.13.4",
-        "koa-body": "4.2.0",
-        "koa-compress": "4.0.1",
-        "koa-connect": "2.1.0",
-        "koa-send": "5.0.0",
-        "koa-session": "5.12.0",
-        "koa-static": "5.0.0",
-        "koa-useragent": "^4.1.0",
-        "koa2-ratelimit": "1.1.1",
-        "lodash": "4.17.21",
-        "memorystream": "0.3.1",
-        "mongodb": "4.9",
-        "mssql": "6.2.3",
-        "mysql2": "2.3.3",
-        "node-fetch": "2.6.7",
-        "open": "8.4.0",
-        "pg": "8.5.1",
-        "posthog-node": "1.3.0",
-        "pouchdb": "7.3.0",
-        "pouchdb-adapter-memory": "7.2.2",
-        "pouchdb-all-dbs": "1.0.2",
-        "pouchdb-find": "7.2.2",
-        "pouchdb-replication-stream": "1.2.9",
-        "redis": "4",
-        "server-destroy": "1.0.1",
-        "snowflake-promise": "^4.5.0",
-        "socket.io": "4.6.1",
-        "svelte": "3.49.0",
-        "swagger-parser": "10.0.3",
-        "tar": "6.1.11",
-        "to-json-schema": "0.2.5",
-        "uuid": "3.3.2",
-        "validate.js": "0.13.1",
-        "vm2": "3.9.17",
-        "worker-farm": "1.7.0",
-        "xml2js": "0.5.0",
-        "yargs": "13.2.4"
-    },
-    "devDependencies": {
-        "@babel/core": "7.17.4",
-        "@babel/preset-env": "7.16.11",
-        "@budibase/standard-components": "^0.9.139",
-        "@jest/test-sequencer": "29.5.0",
-        "@swc/core": "^1.3.25",
-        "@swc/jest": "^0.2.24",
-        "@trendyol/jest-testcontainers": "^2.1.1",
-        "@types/apidoc": "0.50.0",
-        "@types/bson": "4.2.0",
-        "@types/global-agent": "2.1.1",
-        "@types/google-spreadsheet": "3.1.5",
-        "@types/ioredis": "4.28.10",
-        "@types/jest": "29.5.0",
-        "@types/koa": "2.13.4",
-        "@types/koa__router": "8.0.8",
-        "@types/lodash": "4.14.180",
-        "@types/node": "14.18.20",
-        "@types/node-fetch": "2.6.1",
-        "@types/oracledb": "5.2.2",
-        "@types/pouchdb": "6.4.0",
-        "@types/redis": "4.0.11",
-        "@types/server-destroy": "1.0.1",
-        "@types/supertest": "2.0.12",
-        "@types/tar": "6.1.3",
-        "@typescript-eslint/parser": "5.45.0",
-        "apidoc": "0.50.4",
-        "babel-jest": "29.5.0",
-        "copyfiles": "2.4.1",
-        "docker-compose": "0.23.17",
-        "eslint": "6.8.0",
-        "ioredis-mock": "7.2.0",
-        "is-wsl": "2.2.0",
-        "jest": "29.5.0",
-        "jest-openapi": "0.14.2",
-        "jest-runner": "29.5.0",
-        "jest-serial-runner": "^1.2.1",
-        "nodemon": "2.0.15",
-        "openapi-types": "9.3.1",
-        "openapi-typescript": "5.2.0",
-        "path-to-regexp": "6.2.0",
-        "prettier": "2.5.1",
-        "rimraf": "3.0.2",
-        "supertest": "6.2.2",
-        "swagger-jsdoc": "6.1.0",
-        "timekeeper": "2.2.0",
-        "ts-jest": "29.0.5",
-        "ts-node": "10.8.1",
-        "tsconfig-paths": "4.0.0",
-        "typescript": "4.7.3",
-        "update-dotenv": "1.1.1"
-    },
-    "optionalDependencies": {
-        "oracledb": "5.3.0"
-    },
-    "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}