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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.1.32-alpha.1",
+  "version": "2.1.32-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.1.32-alpha.1",
-    "@budibase/client": "2.1.32-alpha.1",
-    "@budibase/pro": "2.1.31",
-    "@budibase/string-templates": "2.1.32-alpha.1",
-    "@budibase/types": "2.1.32-alpha.1",
+    "@budibase/backend-core": "2.1.32-alpha.3",
+    "@budibase/client": "2.1.32-alpha.3",
+    "@budibase/pro": "2.1.32-alpha.2",
+    "@budibase/string-templates": "2.1.32-alpha.3",
+    "@budibase/types": "2.1.32-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -165,5 +165,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "3e03cd02868fdd5e27664406629c13eed3c9673a"
+  "gitHead": "9302c091ef53a3d66b680d77231bfbf0198b04ec"
 }

package/src/api/controllers/application.ts

@@ -25,8 +25,14 @@ import {
   migrations,
 } from "@budibase/backend-core"
 import { USERS_TABLE_SCHEMA } from "../../constants"
+import { buildDefaultDocs } from "../../db/defaultData/datasource_bb_default"
+
 import { removeAppFromUserRoles } from "../../utilities/workerRequests"
-import { clientLibraryPath, stringToReadStream } from "../../utilities"
+import {
+  clientLibraryPath,
+  stringToReadStream,
+  isQsTrue,
+} from "../../utilities"
 import { getLocksById } from "../../utilities/redis"
 import {
   updateClientLibrary,
@@ -117,7 +123,7 @@ const checkAppName = (
   }
 }
 
-async function createInstance(template: any) {
+async function createInstance(template: any, includeSampleData: boolean) {
   const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null
   const baseAppId = generateAppID(tenantId)
   const appId = generateDevAppID(baseAppId)
@@ -149,11 +155,23 @@ async function createInstance(template: any) {
   } else {
     // create the users table
     await db.put(USERS_TABLE_SCHEMA)
+
+    if (includeSampleData) {
+      // create ootb stock db
+      await addDefaultTables(db)
+    }
   }
 
   return { _id: appId }
 }
 
+const addDefaultTables = async (db: any) => {
+  const defaultDbDocs = buildDefaultDocs()
+
+  // add in the default db data docs - tables, datasource, rows and links
+  await db.bulkDocs([...defaultDbDocs])
+}
+
 export const fetch = async (ctx: any) => {
   const dev = ctx.query && ctx.query.status === AppStatus.DEV
   const all = ctx.query && ctx.query.status === AppStatus.ALL
@@ -234,7 +252,8 @@ const performAppCreate = async (ctx: any) => {
   if (ctx.request.files && ctx.request.files.templateFile) {
     instanceConfig.file = ctx.request.files.templateFile
   }
-  const instance = await createInstance(instanceConfig)
+  const includeSampleData = isQsTrue(ctx.request.body.sampleData)
+  const instance = await createInstance(instanceConfig, includeSampleData)
   const appId = instance._id
   const db = context.getAppDB()
 

package/src/api/controllers/datasource.js

@@ -6,12 +6,14 @@ const {
   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 = async function (ctx) {
   // Get internal tables
@@ -21,11 +23,16 @@ exports.fetch = async function (ctx) {
       include_docs: true,
     })
   )
-  const internal = internalTables.rows.map(row => row.doc)
+
+  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 = {
     ...BudibaseInternalDB,
-    entities: internal,
   }
 
   // Get external datasources
@@ -37,11 +44,17 @@ exports.fetch = async function (ctx) {
     )
   ).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]
@@ -196,20 +209,53 @@ exports.save = async function (ctx) {
   ctx.body = response
 }
 
+const destroyInternalTablesBySourceId = async datasourceId => {
+  const db = getAppDB()
+
+  // Get all internal tables
+  const internalTables = await 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) {
+    await tableDestroy({
+      params: {
+        tableId: table._id,
+      },
+    })
+  }
+}
+
 exports.destroy = async function (ctx) {
   const db = getAppDB()
   const datasourceId = ctx.params.datasourceId
 
   const datasource = await db.get(datasourceId)
   // Delete all queries for the datasource
-  const queries = await db.allDocs(getQueryParams(datasourceId, null))
-  await db.bulkDocs(
-    queries.rows.map(row => ({
-      _id: row.id,
-      _rev: row.value.rev,
-      _deleted: true,
-    }))
-  )
+
+  if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) {
+    await destroyInternalTablesBySourceId(datasourceId)
+  } else {
+    const queries = await db.allDocs(getQueryParams(datasourceId, null))
+    await db.bulkDocs(
+      queries.rows.map(row => ({
+        _id: row.id,
+        _rev: row.value.rev,
+        _deleted: true,
+      }))
+    )
+  }
 
   // delete the datasource
   await db.remove(datasourceId, ctx.params.revId)

package/src/api/controllers/table/utils.ts

@@ -95,18 +95,7 @@ export function makeSureTableUpToDate(table: any, tableToSave: any) {
   return tableToSave
 }
 
-export async function handleDataImport(user: any, table: any, dataImport: any) {
-  if (!dataImport || !dataImport.csvString) {
-    return table
-  }
-
-  const db = getAppDB()
-  // Populate the table with rows imported from CSV in a bulk update
-  const data = await transform({
-    ...dataImport,
-    existingTable: table,
-  })
-
+export function importToRows(data: any, table: any, user: any = {}) {
   let finalData: any = []
   for (let i = 0; i < data.length; i++) {
     let row = data[i]
@@ -136,6 +125,22 @@ export async function handleDataImport(user: any, table: any, dataImport: any) {
 
     finalData.push(row)
   }
+  return finalData
+}
+
+export async function handleDataImport(user: any, table: any, dataImport: any) {
+  if (!dataImport || !dataImport.csvString) {
+    return table
+  }
+
+  const db = getAppDB()
+  // Populate the table with rows imported from CSV in a bulk update
+  const data = await transform({
+    ...dataImport,
+    existingTable: table,
+  })
+
+  let finalData: any = importToRows(data, table, user)
 
   await quotas.addRows(finalData.length, () => db.bulkDocs(finalData), {
     tableId: table._id,