@budibase/server 2.6.10 → 2.6.12

package/builder/index.html

@@ -8,7 +8,7 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link 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.15b5f48f.js"></script>
+  <script type="module" crossorigin src="/builder/assets/index.a40dcadd.js"></script>
   <link rel="stylesheet" href="/builder/assets/index.86c992bf.css">
 </head>
 

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

@@ -185,9 +185,12 @@ function destroy(ctx) {
 exports.destroy = destroy;
 function bulkImport(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
+        const db = backend_core_1.context.getAppDB();
         const table = yield sdk_1.default.tables.getTable(ctx.params.tableId);
         const { rows } = ctx.request.body;
         yield (0, utils_2.handleDataImport)(ctx.user, table, rows);
+        // Ensure auto id and other table updates are persisted
+        yield db.put(table);
         return table;
     });
 }

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

@@ -114,15 +114,15 @@ function importToRows(data, table, user = null) {
         // the real schema of the table passed in, not the clone used for
         // incrementing auto IDs
         for (const [fieldName, schema] of Object.entries(originalTable.schema)) {
+            const rowVal = Array.isArray(row[fieldName])
+                ? row[fieldName]
+                : [row[fieldName]];
             if ((schema.type === constants_1.FieldTypes.OPTIONS ||
                 schema.type === constants_1.FieldTypes.ARRAY) &&
-                row[fieldName] &&
-                (!schema.constraints.inclusion ||
-                    schema.constraints.inclusion.indexOf(row[fieldName]) === -1)) {
-                schema.constraints.inclusion = [
-                    ...schema.constraints.inclusion,
-                    row[fieldName],
-                ];
+                row[fieldName]) {
+                let merged = [...schema.constraints.inclusion, ...rowVal];
+                let superSet = new Set(merged);
+                schema.constraints.inclusion = Array.from(superSet);
                 schema.constraints.inclusion.sort();
             }
         }