@budibase/server 2.1.19-alpha.0 → 2.1.19

package/coverage/lcov.info

@@ -5102,10 +5102,10 @@ FN:1,(anonymous_0)
 FN:21,(anonymous_1)
 FN:26,(anonymous_2)
 FNF:3
-FNH:3
+FNH:2
 FNDA:2,(anonymous_0)
 FNDA:22,(anonymous_1)
-FNDA:1,(anonymous_2)
+FNDA:0,(anonymous_2)
 DA:1,45
 DA:2,2
 DA:4,2
@@ -5117,7 +5117,7 @@ DA:12,0
 DA:14,2
 DA:21,45
 DA:22,22
-DA:27,1
+DA:27,0
 DA:30,22
 DA:31,17
 DA:33,22
@@ -5126,7 +5126,7 @@ DA:36,22
 DA:37,5
 DA:39,22
 LF:19
-LH:17
+LH:16
 BRDA:6,0,0,2
 BRDA:6,0,1,0
 BRDA:6,1,0,2

package/dist/api/controllers/row/ExternalRequest.js

@@ -196,7 +196,6 @@ var External;
             }
         }
         inputProcessing(row, table) {
-            var _a;
             if (!row) {
                 return { row, manyRelationships: [] };
             }
@@ -236,11 +235,7 @@ var External;
                 const linkTablePrimary = linkTable.primary[0];
                 // one to many
                 if (isOneSide(field)) {
-                    let id = row[key][0];
-                    if (typeof row[key] === "string") {
-                        id = (_a = decodeURIComponent(row[key]).match(/\[(.*?)\]/)) === null || _a === void 0 ? void 0 : _a[1];
-                    }
-                    newRow[field.foreignKey || linkTablePrimary] = (0, utils_1.breakRowIdField)(id)[0];
+                    newRow[field.foreignKey || linkTablePrimary] = (0, utils_1.breakRowIdField)(row[key][0])[0];
                 }
                 // many to many
                 else if (field.through) {

package/dist/api/controllers/row/index.js

@@ -43,22 +43,13 @@ function patch(ctx) {
         if (body && !body._id) {
             return (0, exports.save)(ctx);
         }
-        try {
-            const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
-                datasourceId: tableId,
-            });
-            if (!row) {
-                ctx.throw(404, "Row not found");
-            }
-            ctx.status = 200;
-            ctx.eventEmitter &&
-                ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
-            ctx.message = `${table.name} updated successfully.`;
-            ctx.body = row;
-        }
-        catch (err) {
-            ctx.throw(400, err);
-        }
+        const { row, table } = yield pro_1.quotas.addQuery(() => pickApi(tableId).patch(ctx), {
+            datasourceId: tableId,
+        });
+        ctx.status = 200;
+        ctx.eventEmitter && ctx.eventEmitter.emitRow(`row:update`, appId, row, table);
+        ctx.message = `${table.name} updated successfully.`;
+        ctx.body = row;
     });
 }
 exports.patch = patch;

