npm - @budibase/server - Versions diffs - 2.4.40 → 2.4.41 - Mend

@budibase/server 2.4.40 → 2.4.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/builder/assets/{index.07ed2ead.js → index.cf8e1455.js} +277 -276
package/builder/index.html +1 -1
package/dist/api/controllers/datasource.js +2 -1
package/dist/api/controllers/row/external.js +1 -8
package/dist/api/controllers/row/index.js +11 -1
package/dist/api/controllers/row/internal.js +1 -10
package/dist/api/controllers/row/utils.js +3 -4
package/dist/api/controllers/table/external.js +16 -12
package/dist/api/controllers/table/utils.js +15 -1
package/dist/constants/index.js +2 -1
package/dist/integrations/googlesheets.js +125 -59
package/dist/integrations/utils.js +17 -2
package/dist/package.json +7 -7
package/dist/tsconfig.build.tsbuildinfo +1 -1
package/package.json +8 -8
package/src/api/controllers/datasource.ts +2 -1
package/src/api/controllers/row/external.ts +12 -16
package/src/api/controllers/row/index.ts +12 -2
package/src/api/controllers/row/internal.ts +0 -7
package/src/api/controllers/row/utils.ts +3 -4
package/src/api/controllers/table/external.ts +24 -17
package/src/api/controllers/table/index.ts +9 -9
package/src/api/controllers/table/utils.ts +18 -2
package/src/constants/index.ts +1 -0
package/src/integrations/googlesheets.ts +143 -71
package/src/integrations/utils.ts +16 -4

package/builder/index.html CHANGED Viewed

@@ -10,7 +10,7 @@
 		href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet"
 	/>
-  <script type="module" crossorigin src="/builder/assets/index.07ed2ead.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.cf8e1455.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.b0e3aca6.css">
 </head>
 <body id="app">

package/dist/api/controllers/datasource.js CHANGED Viewed

@@ -74,7 +74,8 @@ function buildSchemaFromDb(ctx) {
         setDefaultDisplayColumns(datasource);
         const dbResp = yield db.put(datasource);
         datasource._rev = dbResp.rev;
-        const response = { datasource };
+        const cleanedDatasource = yield sdk_1.default.datasources.removeSecretSingle(datasource);
+        const response = { datasource: cleanedDatasource };
         if (error) {
             response.error = error;
         }

package/dist/api/controllers/row/external.js CHANGED Viewed

@@ -46,7 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchEnrichedRow = exports.exportRows = exports.validate = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = exports.handleRequest = void 0;
+exports.fetchEnrichedRow = exports.exportRows = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = exports.handleRequest = void 0;
 const constants_1 = require("../../../constants");
 const utils_1 = require("../../../integrations/utils");
 const ExternalRequest_1 = require("./ExternalRequest");
@@ -225,13 +225,6 @@ function search(ctx) {
     });
 }
 exports.search = search;
-function validate(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // can't validate external right now - maybe in future
-        return { valid: true };
-    });
-}
-exports.validate = validate;
 function exportRows(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { datasourceId, tableName } = (0, utils_1.breakExternalTableId)(ctx.params.tableId);

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

@@ -37,6 +37,7 @@ const pro_1 = require("@budibase/pro");
 const internal = __importStar(require("./internal"));
 const external = __importStar(require("./external"));
 const utils_1 = require("../../../integrations/utils");
+const utils = __importStar(require("./utils"));
 function pickApi(tableId) {
     if ((0, utils_1.isExternalTable)(tableId)) {
         return external;
@@ -171,7 +172,16 @@ exports.search = search;
 function validate(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const tableId = getTableId(ctx);
-        ctx.body = yield pickApi(tableId).validate(ctx);
+        // external tables are hard to validate currently
+        if ((0, utils_1.isExternalTable)(tableId)) {
+            ctx.body = { valid: true };
+        }
+        else {
+            ctx.body = yield utils.validate({
+                row: ctx.request.body,
+                tableId,
+            });
+        }
     });
 }
 exports.validate = validate;

package/dist/api/controllers/row/internal.js CHANGED Viewed

@@ -46,7 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchEnrichedRow = exports.exportRows = exports.validate = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = void 0;
+exports.fetchEnrichedRow = exports.exportRows = exports.search = exports.bulkDestroy = exports.destroy = exports.find = exports.fetch = exports.fetchView = exports.save = exports.patch = void 0;
 const linkRows = __importStar(require("../../../db/linkedRows"));
 const utils_1 = require("../../../db/utils");
 const userController = __importStar(require("../user"));
@@ -392,15 +392,6 @@ function search(ctx) {
     });
 }
 exports.search = search;
