@budibase/server 2.5.6-alpha.3 → 2.5.6-alpha.30

package/dist/utilities/fileSystem/plugin.js

@@ -12,12 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDatasourcePlugin = exports.getPluginMetadata = void 0;
+exports.getAutomationPlugin = exports.getDatasourcePlugin = exports.getPluginMetadata = void 0;
 const budibaseDir_1 = require("../budibaseDir");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const backend_core_1 = require("@budibase/backend-core");
 const DATASOURCE_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "datasource");
+const AUTOMATION_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "automation");
 const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function* () {
     let metadata = {};
     try {
@@ -37,30 +38,39 @@ const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function*
     return { metadata, directory: path };
 });
 exports.getPluginMetadata = getPluginMetadata;
-const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+function getPluginImpl(path, plugin) {
     var _a;
-    const hash = (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash;
-    if (!fs_1.default.existsSync(DATASOURCE_PATH)) {
-        fs_1.default.mkdirSync(DATASOURCE_PATH);
-    }
-    const filename = (0, path_1.join)(DATASOURCE_PATH, plugin.name);
-    const metadataName = `${filename}.bbmetadata`;
-    if (fs_1.default.existsSync(filename)) {
-        const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
-        // if hash is the same return the file, otherwise remove it and re-download
-        if (currentHash === hash) {
-            return require(filename);
+    return __awaiter(this, void 0, void 0, function* () {
+        const hash = (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash;
+        if (!fs_1.default.existsSync(path)) {
+            fs_1.default.mkdirSync(path);
         }
-        else {
-            console.log(`Updating plugin: ${plugin.name}`);
-            delete require.cache[require.resolve(filename)];
-            fs_1.default.unlinkSync(filename);
+        const filename = (0, path_1.join)(path, plugin.name);
+        const metadataName = `${filename}.bbmetadata`;
+        if (fs_1.default.existsSync(filename)) {
+            const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
+            // if hash is the same return the file, otherwise remove it and re-download
+            if (currentHash === hash) {
+                return require(filename);
+            }
+            else {
+                console.log(`Updating plugin: ${plugin.name}`);
+                delete require.cache[require.resolve(filename)];
+                fs_1.default.unlinkSync(filename);
+            }
         }
-    }
-    const pluginKey = backend_core_1.objectStore.getPluginJSKey(plugin);
-    const pluginJs = yield backend_core_1.objectStore.retrieve(backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS, pluginKey);
-    fs_1.default.writeFileSync(filename, pluginJs);
-    fs_1.default.writeFileSync(metadataName, hash);
-    return require(filename);
+        const pluginKey = backend_core_1.objectStore.getPluginJSKey(plugin);
+        const pluginJs = yield backend_core_1.objectStore.retrieve(backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS, pluginKey);
+        fs_1.default.writeFileSync(filename, pluginJs);
+        fs_1.default.writeFileSync(metadataName, hash);
+        return require(filename);
+    });
+}
+const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+    return getPluginImpl(DATASOURCE_PATH, plugin);
 });
 exports.getDatasourcePlugin = getDatasourcePlugin;
+const getAutomationPlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+    return getPluginImpl(AUTOMATION_PATH, plugin);
+});
+exports.getAutomationPlugin = getAutomationPlugin;

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/dist/watch.js

