@budibase/server 2.6.19-alpha.48 → 2.6.19-alpha.49

package/dist/index.js

@@ -1512,6 +1512,7 @@ var init_misc = __esm({
       Header2["LICENSE_KEY"] = "x-budibase-license-key";
       Header2["API_VER"] = "x-budibase-api-version";
       Header2["APP_ID"] = "x-budibase-app-id";
+      Header2["SESSION_ID"] = "x-budibase-session-id";
       Header2["TYPE"] = "x-budibase-type";
       Header2["PREVIEW_ROLE"] = "x-budibase-role";
       Header2["TENANT_ID"] = "x-budibase-tenant-id";
@@ -21290,7 +21291,9 @@ async function attachFullLinkedDocs(table2, rows2) {
 }
 async function squashLinksToPrimaryDisplay(table2, enriched) {
   const linkedTables = [table2];
-  for (let row2 of enriched) {
+  const isArray = Array.isArray(enriched);
+  let enrichedArray = !isArray ? [enriched] : enriched;
+  for (let row2 of enrichedArray) {
     const rowTable = await getLinkedTable(row2.tableId, linkedTables);
     for (let [column, schema] of Object.entries((rowTable == null ? void 0 : rowTable.schema) || {})) {
       if (schema.type !== "link" /* LINK */ || !Array.isArray(row2[column])) {
@@ -21309,7 +21312,7 @@ async function squashLinksToPrimaryDisplay(table2, enriched) {
       row2[column] = newLinks;
     }
   }
-  return enriched;
+  return isArray ? enrichedArray : enrichedArray[0];
 }
 var import_lodash2, import_lodash3, EventType;
 var init_linkedRows = __esm({
@@ -21636,7 +21639,10 @@ async function outputProcessing(table2, rows2, opts = { squash: true }) {
     }
   }
   if (opts.squash) {
-    enriched = await squashLinksToPrimaryDisplay(table2, enriched);
+    enriched = await squashLinksToPrimaryDisplay(
+      table2,
+      enriched
+    );
   }
   return wasArray ? enriched : enriched[0];
 }
@@ -31294,6 +31300,15 @@ var init_websocket2 = __esm({
       emit(event, payload) {
         this.io.sockets.emit(event, payload);
       }
+      // Emit an event to everyone in a room, including metadata of whom
+      // the originator of the request was
+      emitToRoom(ctx, room, event, payload) {
+        var _a2;
+        this.io.in(room).emit(event, {
+          ...payload,
+          apiSessionId: (_a2 = ctx.headers) == null ? void 0 : _a2["x-budibase-session-id" /* SESSION_ID */]
+        });
+      }
     };
   }
 });
@@ -31642,17 +31657,23 @@ var init_grid = __esm({
       }
       emitRowUpdate(ctx, row2) {
         const tableId = getTableId(ctx);
-        this.io.in(tableId).emit("RowChange" /* RowChange */, { id: row2._id, row: row2 });
+        this.emitToRoom(ctx, tableId, "RowChange" /* RowChange */, {
+          id: row2._id,
+          row: row2
+        });
       }
       emitRowDeletion(ctx, id) {
         const tableId = getTableId(ctx);
-        this.io.in(tableId).emit("RowChange" /* RowChange */, { id, row: null });
+        this.emitToRoom(ctx, tableId, "RowChange" /* RowChange */, { id, row: null });
       }
-      emitTableUpdate(table2) {
-        this.io.in(table2._id).emit("TableChange" /* TableChange */, { id: table2._id, table: table2 });
+      emitTableUpdate(ctx, table2) {
+        this.emitToRoom(ctx, table2._id, "TableChange" /* TableChange */, {
+          id: table2._id,
+          table: table2
+        });
       }
-      emitTableDeletion(id) {
-        this.io.in(id).emit("TableChange" /* TableChange */, { id, table: null });
+      emitTableDeletion(ctx, id) {
+        this.emitToRoom(ctx, id, "TableChange" /* TableChange */, { id, table: null });
       }
     };
   }
@@ -31696,22 +31717,31 @@ var init_builder2 = __esm({
       }
       emitTableUpdate(ctx, table2) {
         var _a2;
-        this.io.in(ctx.appId).emit("TableChange" /* TableChange */, { id: table2._id, table: table2 });
-        (_a2 = gridSocket) == null ? void 0 : _a2.emitTableUpdate(table2);
+        this.emitToRoom(ctx, ctx.appId, "TableChange" /* TableChange */, {
+          id: table2._id,
+          table: table2
+        });
+        (_a2 = gridSocket) == null ? void 0 : _a2.emitTableUpdate(ctx, table2);
       }
       emitTableDeletion(ctx, id) {
         var _a2;
-        this.io.in(ctx.appId).emit("TableChange" /* TableChange */, { id, table: null });
-        (_a2 = gridSocket) == null ? void 0 : _a2.emitTableDeletion(id);
+        this.emitToRoom(ctx, ctx.appId, "TableChange" /* TableChange */, {
+          id,
+          table: null
+        });
+        (_a2 = gridSocket) == null ? void 0 : _a2.emitTableDeletion(ctx, id);
       }
       emitDatasourceUpdate(ctx, datasource2) {
-        this.io.in(ctx.appId).emit("DatasourceChange" /* DatasourceChange */, {
+        this.emitToRoom(ctx, ctx.appId, "DatasourceChange" /* DatasourceChange */, {
           id: datasource2._id,
           datasource: datasource2
         });
       }
       emitDatasourceDeletion(ctx, id) {
-        this.io.in(ctx.appId).emit("DatasourceChange" /* DatasourceChange */, { id, datasource: null });
+        this.emitToRoom(ctx, ctx.appId, "DatasourceChange" /* DatasourceChange */, {
+          id,
+          datasource: null
+        });
       }
     };
   }
@@ -32215,7 +32245,11 @@ async function finaliseRow(table2, row2, { oldTable, updateFormula } = {
   if (updateFormula) {
     await updateRelatedFormula(table2, enrichedRow);
   }
-  return { row: enrichedRow, table: table2 };
+  const squashed = await squashLinksToPrimaryDisplay(
+    table2,
+    enrichedRow
+  );
+  return { row: enrichedRow, squashed, table: table2 };
 }
 var isEqual3, cloneDeep9;
 var init_staticFormula = __esm({
@@ -32224,6 +32258,7 @@ var init_staticFormula = __esm({
     init_rowProcessor();
     init_constants4();
     init_src2();
+    init_linkedRows();
     ({ isEqual: isEqual3 } = require("lodash"));
     ({ cloneDeep: cloneDeep9 } = require("lodash/fp"));
   }
@@ -33277,6 +33312,13 @@ __export(external_exports, {
   save: () => save10,
   search: () => search4
 });
+async function getRow(tableId, rowId, opts) {
+  const response2 = await handleRequest("READ" /* READ */, tableId, {
+    id: breakRowIdField(rowId),
+    includeSqlRelationships: (opts == null ? void 0 : opts.relationships) ? 1 /* INCLUDE */ : 0 /* EXCLUDE */
+  });
+  return response2 ? response2[0] : response2;
+}
 async function handleRequest(operation, tableId, opts) {
   if (opts && opts.filters) {
     for (let filterField of NoEmptyFilterStrings) {
@@ -33306,11 +33348,15 @@ async function patch2(ctx) {
   if (!validateResult.valid) {
     throw { validation: validateResult.errors };
   }
-  return handleRequest("UPDATE" /* UPDATE */, tableId, {
+  const response2 = await handleRequest("UPDATE" /* UPDATE */, tableId, {
     id: breakRowIdField(id),
-    row: inputs,
-    includeSqlRelationships: 1 /* INCLUDE */
+    row: inputs
   });
+  const row2 = await getRow(tableId, id, { relationships: true });
+  return {
+    ...response2,
+    row: row2
+  };
 }
 async function save10(ctx) {
   const inputs = ctx.request.body;
@@ -33322,10 +33368,20 @@ async function save10(ctx) {
   if (!validateResult.valid) {
     throw { validation: validateResult.errors };
   }
-  return handleRequest("CREATE" /* CREATE */, tableId, {
-    row: inputs,
-    includeSqlRelationships: 0 /* EXCLUDE */
+  const response2 = await handleRequest("CREATE" /* CREATE */, tableId, {
+    row: inputs
   });
+  const responseRow = response2;
+  const rowId = responseRow.row._id;
+  if (rowId) {
+    const row2 = await getRow(tableId, rowId, { relationships: true });
+    return {
+      ...response2,
+      row: row2
+    };
+  } else {
+    return response2;
+  }
 }
 async function fetchView2(ctx) {
   const split = ctx.params.viewName.split("all_");
@@ -33341,11 +33397,7 @@ async function fetch19(ctx) {
 async function find6(ctx) {
   const id = ctx.params.rowId;
   const tableId = ctx.params.tableId;
-  const response2 = await handleRequest("READ" /* READ */, tableId, {
-    id: breakRowIdField(id),
-    includeSqlRelationships: 0 /* EXCLUDE */
-  });
-  return response2 ? response2[0] : response2;
+  return getRow(tableId, id);
 }
 async function destroy9(ctx) {
   const tableId = ctx.params.tableId;
@@ -33656,7 +33708,7 @@ var init_row2 = __esm({
       if (body2 && body2._id) {
         return patch3(ctx);
       }
-      const { row: row2, table: table2 } = await quotas_exports4.addRow(
+      const { row: row2, table: table2, squashed } = await quotas_exports4.addRow(
         () => quotas_exports4.addQuery(() => pickApi(tableId).save(ctx), {
           datasourceId: tableId
         })
@@ -33664,8 +33716,8 @@ var init_row2 = __esm({
       ctx.status = 200;
       ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:save`, appId, row2, table2);
       ctx.message = `${table2.name} saved successfully`;
-      ctx.body = row2;
-      (_a2 = gridSocket) == null ? void 0 : _a2.emitRowUpdate(ctx, row2);
+      ctx.body = row2 || squashed;
+      (_a2 = gridSocket) == null ? void 0 : _a2.emitRowUpdate(ctx, row2 || squashed);
     };
     exportRows3 = async (ctx) => {
       const tableId = getTableId(ctx);