@budibase/server 1.0.121 → 1.0.123

package/dist/utilities/rowProcessor/index.js

@@ -12,11 +12,12 @@ const linkRows = require("../../db/linkedRows");
 const { cloneDeep } = require("lodash/fp");
 const { FieldTypes, AutoFieldSubTypes } = require("../../constants");
 const { attachmentsRelativeURL } = require("../index");
-const { processFormulas } = require("./utils");
+const { processFormulas, fixAutoColumnSubType } = require("./utils");
 const { deleteFiles } = require("../../utilities/fileSystem/utilities");
 const { ObjectStoreBuckets } = require("../../constants");
 const { isProdAppID, getProdAppID, dbExists, } = require("@budibase/backend-core/db");
 const { getAppId } = require("@budibase/backend-core/context");
+const { InternalTables } = require("../../db/utils");
 const BASE_AUTO_ID = 1;
 /**
  * A map of how we convert various properties in rows to each other based on the row type.
@@ -135,19 +136,22 @@ function getRemovedAttachmentKeys(oldRow, row, attachmentKey) {
  */
 function processAutoColumn(user, table, row, opts = { reprocessing: false, noAutoRelationships: false }) {
     let noUser = !user || !user.userId;
+    let isUserTable = table._id === InternalTables.USER_METADATA;
     let now = new Date().toISOString();
     // if a row doesn't have a revision then it doesn't exist yet
     const creating = !row._rev;
+    // check its not user table, or whether any of the processing options have been disabled
+    const shouldUpdateUserFields = !isUserTable && !opts.reprocessing && !opts.noAutoRelationships && !noUser;
     for (let [key, schema] of Object.entries(table.schema)) {
         if (!schema.autocolumn) {
             continue;
         }
+        if (!schema.subtype) {
+            schema = fixAutoColumnSubType(schema);
+        }
         switch (schema.subtype) {
             case AutoFieldSubTypes.CREATED_BY:
-                if (creating &&
-                    !opts.reprocessing &&
-                    !opts.noAutoRelationships &&
-                    !noUser) {
+                if (creating && shouldUpdateUserFields) {
                     row[key] = [user.userId];
                 }
                 break;
@@ -157,7 +161,7 @@ function processAutoColumn(user, table, row, opts = { reprocessing: false, noAut
                 }
                 break;
             case AutoFieldSubTypes.UPDATED_BY:
-                if (!opts.reprocessing && !opts.noAutoRelationships && !noUser) {
+                if (shouldUpdateUserFields) {
                     row[key] = [user.userId];
                 }
                 break;
@@ -175,6 +179,7 @@ function processAutoColumn(user, table, row, opts = { reprocessing: false, noAut
     return { table, row };
 }
 exports.processAutoColumn = processAutoColumn;
+exports.fixAutoColumnSubType = fixAutoColumnSubType;
 exports.processFormulas = processFormulas;
 /**
  * This will coerce a value to the correct types based on the type transform map

package/dist/utilities/rowProcessor/utils.js

@@ -1,6 +1,32 @@
 "use strict";
-const { FieldTypes, FormulaTypes } = require("../../constants");
+const { FieldTypes, FormulaTypes, AutoFieldDefaultNames, AutoFieldSubTypes, } = require("../../constants");
 const { processStringSync } = require("@budibase/string-templates");
+/**
+ * If the subtype has been lost for any reason this works out what
+ * subtype the auto column should be.
+ */
+exports.fixAutoColumnSubType = column => {
+    if (!column.autocolumn || !column.name || column.subtype) {
+        return column;
+    }
+    // the columns which get auto generated
+    if (column.name.endsWith(AutoFieldDefaultNames.CREATED_BY)) {
+        column.subtype = AutoFieldSubTypes.CREATED_BY;
+    }
+    else if (column.name.endsWith(AutoFieldDefaultNames.UPDATED_BY)) {
+        column.subtype = AutoFieldSubTypes.UPDATED_BY;
+    }
+    else if (column.name.endsWith(AutoFieldDefaultNames.CREATED_AT)) {
+        column.subtype = AutoFieldSubTypes.CREATED_AT;
+    }
+    else if (column.name.endsWith(AutoFieldDefaultNames.UPDATED_AT)) {
+        column.subtype = AutoFieldSubTypes.UPDATED_AT;
+    }
+    else if (column.name.endsWith(AutoFieldDefaultNames.AUTO_ID)) {
+        column.subtype = AutoFieldSubTypes.AUTO_ID;
+    }
+    return column;
+};
 /**
  * Looks through the rows provided and finds formulas - which it then processes.
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.121",
+  "version": "1.0.123",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,9 +68,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.121",
-    "@budibase/client": "^1.0.121",
-    "@budibase/string-templates": "^1.0.121",
+    "@budibase/backend-core": "^1.0.123",
+    "@budibase/client": "^1.0.123",
+    "@budibase/string-templates": "^1.0.123",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -174,5 +174,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "6f3769181fbcfdffd1928266fa08871779c7a694"
+  "gitHead": "db99c31b53d0dbbb788335126e45d1cc2f39fbf0"
 }

package/src/api/controllers/table/internal.js

@@ -10,9 +10,30 @@ const {
 const usageQuota = require("../../../utilities/usageQuota")
 const { getAppDB } = require("@budibase/backend-core/context")
 const env = require("../../../environment")
-const { cleanupAttachments } = require("../../../utilities/rowProcessor")
+const {
+  cleanupAttachments,
+  fixAutoColumnSubType,
+} = require("../../../utilities/rowProcessor")
 const { runStaticFormulaChecks } = require("./bulkFormula")
 
+function checkAutoColumns(table, oldTable) {
+  if (!table.schema) {
+    return table
+  }
+  for (let [key, schema] of Object.entries(table.schema)) {
+    if (!schema.autocolumn || schema.subtype) {
+      continue
+    }
+    const oldSchema = oldTable && oldTable.schema[key]
+    if (oldSchema && oldSchema.subtype) {
+      table.schema[key].subtype = oldSchema.subtype
+    } else {
+      table.schema[key] = fixAutoColumnSubType(schema)
+    }
+  }
+  return table
+}
+
 exports.save = async function (ctx) {
   const db = getAppDB()
   const { dataImport, ...rest } = ctx.request.body
@@ -29,9 +50,12 @@ exports.save = async function (ctx) {
     oldTable = await db.get(ctx.request.body._id)
   }
 
+  // check all types are correct
   if (hasTypeChanged(tableToSave, oldTable)) {
     ctx.throw(400, "A column type has changed.")
   }
+  // check that subtypes have been maintained
+  tableToSave = checkAutoColumns(tableToSave, oldTable)
 
   // saving a table is a complex operation, involving many different steps, this
   // has been broken out into a utility to make it more obvious/easier to manipulate

package/src/api/routes/tests/routing.spec.js

@@ -2,7 +2,6 @@ const setup = require("./utilities")
 const { basicScreen } = setup.structures
 const { checkBuilderEndpoint, runInProd } = require("./utilities/TestFunctions")
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles")
-const { doInAppContext } = require("@budibase/backend-core/context")
 
 const route = "/test"
 

package/src/constants/index.js

@@ -162,6 +162,14 @@ exports.AutoFieldSubTypes = {
   AUTO_ID: "autoID",
 }
 
+exports.AutoFieldDefaultNames = {
+  CREATED_BY: "Created By",
+  CREATED_AT: "Created At",
+  UPDATED_BY: "Updated By",
+  UPDATED_AT: "Updated At",
+  AUTO_ID: "Auto ID",
+}
+
 exports.OBJ_STORE_DIRECTORY = "/prod-budi-app-assets"
 exports.BaseQueryVerbs = {
   CREATE: "create",

package/src/db/linkedRows/LinkController.js

@@ -376,6 +376,7 @@ class LinkController {
 
         if (field.autocolumn) {
           linkedField.autocolumn = field.autocolumn
+          linkedField.subtype = field.subtype
         }
 
         // check the linked table to make sure we aren't overwriting an existing column

package/src/utilities/rowProcessor/index.js

@@ -2,7 +2,7 @@ const linkRows = require("../../db/linkedRows")
 const { cloneDeep } = require("lodash/fp")
 const { FieldTypes, AutoFieldSubTypes } = require("../../constants")
 const { attachmentsRelativeURL } = require("../index")
-const { processFormulas } = require("./utils")
+const { processFormulas, fixAutoColumnSubType } = require("./utils")
 const { deleteFiles } = require("../../utilities/fileSystem/utilities")
 const { ObjectStoreBuckets } = require("../../constants")
 const {
@@ -11,6 +11,7 @@ const {
   dbExists,
 } = require("@budibase/backend-core/db")
 const { getAppId } = require("@budibase/backend-core/context")
+const { InternalTables } = require("../../db/utils")
 
 const BASE_AUTO_ID = 1
 
@@ -137,21 +138,23 @@ function processAutoColumn(
   opts = { reprocessing: false, noAutoRelationships: false }
 ) {
   let noUser = !user || !user.userId
+  let isUserTable = table._id === InternalTables.USER_METADATA
   let now = new Date().toISOString()
   // if a row doesn't have a revision then it doesn't exist yet
   const creating = !row._rev
+  // check its not user table, or whether any of the processing options have been disabled
+  const shouldUpdateUserFields =
+    !isUserTable && !opts.reprocessing && !opts.noAutoRelationships && !noUser
   for (let [key, schema] of Object.entries(table.schema)) {
     if (!schema.autocolumn) {
       continue
     }
+    if (!schema.subtype) {
+      schema = fixAutoColumnSubType(schema)
+    }
     switch (schema.subtype) {
       case AutoFieldSubTypes.CREATED_BY:
-        if (
-          creating &&
-          !opts.reprocessing &&
-          !opts.noAutoRelationships &&
-          !noUser
-        ) {
+        if (creating && shouldUpdateUserFields) {
           row[key] = [user.userId]
         }
         break
@@ -161,7 +164,7 @@ function processAutoColumn(
         }
         break
       case AutoFieldSubTypes.UPDATED_BY:
-        if (!opts.reprocessing && !opts.noAutoRelationships && !noUser) {
+        if (shouldUpdateUserFields) {
           row[key] = [user.userId]
         }
         break
@@ -179,7 +182,7 @@ function processAutoColumn(
   return { table, row }
 }
 exports.processAutoColumn = processAutoColumn
-
+exports.fixAutoColumnSubType = fixAutoColumnSubType
 exports.processFormulas = processFormulas
 
 /**

package/src/utilities/rowProcessor/utils.js

@@ -1,6 +1,34 @@
-const { FieldTypes, FormulaTypes } = require("../../constants")
+const {
+  FieldTypes,
+  FormulaTypes,
+  AutoFieldDefaultNames,
+  AutoFieldSubTypes,
+} = require("../../constants")
 const { processStringSync } = require("@budibase/string-templates")
 
+/**
+ * If the subtype has been lost for any reason this works out what
+ * subtype the auto column should be.
+ */
+exports.fixAutoColumnSubType = column => {
+  if (!column.autocolumn || !column.name || column.subtype) {
+    return column
+  }
+  // the columns which get auto generated
+  if (column.name.endsWith(AutoFieldDefaultNames.CREATED_BY)) {
+    column.subtype = AutoFieldSubTypes.CREATED_BY
+  } else if (column.name.endsWith(AutoFieldDefaultNames.UPDATED_BY)) {
+    column.subtype = AutoFieldSubTypes.UPDATED_BY
+  } else if (column.name.endsWith(AutoFieldDefaultNames.CREATED_AT)) {
+    column.subtype = AutoFieldSubTypes.CREATED_AT
+  } else if (column.name.endsWith(AutoFieldDefaultNames.UPDATED_AT)) {
+    column.subtype = AutoFieldSubTypes.UPDATED_AT
+  } else if (column.name.endsWith(AutoFieldDefaultNames.AUTO_ID)) {
+    column.subtype = AutoFieldSubTypes.AUTO_ID
+  }
+  return column
+}
+
 /**
  * Looks through the rows provided and finds formulas - which it then processes.
  */