@@ -18,7 +18,7 @@ const environment_1 = __importDefault(require("./environment"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const fs_1 = __importDefault(require("fs"));
 const backend_core_1 = require("@budibase/backend-core");
-const plugin_1 = require("./api/controllers/plugin");
+const plugins_1 = __importDefault(require("./sdk/plugins"));
 function watch() {
     const watchPath = path_1.default.join(environment_1.default.PLUGINS_DIR, "./**/*.tar.gz");
     chokidar_1.default
@@ -41,7 +41,7 @@ function watch() {
                 const split = path.split("/");
                 const name = split[split.length - 1];
                 console.log("Importing plugin:", path);
-                yield (0, plugin_1.processUploadedPlugin)({ name, path });
+                yield plugins_1.default.processUploaded({ name, path });
             }
             catch (err) {
                 const message = (err === null || err === void 0 ? void 0 : err.message) ? err === null || err === void 0 ? void 0 : err.message : err;

package/dist/websockets/client.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const websocket_1 = __importDefault(require("./websocket"));
+const authorized_1 = __importDefault(require("../middleware/authorized"));
+const backend_core_1 = require("@budibase/backend-core");
+class ClientAppWebsocket extends websocket_1.default {
+    constructor(app, server) {
+        super(app, server, "/socket/client", [(0, authorized_1.default)(backend_core_1.permissions.BUILDER)]);
+    }
+}
+exports.default = ClientAppWebsocket;

package/dist/websockets/grid.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const authorized_1 = __importDefault(require("../middleware/authorized"));
+const websocket_1 = __importDefault(require("./websocket"));
+const backend_core_1 = require("@budibase/backend-core");
+class GridSocket extends websocket_1.default {
+    constructor(app, server) {
+        super(app, server, "/socket/grid", [(0, authorized_1.default)(backend_core_1.permissions.BUILDER)]);
+        this.io.on("connection", socket => {
+            const user = socket.data.user;
+            console.log(`Spreadsheet user connected: ${user === null || user === void 0 ? void 0 : user.id}`);
+            // Socket state
+            let currentRoom;
+            // Initial identification of connected spreadsheet
+            socket.on("select-table", (tableId, callback) => __awaiter(this, void 0, void 0, function* () {
+                // Leave current room
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-disconnect", socket.data.user);
+                    socket.leave(currentRoom);
+                }
+                // Join new room
+                currentRoom = tableId;
+                socket.join(currentRoom);
+                socket.to(currentRoom).emit("user-update", socket.data.user);
+                // Reply with all users in current room
+                const sockets = yield this.io.in(currentRoom).fetchSockets();
+                callback({
+                    users: sockets.map(socket => socket.data.user),
+                    id: user.id,
+                });
+            }));
+            // Handle users selecting a new cell
+            socket.on("select-cell", cellId => {
+                socket.data.user.selectedCellId = cellId;
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-update", socket.data.user);
+                }
+            });
+            // Disconnection cleanup
+            socket.on("disconnect", () => {
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-disconnect", socket.data.user);
+                }
+            });
+        });
+    }
+}
+exports.default = GridSocket;

package/dist/websockets/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gridSocket = exports.clientAppSocket = exports.initialise = void 0;
+const grid_1 = __importDefault(require("./grid"));
+const client_1 = __importDefault(require("./client"));
+let clientAppSocket;
+exports.clientAppSocket = clientAppSocket;
+let gridSocket;
+exports.gridSocket = gridSocket;
+const initialise = (app, server) => {
+    exports.clientAppSocket = clientAppSocket = new client_1.default(app, server);
+    exports.gridSocket = gridSocket = new grid_1.default(app, server);
+};
+exports.initialise = initialise;

package/dist/websockets/websocket.js

@@ -0,0 +1,78 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const socket_io_1 = require("socket.io");
+const http_1 = __importDefault(require("http"));
+const cookies_1 = __importDefault(require("cookies"));
+const koa_useragent_1 = require("koa-useragent");
+const backend_core_1 = require("@budibase/backend-core");
+const currentapp_1 = __importDefault(require("../middleware/currentapp"));
+class Socket {
+    constructor(app, server, path, additionalMiddlewares) {
+        this.io = new socket_io_1.Server(server, {
+            path,
+        });
+        // Attach default middlewares
+        const authenticate = backend_core_1.auth.buildAuthMiddleware([], {
+            publicAllowed: true,
+        });
+        const middlewares = [
+            koa_useragent_1.userAgent,
+            authenticate,
+            currentapp_1.default,
+            ...(additionalMiddlewares || []),
+        ];
+        // Apply middlewares
+        this.io.use((socket, next) => __awaiter(this, void 0, void 0, function* () {
+            // Build fake koa context
+            const res = new http_1.default.ServerResponse(socket.request);
+            const ctx = Object.assign(Object.assign({}, app.createContext(socket.request, res)), { 
+                // Additional overrides needed to make our middlewares work with this
+                // fake koa context
+                cookies: new cookies_1.default(socket.request, res), get: (field) => socket.request.headers[field], throw: (code, message) => {
+                    throw new Error(message);
+                }, 
+                // Needed for koa-useragent middleware
+                headers: socket.request.headers, header: socket.request.headers, 
+                // We don't really care about the path since it will never contain
+                // an app ID
+                path: "/socket" });
+            // Run all koa middlewares
+            try {
+                for (let [idx, middleware] of middlewares.entries()) {
+                    yield middleware(ctx, () => {
+                        if (idx === middlewares.length - 1) {
+                            // Middlewares are finished.
+                            // Extract some data from our enriched koa context to persist
+                            // as metadata for the socket
+                            socket.data.user = {
+                                id: ctx.user._id,
+                                email: ctx.user.email,
+                            };
+                            next();
+                        }
+                    });
+                }
+            }
+            catch (error) {
+                next(error);
+            }
+        }));
+    }
+    // Emit an event to all sockets
+    emit(event, payload) {
+        this.io.sockets.emit(event, payload);
+    }
+}
+exports.default = Socket;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.6-alpha.3",
+  "version": "2.5.6-alpha.30",
   "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.3",
-    "@budibase/client": "2.5.6-alpha.3",
-    "@budibase/pro": "2.5.6-alpha.2",
-    "@budibase/shared-core": "2.5.6-alpha.3",
-    "@budibase/string-templates": "2.5.6-alpha.3",
-    "@budibase/types": "2.5.6-alpha.3",
+    "@budibase/backend-core": "2.5.6-alpha.30",
+    "@budibase/client": "2.5.6-alpha.30",
+    "@budibase/pro": "2.5.6-alpha.29",
+    "@budibase/shared-core": "2.5.6-alpha.30",
+    "@budibase/string-templates": "2.5.6-alpha.30",
+    "@budibase/types": "2.5.6-alpha.30",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -65,6 +65,7 @@
     "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",
@@ -108,14 +109,14 @@
     "redis": "4",
     "server-destroy": "1.0.1",
     "snowflake-promise": "^4.5.0",
-    "socket.io": "^4.5.1",
+    "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.16",
+    "vm2": "3.9.17",
     "worker-farm": "1.7.0",
     "xml2js": "0.5.0",
     "yargs": "13.2.4"
@@ -175,5 +176,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "38b2a2407eeb58c3f143c1d91d517e38b27cdd89"
+  "gitHead": "07ceb334c7ea3962f7268038653450a7be3a5ca8"
 }

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/automation.ts

