@budibase/server 2.1.21 → 2.1.22-alpha.0

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -589,7 +589,7 @@ exports.generateApiKey = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Nov 08 2022 20:43:16 GMT+0000 (Coordinated Universal Time)
+                at Wed Nov 09 2022 13:56:22 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -5102,10 +5102,10 @@ FN:1,(anonymous_0)
 FN:21,(anonymous_1)
 FN:26,(anonymous_2)
 FNF:3
-FNH:2
+FNH:3
 FNDA:2,(anonymous_0)
 FNDA:22,(anonymous_1)
-FNDA:0,(anonymous_2)
+FNDA:1,(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,0
+DA:27,1
 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:16
+LH:17
 BRDA:6,0,0,2
 BRDA:6,0,1,0
 BRDA:6,1,0,2

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

@@ -196,6 +196,7 @@ var External;
             }
         }
         inputProcessing(row, table) {
+            var _a;
             if (!row) {
                 return { row, manyRelationships: [] };
             }
@@ -235,7 +236,11 @@ var External;
                 const linkTablePrimary = linkTable.primary[0];
                 // one to many
                 if (isOneSide(field)) {
-                    newRow[field.foreignKey || linkTablePrimary] = (0, utils_1.breakRowIdField)(row[key][0])[0];
+                    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];
                 }
                 // many to many
                 else if (field.through) {

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

@@ -43,13 +43,22 @@ function patch(ctx) {
         if (body && !body._id) {
             return (0, exports.save)(ctx);
         }
-        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;
+        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);
+        }
     });
 }
 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 { Client } = require("@elastic/elasticsearch");
+const elasticsearch_1 = 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,6 +22,21 @@ 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: {
@@ -76,7 +91,16 @@ const SCHEMA = {
 class ElasticSearchIntegration {
     constructor(config) {
         this.config = config;
-        this.client = new Client({ node: config.url });
+        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);
     }
     create(query) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/integrations/s3.js

@@ -11,6 +11,7 @@ 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.",
@@ -41,16 +42,106 @@ 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: "string",
+                    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,
                     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) {
@@ -63,16 +154,81 @@ 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,

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.1.20",
+    "version": "2.1.21",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -77,11 +77,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^2.1.20",
-        "@budibase/client": "^2.1.20",
-        "@budibase/pro": "2.1.20",
-        "@budibase/string-templates": "^2.1.20",
-        "@budibase/types": "^2.1.20",
+        "@budibase/backend-core": "^2.1.21",
+        "@budibase/client": "^2.1.21",
+        "@budibase/pro": "2.1.21",
+        "@budibase/string-templates": "^2.1.21",
+        "@budibase/types": "^2.1.21",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",