package/dist/integrations/elasticsearch.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const elasticsearch_1 = require("@elastic/elasticsearch");
+const { Client } = require("@elastic/elasticsearch");
 const SCHEMA = {
     docs: "https://www.elastic.co/guide/en/elasticsearch/client/javascript-api/current/index.html",
     description: "Elasticsearch is a search engine based on the Lucene library. It provides a distributed, multitenant-capable full-text search engine with an HTTP web interface and schema-free JSON documents.",
@@ -22,21 +22,6 @@ const SCHEMA = {
             required: true,
             default: "http://localhost:9200",
         },
-        ssl: {
-            type: types_1.DatasourceFieldType.BOOLEAN,
-            default: false,
-            required: false,
-        },
-        rejectUnauthorized: {
-            type: types_1.DatasourceFieldType.BOOLEAN,
-            default: true,
-            required: false,
-        },
-        ca: {
-            type: types_1.DatasourceFieldType.LONGFORM,
-            default: false,
-            required: false,
-        },
     },
     query: {
         create: {
@@ -91,16 +76,7 @@ const SCHEMA = {
 class ElasticSearchIntegration {
     constructor(config) {
         this.config = config;
-        const clientConfig = {
-            node: this.config.url,
-        };
-        if (this.config.ssl) {
-            clientConfig.ssl = {
-                rejectUnauthorized: this.config.rejectUnauthorized,
-                ca: this.config.ca || undefined,
-            };
-        }
-        this.client = new elasticsearch_1.Client(clientConfig);
+        this.client = new Client({ node: config.url });
     }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/integrations/s3.js

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const AWS = require("aws-sdk");
-const csv = require("csvtojson");
 const SCHEMA = {
     docs: "https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html",
     description: "Amazon Simple Storage Service (Amazon S3) is an object storage service that offers industry-leading scalability, data availability, security, and performance.",
@@ -42,106 +41,16 @@ const SCHEMA = {
         },
     },
     query: {
-        create: {
-            type: types_1.QueryType.FIELDS,
-            fields: {
-                bucket: {
-                    display: "New Bucket",
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                location: {
-                    required: true,
-                    default: "us-east-1",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantFullControl: {
-                    display: "Grant full control",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantRead: {
-                    display: "Grant read",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantReadAcp: {
-                    display: "Grant read ACP",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantWrite: {
-                    display: "Grant write",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                grantWriteAcp: {
-                    display: "Grant write ACP",
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-            },
-        },
         read: {
             type: types_1.QueryType.FIELDS,
             fields: {
                 bucket: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                delimiter: {
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                marker: {
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-                maxKeys: {
-                    type: types_1.DatasourceFieldType.NUMBER,
-                    display: "Max Keys",
-                },
-                prefix: {
-                    type: types_1.DatasourceFieldType.STRING,
-                },
-            },
-        },
-        readCsv: {
-            displayName: "Read CSV",
-            type: types_1.QueryType.FIELDS,
-            fields: {
-                bucket: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                key: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-            },
-        },
-        delete: {
-            type: types_1.QueryType.FIELDS,
-            fields: {
-                bucket: {
-                    type: types_1.DatasourceFieldType.STRING,
-                    required: true,
-                },
-                delete: {
-                    type: types_1.DatasourceFieldType.JSON,
+                    type: "string",
                     required: true,
                 },
             },
         },
     },
-    extra: {
-        acl: {
-            required: false,
-            displayName: "ACL",
-            type: types_1.DatasourceFieldType.LIST,
-            data: {
-                create: [
-                    "private",
-                    "public-read",
-                    "public-read-write",
-                    "authenticated-read",
-                ],
-            },
-        },
-    },
 };
 class S3Integration {
     constructor(config) {
@@ -154,81 +63,16 @@ class S3Integration {
         }
         this.client = new AWS.S3(this.config);
     }
-    create(query) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            let params = {
-                Bucket: query.bucket,
-                ACL: (_a = query.extra) === null || _a === void 0 ? void 0 : _a.acl,
-                GrantFullControl: query.grantFullControl,
-                GrantRead: query.grantRead,
-                GrantReadACP: query.grantReadAcp,
-                GrantWrite: query.grantWrite,
-                GrantWriteACP: query.grantWriteAcp,
-            };
-            if (query.location) {
-                params["CreateBucketConfiguration"] = {
-                    LocationConstraint: query.location,
-                };
-            }
-            return yield this.client.createBucket(params).promise();
-        });
-    }
     read(query) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.client
                 .listObjects({
                 Bucket: query.bucket,
-                Delimiter: query.delimiter,
-                Marker: query.marker,
-                MaxKeys: query.maxKeys,
-                Prefix: query.prefix,
             })
                 .promise();
             return response.Contents;
         });
     }
-    readCsv(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const stream = this.client
-                .getObject({
-                Bucket: query.bucket,
-                Key: query.key,
-            })
-                .createReadStream();
-            let csvError = false;
-            return new Promise((resolve, reject) => {
-                stream.on("error", (err) => {
-                    reject(err);
-                });
-                const response = csv()
-                    .fromStream(stream)
-                    .on("error", () => {
-                    csvError = true;
-                });
-                stream.on("finish", () => {
-                    resolve(response);
-                });
-            }).catch(err => {
-                if (csvError) {
-                    throw new Error("Could not read CSV");
-                }
-                else {
-                    throw err;
-                }
-            });
-        });
-    }
-    delete(query) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client
-                .deleteObjects({
-                Bucket: query.bucket,
-                Delete: JSON.parse(query.delete),
-            })
-                .promise();
-        });
-    }
 }
 exports.default = {
     schema: SCHEMA,