-function validate(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return utils.validate({
-            tableId: ctx.params.tableId,
-            row: ctx.request.body,
-        });
-    });
-}
-exports.validate = validate;
 function exportRows(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();

package/dist/api/controllers/row/utils.js CHANGED Viewed

@@ -41,10 +41,10 @@ const userController = __importStar(require("../user"));
 const constants_1 = require("../../../constants");
 const backend_core_1 = require("@budibase/backend-core");
 const query_1 = require("../../../integrations/base/query");
-const validateJs = require("validate.js");
-const { cloneDeep } = require("lodash/fp");
 const exporters_1 = require("../view/exporters");
 const sdk_1 = __importDefault(require("../../../sdk"));
+const validateJs = require("validate.js");
+const { cloneDeep } = require("lodash/fp");
 validateJs.extend(validateJs.validators.datetime, {
     parse: function (value) {
         return new Date(value).getTime();
@@ -88,8 +88,7 @@ function validate({ tableId, row, table, }) {
     return __awaiter(this, void 0, void 0, function* () {
         let fetchedTable;
         if (!table) {
-            const db = backend_core_1.context.getAppDB();
-            fetchedTable = yield db.get(tableId);
+            fetchedTable = yield sdk_1.default.tables.getTable(tableId);
         }
         else {
             fetchedTable = table;

package/dist/api/controllers/table/external.js CHANGED Viewed

@@ -150,16 +150,16 @@ function isRelationshipSetup(column) {
 }
 function save(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        const table = ctx.request.body;
-        const renamed = table === null || table === void 0 ? void 0 : table._rename;
+        const inputs = ctx.request.body;
+        const renamed = inputs === null || inputs === void 0 ? void 0 : inputs._rename;
         // can't do this right now
-        delete table.rows;
+        delete inputs.rows;
         const datasourceId = getDatasourceId(ctx.request.body);
         // table doesn't exist already, note that it is created
-        if (!table._id) {
-            table.created = true;
+        if (!inputs._id) {
+            inputs.created = true;
         }
-        let tableToSave = Object.assign({ type: "table", _id: (0, utils_1.buildExternalTableId)(datasourceId, table.name) }, table);
+        let tableToSave = Object.assign({ type: "table", _id: (0, utils_1.buildExternalTableId)(datasourceId, inputs.name) }, inputs);
         let oldTable;
         if (ctx.request.body && ctx.request.body._id) {
             oldTable = yield sdk_1.default.tables.getTable(ctx.request.body._id);
@@ -172,6 +172,8 @@ function save(ctx) {
         if (!datasource.entities) {
             datasource.entities = {};
         }
+        // GSheets is a specific case - only ever has a static primary key
+        tableToSave = (0, utils_2.setStaticSchemas)(datasource, tableToSave);
         const oldTables = cloneDeep(datasource.entities);
         const tables = datasource.entities;
         const extraTablesToUpdate = [];
@@ -187,7 +189,7 @@ function save(ctx) {
             const relatedColumnName = schema.fieldName;
             const relationType = schema.relationshipType;
             if (relationType === types_1.RelationshipTypes.MANY_TO_MANY) {
-                const junctionTable = generateManyLinkSchema(datasource, schema, table, relatedTable);
+                const junctionTable = generateManyLinkSchema(datasource, schema, tableToSave, relatedTable);
                 if (tables[junctionTable.name]) {
                     throw "Junction table already exists, cannot create another relationship.";
                 }
@@ -195,8 +197,10 @@ function save(ctx) {
                 extraTablesToUpdate.push(junctionTable);
             }
             else {
-                const fkTable = relationType === types_1.RelationshipTypes.ONE_TO_MANY ? table : relatedTable;
-                const foreignKey = generateLinkSchema(schema, table, relatedTable, relationType);
+                const fkTable = relationType === types_1.RelationshipTypes.ONE_TO_MANY
+                    ? tableToSave
+                    : relatedTable;
+                const foreignKey = generateLinkSchema(schema, tableToSave, relatedTable, relationType);
                 fkTable.schema[foreignKey] = (0, utils_2.foreignKeyStructure)(foreignKey);
                 if (fkTable.constrained == null) {
                     fkTable.constrained = [];
@@ -205,11 +209,11 @@ function save(ctx) {
                     fkTable.constrained.push(foreignKey);
                 }
                 // foreign key is in other table, need to save it to external
-                if (fkTable._id !== table._id) {
+                if (fkTable._id !== tableToSave._id) {
                     extraTablesToUpdate.push(fkTable);
                 }
             }
-            generateRelatedSchema(schema, relatedTable, table, relatedColumnName);
+            generateRelatedSchema(schema, relatedTable, tableToSave, relatedColumnName);
             schema.main = true;
         }
         cleanupRelationships(tableToSave, tables, oldTable);
@@ -264,7 +268,7 @@ function bulkImport(ctx) {
         if (!rows || !(0, schema_1.isRows)(rows) || !(0, schema_1.isSchema)(schema)) {
             ctx.throw(400, "Provided data import information is invalid.");
         }
-        const parsedRows = yield (0, schema_1.parse)(rows, schema);
+        const parsedRows = (0, schema_1.parse)(rows, schema);
         yield (0, external_1.handleRequest)(types_1.Operation.BULK_CREATE, table._id, {
             rows: parsedRows,
         });

package/dist/api/controllers/table/utils.js CHANGED Viewed

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableSaveFunctions = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.importToRows = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
+exports.TableSaveFunctions = exports.setStaticSchemas = exports.hasTypeChanged = exports.areSwitchableTypes = exports.foreignKeyStructure = exports.generateJunctionTableName = exports.generateForeignKey = exports.checkForViewUpdates = exports.checkStaticTables = exports.handleSearchIndexes = exports.handleDataImport = exports.importToRows = exports.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
 const schema_1 = require("../../../utilities/schema");
 const utils_1 = require("../../../db/utils");
 const lodash_1 = require("lodash");
@@ -24,6 +24,7 @@ const viewBuilder_1 = __importDefault(require("../view/viewBuilder"));
 const fp_1 = require("lodash/fp");
 const pro_1 = require("@budibase/pro");
 const backend_core_1 = require("@budibase/backend-core");
+const types_1 = require("@budibase/types");
 function clearColumns(table, columnNames) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
@@ -356,5 +357,18 @@ function hasTypeChanged(table, oldTable) {
     return false;
 }
 exports.hasTypeChanged = hasTypeChanged;
+// used for external tables, some of them will have static schemas that need
+// to be hard set
+function setStaticSchemas(datasource, table) {
+    var _a;
+    // GSheets is a specific case - only ever has a static primary key
+    if (table && datasource.source === types_1.SourceName.GOOGLE_SHEETS) {
+        table.primary = [constants_1.GOOGLE_SHEETS_PRIMARY_KEY];
+        // if there is an id column, remove it, should never exist in GSheets
+        (_a = table.schema) === null || _a === void 0 ? true : delete _a.id;
+    }
+    return table;
+}
+exports.setStaticSchemas = setStaticSchemas;
 const _TableSaveFunctions = TableSaveFunctions;
 exports.TableSaveFunctions = _TableSaveFunctions;

package/dist/constants/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_AUTOMATION_RECURRING_ERRORS = exports.ObjectStoreBuckets = exports.AutomationErrors = exports.BuildSchemaErrors = exports.InvalidColumns = exports.MetadataTypes = exports.BaseQueryVerbs = exports.OBJ_STORE_DIRECTORY = exports.AutoFieldDefaultNames = exports.AutoFieldSubTypes = exports.USERS_TABLE_SCHEMA = exports.SortDirection = exports.DatasourceAuthTypes = exports.DataSourceOperation = exports.AuthTypes = exports.FormulaTypes = exports.SwitchableTypes = exports.CanSwitchTypes = exports.NoEmptyFilterStrings = exports.FilterTypes = exports.RelationshipTypes = exports.FieldTypes = void 0;
+exports.GOOGLE_SHEETS_PRIMARY_KEY = exports.MAX_AUTOMATION_RECURRING_ERRORS = exports.ObjectStoreBuckets = exports.AutomationErrors = exports.BuildSchemaErrors = exports.InvalidColumns = exports.MetadataTypes = exports.BaseQueryVerbs = exports.OBJ_STORE_DIRECTORY = exports.AutoFieldDefaultNames = exports.AutoFieldSubTypes = exports.USERS_TABLE_SCHEMA = exports.SortDirection = exports.DatasourceAuthTypes = exports.DataSourceOperation = exports.AuthTypes = exports.FormulaTypes = exports.SwitchableTypes = exports.CanSwitchTypes = exports.NoEmptyFilterStrings = exports.FilterTypes = exports.RelationshipTypes = exports.FieldTypes = void 0;
 const backend_core_1 = require("@budibase/backend-core");
 var types_1 = require("@budibase/types");
 Object.defineProperty(exports, "FieldTypes", { enumerable: true, get: function () { return types_1.FieldType; } });
@@ -178,3 +178,4 @@ var AutomationErrors;
 // pass through the list from the auth/core lib
 exports.ObjectStoreBuckets = backend_core_1.objectStore.ObjectStoreBuckets;
 exports.MAX_AUTOMATION_RECURRING_ERRORS = 5;
+exports.GOOGLE_SHEETS_PRIMARY_KEY = "rowNumber";

package/dist/integrations/googlesheets.js CHANGED Viewed

@@ -15,11 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
 const google_auth_library_1 = require("google-auth-library");
 const utils_1 = require("./utils");
-const constants_1 = require("../constants");
 const google_spreadsheet_1 = require("google-spreadsheet");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const backend_core_1 = require("@budibase/backend-core");
 const shared_core_1 = require("@budibase/shared-core");
+const constants_1 = require("../constants");
+const ALLOWED_TYPES = [
+    types_1.FieldType.STRING,
+    types_1.FieldType.FORMULA,
+    types_1.FieldType.NUMBER,
+    types_1.FieldType.LONGFORM,
+    types_1.FieldType.DATETIME,
+    types_1.FieldType.OPTIONS,
+    types_1.FieldType.BOOLEAN,
+    types_1.FieldType.BARCODEQR,
+];
 const SCHEMA = {
     plus: true,
     auth: {
@@ -135,6 +145,7 @@ class GoogleSheetsIntegration {
         });
     }
     connect() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Initialise oAuth client
@@ -159,12 +170,36 @@ class GoogleSheetsIntegration {
                 yield this.client.loadInfo();
             }
             catch (err) {
+                // this happens for xlsx imports
+                if ((_a = err.message) === null || _a === void 0 ? void 0 : _a.includes("operation is not supported")) {
+                    err.message =
+                        "This operation is not supported - XLSX sheets must be converted.";
+                }
                 console.error("Error connecting to google sheets", err);
                 throw err;
             }
         });
     }
-    buildSchema(datasourceId) {
+    getTableSchema(title, headerValues, id) {
+        // base table
+        const table = {
+            name: title,
+            primary: [constants_1.GOOGLE_SHEETS_PRIMARY_KEY],
+            schema: {},
+        };
+        if (id) {
+            table._id = id;
+        }
+        // build schema from headers
+        for (let header of headerValues) {
+            table.schema[header] = {
+                name: header,
+                type: types_1.FieldType.STRING,
+            };
+        }
+        return table;
+    }
+    buildSchema(datasourceId, entities) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.connect();
             const sheets = this.client.sheetsByIndex;
@@ -172,56 +207,47 @@ class GoogleSheetsIntegration {
             for (let sheet of sheets) {
                 // must fetch rows to determine schema
                 yield sheet.getRows();
-                // build schema
-                const schema = {};
-                // build schema from headers
-                for (let header of sheet.headerValues) {
-                    schema[header] = {
-                        name: header,
-                        type: constants_1.FieldTypes.STRING,
-                    };
-                }
-                // create tables
-                tables[sheet.title] = {
-                    _id: (0, utils_1.buildExternalTableId)(datasourceId, sheet.title),
-                    name: sheet.title,
-                    primary: ["rowNumber"],
-                    schema,
-                };
+                const id = (0, utils_1.buildExternalTableId)(datasourceId, sheet.title);
+                tables[sheet.title] = this.getTableSchema(sheet.title, sheet.headerValues, id);
             }
-            this.tables = tables;
+            const final = (0, utils_1.finaliseExternalTables)(tables, entities);
+            this.tables = final.tables;
+            this.schemaErrors = final.errors;
         });
     }
     query(json) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
             const sheet = json.endpoint.entityId;
-            const handlers = {
-                [constants_1.DataSourceOperation.CREATE]: () => this.create({ sheet, row: json.body }),
-                [constants_1.DataSourceOperation.READ]: () => this.read(Object.assign(Object.assign({}, json), { sheet })),
-                [constants_1.DataSourceOperation.UPDATE]: () => {
-                    var _a, _b, _c;
+            switch (json.endpoint.operation) {
+                case types_1.Operation.CREATE:
+                    return this.create({ sheet, row: json.body });
+                case types_1.Operation.BULK_CREATE:
+                    return this.createBulk({ sheet, rows: json.body });
+                case types_1.Operation.READ:
+                    return this.read(Object.assign(Object.assign({}, json), { sheet }));
+                case types_1.Operation.UPDATE:
                     return this.update({
                         // exclude the header row and zero index
                         rowIndex: ((_c = (_b = (_a = json.extra) === null || _a === void 0 ? void 0 : _a.idFilter) === null || _b === void 0 ? void 0 : _b.equal) === null || _c === void 0 ? void 0 : _c.rowNumber) - 2,
                         sheet,
                         row: json.body,
                     });
-                },
-                [constants_1.DataSourceOperation.DELETE]: () => {
-                    var _a, _b, _c;
+                case types_1.Operation.DELETE:
                     return this.delete({
                         // exclude the header row and zero index
-                        rowIndex: ((_c = (_b = (_a = json.extra) === null || _a === void 0 ? void 0 : _a.idFilter) === null || _b === void 0 ? void 0 : _b.equal) === null || _c === void 0 ? void 0 : _c.rowNumber) - 2,
+                        rowIndex: ((_f = (_e = (_d = json.extra) === null || _d === void 0 ? void 0 : _d.idFilter) === null || _e === void 0 ? void 0 : _e.equal) === null || _f === void 0 ? void 0 : _f.rowNumber) - 2,
                         sheet,
                     });
-                },
-                [constants_1.DataSourceOperation.CREATE_TABLE]: () => { var _a; return this.createTable((_a = json === null || json === void 0 ? void 0 : json.table) === null || _a === void 0 ? void 0 : _a.name); },
-                [constants_1.DataSourceOperation.UPDATE_TABLE]: () => this.updateTable(json.table),
-                [constants_1.DataSourceOperation.DELETE_TABLE]: () => { var _a; return this.deleteTable((_a = json === null || json === void 0 ? void 0 : json.table) === null || _a === void 0 ? void 0 : _a.name); },
-            };
-            // @ts-ignore
-            const internalQueryMethod = handlers[json.endpoint.operation];
-            return yield internalQueryMethod();
+                case types_1.Operation.CREATE_TABLE:
+                    return this.createTable((_g = json === null || json === void 0 ? void 0 : json.table) === null || _g === void 0 ? void 0 : _g.name);
+                case types_1.Operation.UPDATE_TABLE:
+                    return this.updateTable(json.table);
+                case types_1.Operation.DELETE_TABLE:
+                    return this.deleteTable((_h = json === null || json === void 0 ? void 0 : json.table) === null || _h === void 0 ? void 0 : _h.name);
+                default:
+                    throw new Error(`GSheets integration does not support "${json.endpoint.operation}".`);
+            }
         });
     }
     buildRowObject(headers, values, rowNumber) {
@@ -234,9 +260,12 @@ class GoogleSheetsIntegration {
     }
     createTable(name) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!name) {
+                throw new Error("Must provide name for new sheet.");
+            }
             try {
                 yield this.connect();
-                return yield this.client.addSheet({ title: name, headerValues: ["test"] });
+                return yield this.client.addSheet({ title: name, headerValues: [name] });
             }
             catch (err) {
                 console.error("Error creating new table in google sheets", err);
@@ -246,34 +275,53 @@ class GoogleSheetsIntegration {
     }
     updateTable(table) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.connect();
-                const sheet = this.client.sheetsByTitle[table.name];
-                yield sheet.loadHeaderRow();
-                if (table._rename) {
-                    const headers = [];
-                    for (let header of sheet.headerValues) {
-                        if (header === table._rename.old) {
-                            headers.push(table._rename.updated);
-                        }
-                        else {
-                            headers.push(header);
-                        }
+            yield this.connect();
+            const sheet = this.client.sheetsByTitle[table.name];
+            yield sheet.loadHeaderRow();
+            if (table._rename) {
+                const headers = [];
+                for (let header of sheet.headerValues) {
+                    if (header === table._rename.old) {
+                        headers.push(table._rename.updated);
+                    }
+                    else {
+                        headers.push(header);
                     }
+                }
+                try {
                     yield sheet.setHeaderRow(headers);
                 }
-                else {
-                    const updatedHeaderValues = [...sheet.headerValues];
-                    const newField = Object.keys(table.schema).find(key => !sheet.headerValues.includes(key));
-                    if (newField) {
-                        updatedHeaderValues.push(newField);
+                catch (err) {
+                    console.error("Error updating column name in google sheets", err);
+                    throw err;
+                }
+            }
+            else {
+                const updatedHeaderValues = [...sheet.headerValues];
+                // add new column - doesn't currently exist
+                for (let [key, column] of Object.entries(table.schema)) {
+                    if (!ALLOWED_TYPES.includes(column.type)) {
+                        throw new Error(`Column type: ${column.type} not allowed for GSheets integration.`);
+                    }
+                    if (!sheet.headerValues.includes(key) &&
+                        column.type !== types_1.FieldType.FORMULA) {
+                        updatedHeaderValues.push(key);
+                    }
+                }
+                // clear out deleted columns
+                for (let key of sheet.headerValues) {
+                    if (!Object.keys(table.schema).includes(key)) {
+                        const idx = updatedHeaderValues.indexOf(key);
+                        updatedHeaderValues.splice(idx, 1);
                     }
+                }
+                try {
                     yield sheet.setHeaderRow(updatedHeaderValues);
                 }
-            }
-            catch (err) {
-                console.error("Error updating table in google sheets", err);
-                throw err;
+                catch (err) {
+                    console.error("Error updating table in google sheets", err);
+                    throw err;
+                }
             }
         });
     }
@@ -307,6 +355,24 @@ class GoogleSheetsIntegration {
             }
         });
     }
+    createBulk(query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.connect();
+                const sheet = this.client.sheetsByTitle[query.sheet];
+                let rowsToInsert = [];
+                for (let row of query.rows) {
+                    rowsToInsert.push(typeof row === "string" ? JSON.parse(row) : row);
+                }
+                const rows = yield sheet.addRows(rowsToInsert);
+                return rows.map(row => this.buildRowObject(sheet.headerValues, row._rawData, row._rowNumber));
+            }
+            catch (err) {
+                console.error("Error bulk writing to google sheets", err);
+                throw err;
+            }
+        });
+    }
     read(query) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/integrations/utils.js CHANGED Viewed

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.finaliseExternalTables = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertSqlType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = exports.SqlClient = void 0;
+exports.finaliseExternalTables = exports.shouldCopySpecialColumn = exports.shouldCopyRelationship = exports.isIsoDateString = exports.isSQL = exports.getSqlQuery = exports.convertSqlType = exports.breakRowIdField = exports.convertRowId = exports.isRowId = exports.generateRowIdField = exports.breakExternalTableId = exports.buildExternalTableId = exports.isExternalTable = exports.SqlClient = void 0;
 const types_1 = require("@budibase/types");
 const utils_1 = require("../db/utils");
 const constants_1 = require("../constants");
 const DOUBLE_SEPARATOR = `${utils_1.SEPARATOR}${utils_1.SEPARATOR}`;
 const ROW_ID_REGEX = /^\[.*]$/g;
+const ENCODED_SPACE = encodeURIComponent(" ");
 const SQL_NUMBER_TYPE_MAP = {
     integer: constants_1.FieldTypes.NUMBER,
     int: constants_1.FieldTypes.NUMBER,
@@ -67,6 +68,10 @@ function isExternalTable(tableId) {
 }
 exports.isExternalTable = isExternalTable;
 function buildExternalTableId(datasourceId, tableName) {
+    // encode spaces
+    if (tableName.includes(" ")) {
+        tableName = encodeURIComponent(tableName);
+    }
     return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}`;
 }
 exports.buildExternalTableId = buildExternalTableId;
@@ -78,6 +83,10 @@ function breakExternalTableId(tableId) {
     let datasourceId = parts.shift();
     // if they need joined
     let tableName = parts.join(DOUBLE_SEPARATOR);
+    // if contains encoded spaces, decode it
+    if (tableName.includes(ENCODED_SPACE)) {
+        tableName = decodeURIComponent(tableName);
+    }
     return { datasourceId, tableName };
 }
 exports.breakExternalTableId = breakExternalTableId;
@@ -193,6 +202,7 @@ function shouldCopyRelationship(column, tableIds) {
         column.tableId &&
         tableIds.includes(column.tableId));
 }
+exports.shouldCopyRelationship = shouldCopyRelationship;
 /**
  * Similar function to the shouldCopyRelationship function, but instead this looks for options and boolean
  * types. It is possible to switch a string -> options and a number -> boolean (and vice versus) need to make
@@ -217,6 +227,7 @@ function shouldCopySpecialColumn(column, fetchedColumn) {
     return (specialTypes.indexOf(column.type) !== -1 ||
         (fetchedIsNumber && column.type === constants_1.FieldTypes.BOOLEAN));
 }
+exports.shouldCopySpecialColumn = shouldCopySpecialColumn;
 /**
  * Looks for columns which need to be copied over into the new table definitions, like relationships
  * and options types.
@@ -226,10 +237,14 @@ function shouldCopySpecialColumn(column, fetchedColumn) {
  * @param tableIds The IDs of the tables which exist now, to check if anything has been removed.
  */
 function copyExistingPropsOver(tableName, table, entities, tableIds) {
+    var _a, _b, _c;
     if (entities && entities[tableName]) {
-        if (entities[tableName].primaryDisplay) {
+        if ((_a = entities[tableName]) === null || _a === void 0 ? void 0 : _a.primaryDisplay) {
             table.primaryDisplay = entities[tableName].primaryDisplay;
         }
+        if ((_b = entities[tableName]) === null || _b === void 0 ? void 0 : _b.created) {
+            table.created = (_c = entities[tableName]) === null || _c === void 0 ? void 0 : _c.created;
+        }
         const existingTableSchema = entities[tableName].schema;
         for (let key in existingTableSchema) {
             if (!existingTableSchema.hasOwnProperty(key)) {

package/dist/package.json CHANGED Viewed

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