@@ -16,9 +16,15 @@ import { setTestFlag, clearTestFlag } from "../../utilities/redis"
 import { context, cache, events } from "@budibase/backend-core"
 import { automations } from "@budibase/pro"
 import { Automation, BBContext } from "@budibase/types"
+import { getActionDefinitions as actionDefs } from "../../automations/actions"
 
-const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS)
-const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
+async function getActionDefinitions() {
+  return removeDeprecated(await actionDefs())
+}
+
+function getTriggerDefinitions() {
+  return removeDeprecated(triggers.TRIGGER_DEFINITIONS)
+}
 
 /*************************
  *                       *
@@ -228,17 +234,17 @@ export async function clearLogError(ctx: BBContext) {
 }
 
 export async function getActionList(ctx: BBContext) {
-  ctx.body = ACTION_DEFS
+  ctx.body = await getActionDefinitions()
 }
 
 export async function getTriggerList(ctx: BBContext) {
-  ctx.body = TRIGGER_DEFS
+  ctx.body = getTriggerDefinitions()
 }
 
 export async function getDefinitionList(ctx: BBContext) {
   ctx.body = {
-    trigger: TRIGGER_DEFS,
-    action: ACTION_DEFS,
+    trigger: getTriggerDefinitions(),
+    action: await getActionDefinitions(),
   }
 }
 

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/plugin/index.ts

@@ -1,31 +1,11 @@
-import { npmUpload, urlUpload, githubUpload, fileUpload } from "./uploaders"
-import {
-  plugins as pluginCore,
-  db as dbCore,
-  tenancy,
-  objectStore,
-} from "@budibase/backend-core"
-import { PluginType, FileType, PluginSource, Plugin } from "@budibase/types"
+import { npmUpload, urlUpload, githubUpload } from "./uploaders"
+import { plugins as pluginCore } from "@budibase/backend-core"
+import { PluginType, FileType, PluginSource } from "@budibase/types"
 import env from "../../../environment"
-import { ClientAppSocket } from "../../../websocket"
+import { clientAppSocket } from "../../../websockets"
+import sdk from "../../../sdk"
 import { sdk as pro } from "@budibase/pro"
 
-export async function getPlugins(type?: PluginType) {
-  const db = tenancy.getGlobalDB()
-  const response = await db.allDocs(
-    dbCore.getPluginParams(null, {
-      include_docs: true,
-    })
-  )
-  let plugins = response.rows.map((row: any) => row.doc) as Plugin[]
-  plugins = objectStore.enrichPluginURLs(plugins)
-  if (type) {
-    return plugins.filter((plugin: Plugin) => plugin.schema?.type === type)
-  } else {
-    return plugins
-  }
-}
-
 export async function upload(ctx: any) {
   const plugins: FileType[] =
     ctx.request.files.file.length > 1
@@ -35,7 +15,7 @@ export async function upload(ctx: any) {
     let docs = []
     // can do single or multiple plugins
     for (let plugin of plugins) {
-      const doc = await processUploadedPlugin(plugin, PluginSource.FILE)
+      const doc = await sdk.plugins.processUploaded(plugin, PluginSource.FILE)
       docs.push(doc)
     }
     ctx.body = {
@@ -91,7 +71,7 @@ export async function create(ctx: any) {
 
     const doc = await pro.plugins.storePlugin(metadata, directory, source)
 
-    ClientAppSocket.emit("plugins-update", { name, hash: doc.hash })
+    clientAppSocket.emit("plugins-update", { name, hash: doc.hash })
     ctx.body = {
       message: "Plugin uploaded successfully",
       plugins: [doc],
@@ -105,7 +85,7 @@ export async function create(ctx: any) {
 }
 
 export async function fetch(ctx: any) {
-  ctx.body = await getPlugins()
+  ctx.body = await sdk.plugins.fetch()
 }
 
 export async function destroy(ctx: any) {
@@ -119,20 +99,3 @@ export async function destroy(ctx: any) {
     ctx.throw(400, err.message)
   }
 }
-
-export async function processUploadedPlugin(
-  plugin: FileType,
-  source?: PluginSource
-) {
-  const { metadata, directory } = await fileUpload(plugin)
-  pluginCore.validate(metadata?.schema)
-
-  // Only allow components in cloud
-  if (!env.SELF_HOSTED && metadata?.schema?.type !== PluginType.COMPONENT) {
-    throw new Error("Only component plugins are supported outside of self-host")
-  }
-
-  const doc = await pro.plugins.storePlugin(metadata, directory, source)
-  ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash })
-  return doc
-}

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

@@ -245,7 +245,7 @@ async function execute(
     }
     const runFn = () => Runner.run(inputs)
 
-    const { rows, pagination, extra } = await quotas.addQuery(runFn, {
+    const { rows, pagination, extra, info } = await quotas.addQuery(runFn, {
       datasourceId: datasource._id,
     })
     // remove the raw from execution incase transformer being used to hide data
@@ -255,7 +255,7 @@ async function execute(
     if (opts && opts.rowsOnly) {
       ctx.body = rows
     } else {
-      ctx.body = { data: rows, pagination, ...extra }
+      ctx.body = { data: rows, pagination, ...extra, ...info }
     }
   } catch (err) {
     ctx.throw(400, err)

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/controllers/table/utils.ts

@@ -110,21 +110,28 @@ export function importToRows(
   table: Table,
   user: ContextUser | null = null
 ) {
+  let originalTable = table
   let finalData: any = []
   for (let i = 0; i < data.length; i++) {
     let row = data[i]
     row._id = generateRowID(table._id!)
     row.tableId = table._id
+
+    // We use a reference to table here and update it after input processing,
+    // so that we can auto increment auto IDs in imported data properly
     const processed = inputProcessing(user, table, row, {
       noAutoRelationships: true,
     })
     row = processed.row
     table = processed.table
 
-    for (const [fieldName, schema] of Object.entries(table.schema)) {
-      // check whether the options need to be updated for inclusion as part of the data import
+    // However here we must reference the original table, as we want to mutate
+    // the real schema of the table passed in, not the clone used for
+    // incrementing auto IDs
+    for (const [fieldName, schema] of Object.entries(originalTable.schema)) {
       if (
-        schema.type === FieldTypes.OPTIONS &&
+        (schema.type === FieldTypes.OPTIONS ||
+          schema.type === FieldTypes.ARRAY) &&
         row[fieldName] &&
         (!schema.constraints!.inclusion ||
           schema.constraints!.inclusion.indexOf(row[fieldName]) === -1)