@budibase/server 2.1.32-alpha.1 → 2.1.32-alpha.3

package/dist/api/controllers/application.js

@@ -20,6 +20,7 @@ const fileSystem_1 = require("../../utilities/fileSystem");
 const utils_1 = require("../../db/utils");
 const backend_core_1 = require("@budibase/backend-core");
 const constants_1 = require("../../constants");
+const datasource_bb_default_1 = require("../../db/defaultData/datasource_bb_default");
 const workerRequests_1 = require("../../utilities/workerRequests");
 const utilities_1 = require("../../utilities");
 const redis_1 = require("../../utilities/redis");
@@ -93,7 +94,7 @@ const checkAppName = (ctx, apps, name, currentAppId) => {
         ctx.throw(400, "App name is already in use.");
     }
 };
-function createInstance(template) {
+function createInstance(template, includeSampleData) {
     return __awaiter(this, void 0, void 0, function* () {
         const tenantId = backend_core_1.tenancy.isMultiTenant() ? backend_core_1.tenancy.getTenantId() : null;
         const baseAppId = (0, utils_1.generateAppID)(tenantId);
@@ -125,10 +126,19 @@ function createInstance(template) {
         else {
             // create the users table
             yield db.put(constants_1.USERS_TABLE_SCHEMA);
+            if (includeSampleData) {
+                // create ootb stock db
+                yield addDefaultTables(db);
+            }
         }
         return { _id: appId };
     });
 }
+const addDefaultTables = (db) => __awaiter(void 0, void 0, void 0, function* () {
+    const defaultDbDocs = (0, datasource_bb_default_1.buildDefaultDocs)();
+    // add in the default db data docs - tables, datasource, rows and links
+    yield db.bulkDocs([...defaultDbDocs]);
+});
 const fetch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const dev = ctx.query && ctx.query.status === utils_1.AppStatus.DEV;
     const all = ctx.query && ctx.query.status === utils_1.AppStatus.ALL;
@@ -201,7 +211,8 @@ const performAppCreate = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     if (ctx.request.files && ctx.request.files.templateFile) {
         instanceConfig.file = ctx.request.files.templateFile;
     }
-    const instance = yield createInstance(instanceConfig);
+    const includeSampleData = (0, utilities_1.isQsTrue)(ctx.request.body.sampleData);
+    const instance = yield createInstance(instanceConfig, includeSampleData);
     const appId = instance._id;
     const db = backend_core_1.context.getAppDB();
     let newApplication = {

package/dist/api/controllers/datasource.js

@@ -9,12 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { generateDatasourceID, getDatasourceParams, getQueryParams, DocumentType, BudibaseInternalDB, getTableParams, } = require("../../db/utils");
+const { destroy: tableDestroy } = require("./table/internal");
 const { BuildSchemaErrors, InvalidColumns } = require("../../constants");
 const { getIntegration } = require("../../integrations");
 const { getDatasourceAndQuery } = require("./row/utils");
 const { invalidateDynamicVariables } = require("../../threads/utils");
 const { getAppDB } = require("@budibase/backend-core/context");
 const { events } = require("@budibase/backend-core");
+const { db: dbCore } = require("@budibase/backend-core");
 exports.fetch = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         // Get internal tables
@@ -22,17 +24,26 @@ exports.fetch = function (ctx) {
         const internalTables = yield db.allDocs(getTableParams(null, {
             include_docs: true,
         }));
-        const internal = internalTables.rows.map(row => row.doc);
-        const bbInternalDb = Object.assign(Object.assign({}, BudibaseInternalDB), { entities: internal });
+        const internal = internalTables.rows.reduce((acc, row) => {
+            const sourceId = row.doc.sourceId || "bb_internal";
+            acc[sourceId] = acc[sourceId] || [];
+            acc[sourceId].push(row.doc);
+            return acc;
+        }, {});
+        const bbInternalDb = Object.assign({}, BudibaseInternalDB);
         // Get external datasources
         const datasources = (yield db.allDocs(getDatasourceParams(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
-        for (let datasource of datasources) {
+        const allDatasources = [bbInternalDb, ...datasources];
+        for (let datasource of allDatasources) {
             if (datasource.config && datasource.config.auth) {
                 // strip secrets from response so they don't show in the network request
                 delete datasource.config.auth;
             }
+            if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) {
+                datasource.entities = internal[datasource._id];
+            }
         }
         ctx.body = [bbInternalDb, ...datasources];
     });
@@ -165,18 +176,45 @@ exports.save = function (ctx) {
         ctx.body = response;
     });
 };
+const destroyInternalTablesBySourceId = (datasourceId) => __awaiter(void 0, void 0, void 0, function* () {
+    const db = getAppDB();
+    // Get all internal tables
+    const internalTables = yield db.allDocs(getTableParams(null, {
+        include_docs: true,
+    }));
+    // Filter by datasource and return the docs.
+    const datasourceTableDocs = internalTables.rows.reduce((acc, table) => {
+        if (table.doc.sourceId == datasourceId) {
+            acc.push(table.doc);
+        }
+        return acc;
+    }, []);
+    // Destroy the tables.
+    for (const table of datasourceTableDocs) {
+        yield tableDestroy({
+            params: {
+                tableId: table._id,
+            },
+        });
+    }
+});
 exports.destroy = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = getAppDB();
         const datasourceId = ctx.params.datasourceId;
         const datasource = yield db.get(datasourceId);
         // Delete all queries for the datasource
-        const queries = yield db.allDocs(getQueryParams(datasourceId, null));
-        yield db.bulkDocs(queries.rows.map(row => ({
-            _id: row.id,
-            _rev: row.value.rev,
-            _deleted: true,
-        })));
+        if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) {
+            yield destroyInternalTablesBySourceId(datasourceId);
+        }
+        else {
+            const queries = yield db.allDocs(getQueryParams(datasourceId, null));
+            yield db.bulkDocs(queries.rows.map(row => ({
+                _id: row.id,
+                _rev: row.value.rev,
+                _deleted: true,
+            })));
+        }
         // delete the datasource
         yield db.remove(datasourceId, ctx.params.revId);
         yield events.datasource.deleted(datasource);

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

@@ -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.makeSureTableUpToDate = exports.checkForColumnUpdates = exports.clearColumns = void 0;
+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;
 const csvParser_1 = require("../../../utilities/csvParser");
 const utils_1 = require("../../../db/utils");
 const lodash_1 = require("lodash");
@@ -96,6 +96,35 @@ function makeSureTableUpToDate(table, tableToSave) {
     return tableToSave;
 }
 exports.makeSureTableUpToDate = makeSureTableUpToDate;
+function importToRows(data, table, user = {}) {
+    let finalData = [];
+    for (let i = 0; i < data.length; i++) {
+        let row = data[i];
+        row._id = (0, utils_1.generateRowID)(table._id);
+        row.tableId = table._id;
+        const processed = (0, rowProcessor_1.inputProcessing)(user, table, row, {
+            noAutoRelationships: true,
+        });
+        table = processed.table;
+        row = processed.row;
+        let fieldName;
+        let schema;
+        for ([fieldName, schema] of Object.entries(table.schema)) {
+            // check whether the options need to be updated for inclusion as part of the data import
+            if (schema.type === constants_1.FieldTypes.OPTIONS &&
+                (!schema.constraints.inclusion ||
+                    schema.constraints.inclusion.indexOf(row[fieldName]) === -1)) {
+                schema.constraints.inclusion = [
+                    ...schema.constraints.inclusion,
+                    row[fieldName],
+                ];
+            }
+        }
+        finalData.push(row);
+    }
+    return finalData;
+}
+exports.importToRows = importToRows;
 function handleDataImport(user, table, dataImport) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!dataImport || !dataImport.csvString) {
@@ -104,31 +133,7 @@ function handleDataImport(user, table, dataImport) {
         const db = getAppDB();
         // Populate the table with rows imported from CSV in a bulk update
         const data = yield (0, csvParser_1.transform)(Object.assign(Object.assign({}, dataImport), { existingTable: table }));
-        let finalData = [];
-        for (let i = 0; i < data.length; i++) {
-            let row = data[i];
-            row._id = (0, utils_1.generateRowID)(table._id);
-            row.tableId = table._id;
-            const processed = (0, rowProcessor_1.inputProcessing)(user, table, row, {
-                noAutoRelationships: true,
-            });
-            table = processed.table;
-            row = processed.row;
-            let fieldName;
-            let schema;
-            for ([fieldName, schema] of Object.entries(table.schema)) {
-                // check whether the options need to be updated for inclusion as part of the data import
-                if (schema.type === constants_1.FieldTypes.OPTIONS &&
-                    (!schema.constraints.inclusion ||
-                        schema.constraints.inclusion.indexOf(row[fieldName]) === -1)) {
-                    schema.constraints.inclusion = [
-                        ...schema.constraints.inclusion,
-                        row[fieldName],
-                    ];
-                }
-            }
-            finalData.push(row);
-        }
+        let finalData = importToRows(data, table, user);
         yield pro_1.quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
             tableId: table._id,
         });