diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml
index 278bd1767f..171bf5e6c1 100644
--- a/charts/budibase/templates/app-service-deployment.yaml
+++ b/charts/budibase/templates/app-service-deployment.yaml
@@ -30,6 +30,7 @@ spec:
{{- toYaml .Values.services.apps.templateLabels | indent 8 -}}
{{ end }}
spec:
+ terminationGracePeriodSeconds: 60
containers:
- env:
- name: BUDIBASE_ENVIRONMENT
diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml
index 94fdd0b94e..a68d466487 100644
--- a/charts/budibase/templates/worker-service-deployment.yaml
+++ b/charts/budibase/templates/worker-service-deployment.yaml
@@ -30,6 +30,7 @@ spec:
{{- toYaml .Values.services.worker.templateLabels | indent 8 -}}
{{ end }}
spec:
+ terminationGracePeriodSeconds: 60
containers:
- env:
- name: BUDIBASE_ENVIRONMENT
diff --git a/lerna.json b/lerna.json
index b957585f7b..a572de1d7f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
- "version": "3.10.0",
+ "version": "3.10.2",
"npmClient": "yarn",
"concurrency": 20,
"command": {
diff --git a/packages/backend-core/src/events/publishers/user.ts b/packages/backend-core/src/events/publishers/user.ts
index 43e5355bd5..14d336e852 100644
--- a/packages/backend-core/src/events/publishers/user.ts
+++ b/packages/backend-core/src/events/publishers/user.ts
@@ -14,7 +14,6 @@ import {
UserPermissionAssignedEvent,
UserPermissionRemovedEvent,
UserUpdatedEvent,
- UserOnboardingEvent,
} from "@budibase/types"
import { isScim } from "../../context"
@@ -51,16 +50,6 @@ async function deleted(user: User) {
await publishEvent(Event.USER_DELETED, properties)
}
-export async function onboardingComplete(user: User) {
- const properties: UserOnboardingEvent = {
- userId: user._id as string,
- audited: {
- email: user.email,
- },
- }
- await publishEvent(Event.USER_ONBOARDING_COMPLETE, properties)
-}
-
// PERMISSIONS
async function permissionAdminAssigned(user: User, timestamp?: number) {
@@ -191,7 +180,6 @@ export default {
permissionAdminRemoved,
permissionBuilderAssigned,
permissionBuilderRemoved,
- onboardingComplete,
invited,
inviteAccepted,
passwordForceReset,
diff --git a/packages/backend-core/src/users/events.ts b/packages/backend-core/src/users/events.ts
index f170c9ffe9..c6c3e94b33 100644
--- a/packages/backend-core/src/users/events.ts
+++ b/packages/backend-core/src/users/events.ts
@@ -76,10 +76,6 @@ export const handleSaveEvents = async (
await events.user.permissionAdminRemoved(user)
}
- if (isOnboardingComplete(user, existingUser)) {
- await events.user.onboardingComplete(user)
- }
-
if (
!existingUser.forceResetPassword &&
user.forceResetPassword &&
@@ -122,10 +118,6 @@ const isRemovingAdmin = (user: any, existingUser: any) => {
return isRemovingPermission(user, existingUser, hasAdminPermissions)
}
-const isOnboardingComplete = (user: any, existingUser: any) => {
- return !existingUser?.onboardedAt && typeof user.onboardedAt === "string"
-}
-
/**
* Check if a permission is being added to a new or existing user.
*/
diff --git a/packages/builder/src/components/common/EditableIcon.svelte b/packages/builder/src/components/common/EditableIcon.svelte
index 150a23ecb7..1c3975c6f9 100644
--- a/packages/builder/src/components/common/EditableIcon.svelte
+++ b/packages/builder/src/components/common/EditableIcon.svelte
@@ -1,15 +1,13 @@
-
@@ -28,7 +26,7 @@
-
+
diff --git a/packages/builder/src/components/portal/onboarding/TourWrap.svelte b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
deleted file mode 100644
index db0841a05b..0000000000
--- a/packages/builder/src/components/portal/onboarding/TourWrap.svelte
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
diff --git a/packages/builder/src/components/portal/onboarding/steps/NewFormSteps.svelte b/packages/builder/src/components/portal/onboarding/steps/NewFormSteps.svelte
deleted file mode 100644
index 7c3679f9e8..0000000000
--- a/packages/builder/src/components/portal/onboarding/steps/NewFormSteps.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
- When faced with a sizable form, consider implementing a multi-step approach to
- enhance user experience.
-
-
- Breaking the form into multiple steps can significantly improve usability by
- making the process more digestible for your users.
-
-
- You can use bindings to set the Row ID on your form.
-
- This will allow you to pull the correct information into your form and allow
- you to update!
-
-
- How to pass a row ID using bindings
-
-
- In this section you can manage the data for your app:
-
- - Connect data sources
- - Edit data
- - Manage read & write access
- - Create views
- - Add bindings
-
-
- After setting up your data, Design is where you build the screens for your
- app:
-
- - Add screens
- - Add components
- - Choose your theme
- - Edit navigation
-
-
- Once you’re happy with your app you can publish it to production!
-
- After publishing, any changes you make will not take affect until you next
- publish.
-
-
{
- if (!table) {
- return table
- }
+ return await tracer.trace("processTable", async span => {
+ if (!table) {
+ return table
+ }
- table = { ...table }
- if (table.views) {
- for (const [key, view] of Object.entries(table.views)) {
- if (!isV2(view)) {
- continue
+ span.addTags({ tableId: table._id })
+
+ table = { ...table }
+ if (table.views) {
+ span.addTags({ numViews: Object.keys(table.views).length })
+ for (const [key, view] of Object.entries(table.views)) {
+ if (!isV2(view)) {
+ continue
+ }
+ table.views[key] = ensureQueryUISet(view)
}
- table.views[key] = ensureQueryUISet(view)
}
- }
- if (table._id && isExternalTableID(table._id)) {
- // Old created external tables via Budibase might have a missing field name breaking some UI such as filters
- if (table.schema["id"] && !table.schema["id"].name) {
- table.schema["id"].name = "id"
+ if (table._id && isExternalTableID(table._id)) {
+ span.addTags({ isExternal: true })
+ // Old created external tables via Budibase might have a missing field name breaking some UI such as filters
+ if (table.schema["id"] && !table.schema["id"].name) {
+ table.schema["id"].name = "id"
+ }
+ return {
+ ...table,
+ type: "table",
+ sourceType: TableSourceType.EXTERNAL,
+ }
+ } else {
+ span.addTags({ isExternal: false })
+ const processed: Table = {
+ ...table,
+ type: "table",
+ primary: ["_id"], // internal tables must always use _id as primary key
+ sourceId: table.sourceId || INTERNAL_TABLE_SOURCE_ID,
+ sourceType: TableSourceType.INTERNAL,
+ sql: true,
+ }
+ return processed
}
- return {
- ...table,
- type: "table",
- sourceType: TableSourceType.EXTERNAL,
- }
- } else {
- const processed: Table = {
- ...table,
- type: "table",
- primary: ["_id"], // internal tables must always use _id as primary key
- sourceId: table.sourceId || INTERNAL_TABLE_SOURCE_ID,
- sourceType: TableSourceType.INTERNAL,
- sql: true,
- }
- return processed
- }
+ })
}
export async function processTables(tables: Table[]): Promise {
- return await Promise.all(tables.map(table => processTable(table)))
+ return await tracer.trace("processTables", async span => {
+ span.addTags({ numTables: tables.length })
+ return await Promise.all(tables.map(table => processTable(table)))
+ })
}
async function processEntities(tables: Record) {
- for (let key of Object.keys(tables)) {
- tables[key] = await processTable(tables[key])
- }
- return tables
+ return await tracer.trace("processEntities", async span => {
+ span.addTags({ numTables: Object.keys(tables).length })
+ for (let key of Object.keys(tables)) {
+ tables[key] = await processTable(tables[key])
+ }
+ return tables
+ })
}
export async function getAllInternalTables(db?: Database): Promise {
- if (!db) {
- db = context.getAppDB()
- }
- const internalTables = await db.allDocs(
- getTableParams(null, {
- include_docs: true,
- })
- )
- return await processTables(internalTables.rows.map(row => row.doc!))
+ return await tracer.trace("getAllInternalTables", async span => {
+ if (!db) {
+ db = context.getAppDB()
+ }
+ span.addTags({ db: db.name })
+ const internalTables = await db.allDocs(
+ getTableParams(null, {
+ include_docs: true,
+ })
+ )
+ span.addTags({ numTables: internalTables.rows.length })
+ return await processTables(internalTables.rows.map(row => row.doc!))
+ })
}
async function getAllExternalTables(): Promise {
- // this is all datasources, we'll need to filter out internal
- const datasources = await sdk.datasources.fetch({ enriched: true })
- const allEntities = datasources
- .filter(datasource => datasource._id !== INTERNAL_TABLE_SOURCE_ID)
- .map(datasource => datasource.entities)
- let final: Table[] = []
- for (let entities of allEntities) {
- if (entities) {
- final = final.concat(Object.values(entities))
+ return await tracer.trace("getAllExternalTables", async span => {
+ // this is all datasources, we'll need to filter out internal
+ const datasources = await sdk.datasources.fetch({ enriched: true })
+ span.addTags({ numDatasources: datasources.length })
+
+ const allEntities = datasources
+ .filter(datasource => datasource._id !== INTERNAL_TABLE_SOURCE_ID)
+ .map(datasource => datasource.entities)
+ span.addTags({ numEntities: allEntities.length })
+
+ let final: Table[] = []
+ for (let entities of allEntities) {
+ if (entities) {
+ final = final.concat(Object.values(entities))
+ }
}
- }
- return await processTables(final)
+ span.addTags({ numTables: final.length })
+ return await processTables(final)
+ })
}
export async function getExternalTable(
datasourceId: string,
tableName: string
): Promise {
- const entities = await getExternalTablesInDatasource(datasourceId)
- if (!entities[tableName]) {
- throw new Error(`Unable to find table named "${tableName}"`)
- }
- const table = await processTable(entities[tableName])
- if (!table.sourceId) {
- table.sourceId = datasourceId
- }
- return table
+ return await tracer.trace("getExternalTable", async span => {
+ span.addTags({ datasourceId, tableName })
+ const entities = await getExternalTablesInDatasource(datasourceId)
+ if (!entities[tableName]) {
+ throw new Error(`Unable to find table named "${tableName}"`)
+ }
+ const table = await processTable(entities[tableName])
+ if (!table.sourceId) {
+ table.sourceId = datasourceId
+ }
+ return table
+ })
}
export async function getTable(tableId: string): Promise {
- const db = context.getAppDB()
- let output: Table
- if (tableId && isExternalTableID(tableId)) {
- let { datasourceId, tableName } = breakExternalTableId(tableId)
- const datasource = await datasources.get(datasourceId)
- const table = await getExternalTable(datasourceId, tableName)
- output = { ...table, sql: isSQL(datasource) }
- } else {
- output = await db.get(tableId)
- }
- return await processTable(output)
+ return await tracer.trace("getTable", async span => {
+ const db = context.getAppDB()
+ span.addTags({ tableId, db: db.name })
+ let output: Table
+ if (tableId && isExternalTableID(tableId)) {
+ let { datasourceId, tableName } = breakExternalTableId(tableId)
+ span.addTags({ isExternal: true, datasourceId, tableName })
+ const datasource = await datasources.get(datasourceId)
+ const table = await getExternalTable(datasourceId, tableName)
+ output = { ...table, sql: isSQL(datasource) }
+ span.addTags({ isSQL: isSQL(datasource) })
+ } else {
+ output = await db.get(tableId)
+ }
+ return await processTable(output)
+ })
}
export async function doesTableExist(tableId: string): Promise {
- try {
- const table = await getTable(tableId)
- return !!table
- } catch (err) {
- return false
- }
+ return await tracer.trace("doesTableExist", async span => {
+ span.addTags({ tableId })
+ try {
+ const table = await getTable(tableId)
+ span.addTags({ tableExists: !!table })
+ return !!table
+ } catch (err) {
+ span.addTags({ tableExists: false })
+ return false
+ }
+ })
}
export async function getAllTables() {
- const [internal, external] = await Promise.all([
- getAllInternalTables(),
- getAllExternalTables(),
- ])
- return await processTables([...internal, ...external])
+ return await tracer.trace("getAllTables", async span => {
+ const [internal, external] = await Promise.all([
+ getAllInternalTables(),
+ getAllExternalTables(),
+ ])
+ span.addTags({
+ numInternalTables: internal.length,
+ numExternalTables: external.length,
+ })
+ return await processTables([...internal, ...external])
+ })
}
export async function getExternalTablesInDatasource(
datasourceId: string
): Promise> {
- const datasource = await datasources.get(datasourceId, { enriched: true })
- if (!datasource || !datasource.entities) {
- throw new Error("Datasource is not configured fully.")
- }
- return await processEntities(datasource.entities)
+ return await tracer.trace("getExternalTablesInDatasource", async span => {
+ const datasource = await datasources.get(datasourceId, { enriched: true })
+ if (!datasource || !datasource.entities) {
+ throw new Error("Datasource is not configured fully.")
+ }
+ span.addTags({
+ datasourceId,
+ numEntities: Object.keys(datasource.entities).length,
+ })
+ return await processEntities(datasource.entities)
+ })
}
export async function getTables(tableIds: string[]): Promise {
- const externalTableIds = tableIds.filter(tableId =>
- isExternalTableID(tableId)
- ),
- internalTableIds = tableIds.filter(tableId => !isExternalTableID(tableId))
- let tables: Table[] = []
- if (externalTableIds.length) {
- const externalTables = await getAllExternalTables()
- tables = tables.concat(
- externalTables.filter(
- table => externalTableIds.indexOf(table._id!) !== -1
+ return tracer.trace("getTables", async span => {
+ span.addTags({ numTableIds: tableIds.length })
+ const externalTableIds = tableIds.filter(tableId =>
+ isExternalTableID(tableId)
+ ),
+ internalTableIds = tableIds.filter(tableId => !isExternalTableID(tableId))
+ let tables: Table[] = []
+ if (externalTableIds.length) {
+ const externalTables = await getAllExternalTables()
+ tables = tables.concat(
+ externalTables.filter(
+ table => externalTableIds.indexOf(table._id!) !== -1
+ )
)
- )
- }
- if (internalTableIds.length) {
- const db = context.getAppDB()
- const internalTables = await db.getMultiple(internalTableIds, {
- allowMissing: true,
- })
- tables = tables.concat(internalTables)
- }
- return await processTables(tables)
+ }
+ if (internalTableIds.length) {
+ const db = context.getAppDB()
+ const internalTables = await db.getMultiple(internalTableIds, {
+ allowMissing: true,
+ })
+ tables = tables.concat(internalTables)
+ }
+ span.addTags({ numTables: tables.length })
+ return await processTables(tables)
+ })
}
export async function enrichViewSchemas(
table: Table
): Promise {
- const views = []
- for (const view of Object.values(table.views ?? [])) {
- if (sdk.views.isV2(view)) {
- views.push(await sdk.views.enrichSchema(view, table.schema))
- } else views.push(view)
- }
+ return await tracer.trace("enrichViewSchemas", async span => {
+ span.addTags({ tableId: table._id })
+ const views = []
+ for (const view of Object.values(table.views ?? [])) {
+ if (sdk.views.isV2(view)) {
+ views.push(await sdk.views.enrichSchema(view, table.schema))
+ } else views.push(view)
+ }
- return {
- ...table,
- views: views.reduce((p, v) => {
- p[v.name!] = v
- return p
- }, {} as TableViewsResponse),
- }
+ return {
+ ...table,
+ views: views.reduce((p, v) => {
+ p[v.name!] = v
+ return p
+ }, {} as TableViewsResponse),
+ }
+ })
}
diff --git a/packages/types/src/api/web/auth.ts b/packages/types/src/api/web/auth.ts
index 5ef6169086..ba61439786 100644
--- a/packages/types/src/api/web/auth.ts
+++ b/packages/types/src/api/web/auth.ts
@@ -38,10 +38,8 @@ export interface UpdateSelfRequest {
lastName?: string
password?: string
forceResetPassword?: boolean
- onboardedAt?: string
freeTrialConfirmedAt?: string
appFavourites?: string[]
- tours?: Record
appSort?: string
}
diff --git a/packages/types/src/documents/global/user.ts b/packages/types/src/documents/global/user.ts
index 14fb395211..dde6c78e5c 100644
--- a/packages/types/src/documents/global/user.ts
+++ b/packages/types/src/documents/global/user.ts
@@ -64,15 +64,15 @@ export interface User extends Document {
status?: UserStatus
createdAt?: number // override the default createdAt behaviour - users sdk historically set this to Date.now()
userGroups?: string[]
- onboardedAt?: string
freeTrialConfirmedAt?: string
- tours?: Record
scimInfo?: { isSync: true } & Record
appFavourites?: string[]
ssoId?: string
appSort?: string
budibaseAccess?: boolean
accountPortalAccess?: boolean
+ onboardedAt?: string // deprecated and no longer saved
+ tours?: Record // deprecated and no longer saved
}
export interface UserBindings extends Document {
diff --git a/packages/types/src/sdk/events/user.ts b/packages/types/src/sdk/events/user.ts
index eb3ebe97a5..ab72b9888b 100644
--- a/packages/types/src/sdk/events/user.ts
+++ b/packages/types/src/sdk/events/user.ts
@@ -24,14 +24,6 @@ export interface UserDeletedEvent extends BaseEvent {
}
}
-export interface UserOnboardingEvent extends BaseEvent {
- userId: string
- step?: string
- audited: {
- email: string
- }
-}
-
export interface UserPermissionAssignedEvent extends BaseEvent {
userId: string
audited: {
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 135e0528ac..4ed98fd532 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -75,7 +75,8 @@
"pouchdb": "7.3.0",
"pouchdb-all-dbs": "1.1.1",
"server-destroy": "1.0.1",
- "uuid": "^8.3.2"
+ "uuid": "^8.3.2",
+ "http-graceful-shutdown": "^3.1.12"
},
"devDependencies": {
"@jest/types": "^29.6.3",
diff --git a/packages/worker/src/api/routes/global/tests/self.spec.ts b/packages/worker/src/api/routes/global/tests/self.spec.ts
index bf34f14aa0..be3f816870 100644
--- a/packages/worker/src/api/routes/global/tests/self.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/self.spec.ts
@@ -47,13 +47,12 @@ describe("/api/global/self", () => {
})
})
- it("should update onboarding", async () => {
+ it("should update free trial confirmation date", async () => {
const user = await config.createUser()
await config.createSession(user)
const res = await config.api.self
.updateSelf(user, {
- onboardedAt: "2023-03-07T14:10:54.869Z",
freeTrialConfirmedAt: "2024-03-17T14:10:54.869Z",
})
.expect(200)
@@ -61,7 +60,6 @@ describe("/api/global/self", () => {
const dbUser = (await config.getUser(user.email))!
user._rev = dbUser._rev
- expect(dbUser.onboardedAt).toBe("2023-03-07T14:10:54.869Z")
expect(dbUser.freeTrialConfirmedAt).toBe("2024-03-17T14:10:54.869Z")
expect(res.body._id).toBe(user._id)
})
diff --git a/packages/worker/src/api/routes/validation/users.ts b/packages/worker/src/api/routes/validation/users.ts
index 46c66285fd..c509f7ba0b 100644
--- a/packages/worker/src/api/routes/validation/users.ts
+++ b/packages/worker/src/api/routes/validation/users.ts
@@ -25,10 +25,8 @@ export const buildSelfSaveValidation = () => {
forceResetPassword: Joi.boolean().optional(),
firstName: OPTIONAL_STRING,
lastName: OPTIONAL_STRING,
- onboardedAt: Joi.string().optional(),
freeTrialConfirmedAt: Joi.string().optional(),
appFavourites: Joi.array().optional(),
- tours: Joi.object().optional(),
appSort: Joi.string().optional(),
}
return auth.joiValidator.body(Joi.object(schema).required().unknown(false))
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index bfb022f213..767de5c7b2 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -26,12 +26,12 @@ db.init()
import koaBody from "koa-body"
import http from "http"
import api from "./api"
+import gracefulShutdown from "http-graceful-shutdown"
const koaSession = require("koa-session")
import { userAgent } from "koa-useragent"
-import destroyable from "server-destroy"
import { initPro } from "./initPro"
import { handleScimBody } from "./middleware/handleScimBody"
@@ -86,29 +86,40 @@ app.use(auth.passport.session())
app.use(api.routes())
const server = http.createServer(app.callback())
-destroyable(server)
-let shuttingDown = false,
- errCode = 0
-server.on("close", async () => {
- if (shuttingDown) {
- return
- }
- shuttingDown = true
- console.log("Server Closed")
+const shutdown = async () => {
+ console.log("Worker service shutting down gracefully...")
timers.cleanup()
events.shutdown()
await redis.clients.shutdown()
await queue.shutdown()
- if (!env.isTest()) {
- process.exit(errCode)
+}
+
+gracefulShutdown(server, {
+ signals: "SIGINT SIGTERM",
+ timeout: 30000,
+ onShutdown: shutdown,
+ forceExit: !env.isTest,
+ finally: () => {
+ console.log("Worker service shutdown complete")
+ },
+})
+
+process.on("uncaughtException", async err => {
+ logging.logAlert("Uncaught exception.", err)
+ await shutdown()
+ if (!env.isTest) {
+ process.exit(1)
}
})
-const shutdown = () => {
- server.close()
- server.destroy()
-}
+process.on("unhandledRejection", async reason => {
+ logging.logAlert("Unhandled Promise Rejection", reason as Error)
+ await shutdown()
+ if (!env.isTest) {
+ process.exit(1)
+ }
+})
export default server.listen(parseInt(env.PORT || "4002"), async () => {
let startupLog = `Worker running on ${JSON.stringify(server.address())}`
@@ -125,17 +136,3 @@ export default server.listen(parseInt(env.PORT || "4002"), async () => {
// can't integrate directly into backend-core due to cyclic issues
await events.processors.init(proSdk.auditLogs.write)
})
-
-process.on("uncaughtException", err => {
- errCode = -1
- logging.logAlert("Uncaught exception.", err)
- shutdown()
-})
-
-process.on("SIGTERM", () => {
- shutdown()
-})
-
-process.on("SIGINT", () => {
- shutdown()
-})
diff --git a/yarn.lock b/yarn.lock
index e9fe907277..a26d093ae7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13161,6 +13161,13 @@ http-errors@~1.6.2:
setprototypeof "1.1.0"
statuses ">= 1.4.0 < 2"
+http-graceful-shutdown@^3.1.12:
+ version "3.1.14"
+ resolved "https://registry.yarnpkg.com/http-graceful-shutdown/-/http-graceful-shutdown-3.1.14.tgz#a4d48ac5d985da18b4d35c050acd3ef10f02113d"
+ integrity sha512-aTbGAZDUtRt7gRmU+li7rt5WbJeemULZHLNrycJ1dRBU80Giut6NvzG8h5u1TW1zGHXkPGpEtoEKhPKogIRKdA==
+ dependencies:
+ debug "^4.3.4"
+
http-proxy-agent@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"