@budibase/server 1.0.201-alpha.0 → 1.0.201-alpha.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.201-alpha.0",
+  "version": "1.0.201-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,10 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.201-alpha.0",
-    "@budibase/client": "^1.0.201-alpha.0",
-    "@budibase/pro": "1.0.200",
-    "@budibase/string-templates": "^1.0.201-alpha.0",
+    "@budibase/backend-core": "^1.0.201-alpha.3",
+    "@budibase/client": "^1.0.201-alpha.3",
+    "@budibase/pro": "1.0.201-alpha.2",
+    "@budibase/string-templates": "^1.0.201-alpha.3",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -150,7 +150,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/types": "^1.0.201-alpha.0",
+    "@budibase/types": "^1.0.201-alpha.3",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
@@ -194,5 +194,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "61af1f299c62b5d3b5294d24f78ac7b31b132c58"
+  "gitHead": "4ffedac6e159719360b0c482866807d109efe9c6"
 }

package/src/api/controllers/dev.js

@@ -131,5 +131,5 @@ exports.getBudibaseVersion = async ctx => {
   ctx.body = {
     version,
   }
-  await events.version.checked(version)
+  await events.installation.versionChecked(version)
 }

package/src/api/routes/tests/dev.spec.js

@@ -33,8 +33,8 @@ describe("/dev", () => {
         .expect(200)
 
       expect(res.body.version).toBe(version)
-      expect(events.version.checked).toBeCalledTimes(1)
-      expect(events.version.checked).toBeCalledWith(version)
+      expect(events.installation.versionChecked).toBeCalledTimes(1)
+      expect(events.installation.versionChecked).toBeCalledWith(version)
     })
   })
 })

package/src/migrations/functions/backfill/global.ts

@@ -14,6 +14,7 @@ import {
   App,
   TenantBackfillSucceededEvent,
   Event,
+  User,
 } from "@budibase/types"
 import env from "../../../environment"
 import { DEFAULT_TIMESTAMP } from "."
@@ -94,8 +95,22 @@ export const run = async (db: any) => {
     const totals: any = {}
     const errors: any = []
 
+    let allUsers: User[] = []
     try {
-      const installTimestamp = await getInstallTimestamp(db)
+      allUsers = await users.getUsers(db)
+    } catch (e: any) {
+      handleError(e, errors)
+    }
+
+    if (!allUsers || allUsers.length === 0) {
+      // first time startup - we don't need to backfill anything
+      // tenant will be identified when admin user is created
+      await events.installation.firstStartup()
+      return
+    }
+
+    try {
+      const installTimestamp = await getInstallTimestamp(db, allUsers)
       if (installTimestamp) {
         timestamp = installTimestamp
       }
@@ -175,20 +190,25 @@ export const isComplete = async (): Promise<boolean> => {
 }
 
 export const getInstallTimestamp = async (
-  globalDb: any
+  globalDb: any,
+  allUsers?: User[]
 ): Promise<number | undefined> => {
-  const allUsers = await users.getUsers(globalDb)
+  if (!allUsers) {
+    allUsers = await users.getUsers(globalDb)
+  }
 
   // get the oldest user timestamp
-  const timestamps = allUsers
-    .map(user => user.createdAt)
-    .filter(timestamp => !!timestamp)
-    .sort(
-      (a, b) =>
-        new Date(a as number).getTime() - new Date(b as number).getTime()
-    )
-
-  if (timestamps.length) {
-    return timestamps[0]
+  if (allUsers) {
+    const timestamps = allUsers
+      .map(user => user.createdAt)
+      .filter(timestamp => !!timestamp)
+      .sort(
+        (a, b) =>
+          new Date(a as number).getTime() - new Date(b as number).getTime()
+      )
+
+    if (timestamps.length) {
+      return timestamps[0]
+    }
   }
 }

package/src/migrations/index.ts

@@ -104,7 +104,6 @@ export const migrate = async (options?: MigrationOptions) => {
 
 const migrateWithLock = async (options?: MigrationOptions) => {
   // get a new lock client
-
   const redlock = await redis.clients.getMigrationsRedlock()
   // lock for 15 minutes
   const ttl = 1000 * 60 * 15