@budibase/server 2.0.30-alpha.3 → 2.0.30-alpha.4

package/src/integrations/tests/mongo.spec.ts

@@ -34,7 +34,7 @@ describe("MongoDB Integration", () => {
     await config.integration.create({
       index: indexName,
       json: body,
-      extra: { collection: "testCollection", actionTypes: "insertOne" },
+      extra: { collection: "testCollection", actionType: "insertOne" },
     })
     expect(config.integration.client.insertOne).toHaveBeenCalledWith(body)
   })
@@ -44,7 +44,7 @@ describe("MongoDB Integration", () => {
       json: {
         address: "test",
       },
-      extra: { collection: "testCollection", actionTypes: "find" },
+      extra: { collection: "testCollection", actionType: "find" },
     }
     const response = await config.integration.read(query)
     expect(config.integration.client.find).toHaveBeenCalledWith(query.json)
@@ -61,7 +61,7 @@ describe("MongoDB Integration", () => {
           opt: "option",
         },
       },
-      extra: { collection: "testCollection", actionTypes: "deleteOne" },
+      extra: { collection: "testCollection", actionType: "deleteOne" },
     }
     await config.integration.delete(query)
     expect(config.integration.client.deleteOne).toHaveBeenCalledWith(
@@ -83,7 +83,7 @@ describe("MongoDB Integration", () => {
           upsert: false,
         },
       },
-      extra: { collection: "testCollection", actionTypes: "updateOne" },
+      extra: { collection: "testCollection", actionType: "updateOne" },
     }
     await config.integration.update(query)
     expect(config.integration.client.updateOne).toHaveBeenCalledWith(
@@ -97,7 +97,7 @@ describe("MongoDB Integration", () => {
     const restore = disableConsole()
 
     const query = {
-      extra: { collection: "testCollection", actionTypes: "deleteOne" },
+      extra: { collection: "testCollection", actionType: "deleteOne" },
     }
 
     let error = null
@@ -125,19 +125,19 @@ describe("MongoDB Integration", () => {
           upsert: false,
         },
       },
-      extra: { collection: "testCollection", actionTypes: "updateOne" },
+      extra: { collection: "testCollection", actionType: "updateOne" },
     }
     await config.integration.update(query)
     expect(config.integration.client.updateOne).toHaveBeenCalled()
 
     const args = config.integration.client.updateOne.mock.calls[0]
     expect(args[0]).toEqual({
-      _id: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
-      name: mongo.ObjectID.createFromHexString("BBBB12345678ABCD12345678"),
+      _id: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
+      name: mongo.ObjectId.createFromHexString("BBBB12345678ABCD12345678"),
     })
     expect(args[1]).toEqual({
-      _id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"),
-      name: mongo.ObjectID.createFromHexString("CCCC12345678ABCD12345678"),
+      _id: mongo.ObjectId.createFromHexString("FFFF12345678ABCD12345678"),
+      name: mongo.ObjectId.createFromHexString("CCCC12345678ABCD12345678"),
     })
     expect(args[2]).toEqual({
       upsert: false,
@@ -161,7 +161,7 @@ describe("MongoDB Integration", () => {
           upsert: true,
         },
       },
-      extra: { collection: "testCollection", actionTypes: "updateOne" },
+      extra: { collection: "testCollection", actionType: "updateOne" },
     }
     await config.integration.update(query)
     expect(config.integration.client.updateOne).toHaveBeenCalled()
@@ -169,12 +169,12 @@ describe("MongoDB Integration", () => {
     const args = config.integration.client.updateOne.mock.calls[0]
     expect(args[0]).toEqual({
       _id: {
-        $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
+        $eq: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
       },
     })
     expect(args[1]).toEqual({
       $set: {
-        _id: mongo.ObjectID.createFromHexString("FFFF12345678ABCD12345678"),
+        _id: mongo.ObjectId.createFromHexString("FFFF12345678ABCD12345678"),
       },
     })
     expect(args[2]).toEqual({
@@ -200,7 +200,7 @@ describe("MongoDB Integration", () => {
           upsert: false,
         },
       },
-      extra: { collection: "testCollection", actionTypes: "findOneAndUpdate" },
+      extra: { collection: "testCollection", actionType: "findOneAndUpdate" },
     }
     await config.integration.read(query)
     expect(config.integration.client.findOneAndUpdate).toHaveBeenCalled()
@@ -208,7 +208,7 @@ describe("MongoDB Integration", () => {
     const args = config.integration.client.findOneAndUpdate.mock.calls[0]
     expect(args[0]).toEqual({
       _id: {
-        $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
+        $eq: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
       },
     })
     expect(args[1]).toEqual({
@@ -245,7 +245,7 @@ describe("MongoDB Integration", () => {
         {
           "upsert": true
         }`,
-      extra: { collection: "testCollection", actionTypes: "updateOne" },
+      extra: { collection: "testCollection", actionType: "updateOne" },
     }
     await config.integration.update(query)
     expect(config.integration.client.updateOne).toHaveBeenCalled()
@@ -253,7 +253,7 @@ describe("MongoDB Integration", () => {
     const args = config.integration.client.updateOne.mock.calls[0]
     expect(args[0]).toEqual({
       _id: {
-        $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
+        $eq: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
       },
     })
     expect(args[1]).toEqual({
@@ -300,7 +300,7 @@ describe("MongoDB Integration", () => {
           "upsert": true,
           "extra": "ad\\"{\\"d"
         }`,
-      extra: { collection: "testCollection", actionTypes: "updateOne" },
+      extra: { collection: "testCollection", actionType: "updateOne" },
     }
     await config.integration.update(query)
     expect(config.integration.client.updateOne).toHaveBeenCalled()
@@ -308,7 +308,7 @@ describe("MongoDB Integration", () => {
     const args = config.integration.client.updateOne.mock.calls[0]
     expect(args[0]).toEqual({
       _id: {
-        $eq: mongo.ObjectID.createFromHexString("ACBD12345678ABCD12345678"),
+        $eq: mongo.ObjectId.createFromHexString("ACBD12345678ABCD12345678"),
       },
     })
     expect(args[1]).toEqual({

package/src/utilities/csvParser.js

@@ -4,6 +4,7 @@ const { FieldTypes } = require("../constants")
 const VALIDATORS = {
   [FieldTypes.STRING]: () => true,
   [FieldTypes.OPTIONS]: () => true,
+  [FieldTypes.BARCODEQR]: () => true,
   [FieldTypes.NUMBER]: attribute => {
     // allow not to be present
     if (!attribute) {

package/src/utilities/rowProcessor/index.js

@@ -48,6 +48,11 @@ const TYPE_TRANSFORM_MAP = {
     [null]: "",
     [undefined]: undefined,
   },
+  [FieldTypes.BARCODEQR]: {
+    "": "",
+    [null]: "",
+    [undefined]: undefined,
+  },
   [FieldTypes.FORMULA]: {
     "": "",
     [null]: "",