From fe17abd7be9321e3d1ab05c865d816f0bde22bcf Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 6 Apr 2023 14:22:21 +0100 Subject: [PATCH 01/57] Add postgresSQL tests --- .../internal-api/api/BudibaseInternalAPI.ts | 3 + qa-core/src/internal-api/api/apis/AppAPI.ts | 1 + .../internal-api/api/apis/DatasourcesAPI.ts | 87 +++++++++++++++++++ .../src/internal-api/fixtures/datasources.ts | 37 ++++++++ qa-core/src/internal-api/fixtures/index.ts | 1 + .../tests/dataSources/postgresSQL.spec.ts | 60 +++++++++++++ qa-core/src/types/addedDatasource.ts | 5 ++ qa-core/src/types/index.ts | 1 + 8 files changed, 195 insertions(+) create mode 100644 qa-core/src/internal-api/api/apis/DatasourcesAPI.ts create mode 100644 qa-core/src/internal-api/fixtures/datasources.ts create mode 100644 qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts create mode 100644 qa-core/src/types/addedDatasource.ts diff --git a/qa-core/src/internal-api/api/BudibaseInternalAPI.ts b/qa-core/src/internal-api/api/BudibaseInternalAPI.ts index 5bb6b72ef0..4796799396 100644 --- a/qa-core/src/internal-api/api/BudibaseInternalAPI.ts +++ b/qa-core/src/internal-api/api/BudibaseInternalAPI.ts @@ -7,6 +7,7 @@ import ScreenAPI from "./apis/ScreenAPI" import SelfAPI from "./apis/SelfAPI" import TableAPI from "./apis/TableAPI" import UserAPI from "./apis/UserAPI" +import DatasourcesAPI from "./apis/DatasourcesAPI" import BudibaseInternalAPIClient from "./BudibaseInternalAPIClient" import { State } from "../../types" @@ -22,6 +23,7 @@ export default class BudibaseInternalAPI { self: SelfAPI tables: TableAPI users: UserAPI + datasources: DatasourcesAPI constructor(state: State) { this.client = new BudibaseInternalAPIClient(state) @@ -35,5 +37,6 @@ export default class BudibaseInternalAPI { this.self = new SelfAPI(this.client) this.tables = new TableAPI(this.client) this.users = new UserAPI(this.client) + this.datasources = new DatasourcesAPI(this.client) } } diff --git a/qa-core/src/internal-api/api/apis/AppAPI.ts b/qa-core/src/internal-api/api/apis/AppAPI.ts index 992728899e..bdbf5ba85d 100644 --- a/qa-core/src/internal-api/api/apis/AppAPI.ts +++ b/qa-core/src/internal-api/api/apis/AppAPI.ts @@ -60,6 +60,7 @@ export default class AppAPI { const [response, json] = await this.client.post(`/applications`, { body }) expect(response).toHaveStatusCode(200) expect(json._id).toBeDefined() + this.client.state.appId = json._id return json } diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts new file mode 100644 index 0000000000..15215b7ba4 --- /dev/null +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -0,0 +1,87 @@ +import { Response } from "node-fetch" +import { Datasource } from "@budibase/types" +import { AddedDatasource } from "../../../types" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" + +export default class DatasourcesAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async getIntegrations(): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/integrations`) + expect(response).toHaveStatusCode(200) + const integrationsCount = Object.keys(json).length + expect(integrationsCount).toBe(16) + return [response, json] + } + + async getAll(): Promise<[Response, Datasource[]]> { + const [response, json] = await this.client.get(`/datasources`) + expect(response).toHaveStatusCode(200) + expect(json.length).toBeGreaterThan(0) + return [response, json] + } + + async getTable(dataSourceId: string): Promise<[Response, Datasource]> { + const [response, json] = await this.client.get( + `/datasources/${dataSourceId}` + ) + expect(response).toHaveStatusCode(200) + expect(json._id).toEqual(dataSourceId) + return [response, json] + } + + async add(body: any): Promise<[Response, AddedDatasource]> { + //temporarily using a hard coded datasource to test 500 error + const [response, json] = await this.client.post(`/datasources`, { body }) + expect(response).toHaveStatusCode(200) + expect(json.datasource._id).toBeDefined() + expect(json.datasource._rev).toBeDefined() + + return [response, json] + } + + async update(body: any): Promise<[Response, AddedDatasource]> { + const [response, json] = await this.client.put(`/datasources/${body._id}`, { + body, + }) + expect(response).toHaveStatusCode(200) + expect(json.datasource._id).toBeDefined() + expect(json.datasource._rev).toBeDefined() + + return [response, json] + } + + async previewQuery(body: any): Promise<[Response, any]> { + const [response, json] = await this.client.post(`/queries/preview`, { + body, + }) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async saveQuery(body: any): Promise<[Response, any]> { + const [response, json] = await this.client.post(`/queries`, { + body, + }) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async getQuery(queryId: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/queries/${queryId}`) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async delete(dataSourceId: string, revId: string): Promise { + const [response, json] = await this.client.del( + `/datasources/${dataSourceId}/${revId}` + ) + expect(response).toHaveStatusCode(200) + return response + } +} diff --git a/qa-core/src/internal-api/fixtures/datasources.ts b/qa-core/src/internal-api/fixtures/datasources.ts new file mode 100644 index 0000000000..feb51add32 --- /dev/null +++ b/qa-core/src/internal-api/fixtures/datasources.ts @@ -0,0 +1,37 @@ +// Add information about the data source to the fixtures file from 1password + +export const mongoDB = () => { + return { + datasource: { + name: "MongoDB", + source: "MONGODB", + type: "datasource", + config: { + connectionString: "", + db: "", + }, + }, + + fetchSchema: false, + } +} + +export const postgresSQL = () => { + return { + datasource: { + name: "PostgresSQL", + plus: true, + source: "POSTGRES", + type: "datasource", + config: { + database: "", + host: "", + password: "", + port: 1111, + schema: "public", + user: "", + }, + }, + fetchSchema: true, + } +} diff --git a/qa-core/src/internal-api/fixtures/index.ts b/qa-core/src/internal-api/fixtures/index.ts index d97c5f76b7..880ff8d3d9 100644 --- a/qa-core/src/internal-api/fixtures/index.ts +++ b/qa-core/src/internal-api/fixtures/index.ts @@ -4,3 +4,4 @@ export * as rows from "./rows" export * as screens from "./screens" export * as tables from "./tables" export * as users from "./users" +export * as datasources from "./datasources" diff --git a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts new file mode 100644 index 0000000000..b244cbde4b --- /dev/null +++ b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts @@ -0,0 +1,60 @@ +import TestConfiguration from "../../config/TestConfiguration" +import * as fixtures from "../../fixtures" + +describe("Internal API - Data Sources: PostgresSQL", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + + it("Create an app with a data source - PostgresSQL", async () => { + // Create app + const app = await config.api.apps.create({ + ...fixtures.apps.generateApp(), + useTemplate: "false", + }) + + // Add data source + const [dataSourceResponse, dataSourceJson] = + await config.api.datasources.add(fixtures.datasources.postgresSQL()) + const newDataSourceInfo = { + ...dataSourceJson.datasource, + name: "PostgresSQL2", + } + const [updatedDataSourceResponse, updatedDataSourceJson] = + await config.api.datasources.update(newDataSourceInfo) + + const dataSourceQuery = { + datasourceId: updatedDataSourceJson.datasource._id, + fields: { + sql: "SELECT * FROM categories;", + }, + name: "Query 1", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } + // Query data source + + const [queryResponse, queryJson] = + await config.api.datasources.previewQuery(dataSourceQuery) + + // Save query + const [saveQueryResponse, saveQueryJson] = + await config.api.datasources.saveQuery(dataSourceQuery) + // Get Query + const [getQueryResponse, getQueryJson] = + await config.api.datasources.getQuery(saveQueryJson._id) + // Delete data source + const deleteResponse = await config.api.datasources.delete( + updatedDataSourceJson.datasource._id, + updatedDataSourceJson.datasource._rev + ) + }) +}) diff --git a/qa-core/src/types/addedDatasource.ts b/qa-core/src/types/addedDatasource.ts new file mode 100644 index 0000000000..65f51fd1bd --- /dev/null +++ b/qa-core/src/types/addedDatasource.ts @@ -0,0 +1,5 @@ +import { Datasource } from "@budibase/types" + +export interface AddedDatasource { + datasource: Datasource +} diff --git a/qa-core/src/types/index.ts b/qa-core/src/types/index.ts index bc75da46f8..6c3740200c 100644 --- a/qa-core/src/types/index.ts +++ b/qa-core/src/types/index.ts @@ -8,6 +8,7 @@ export * from "./responseMessage" export * from "./routing" export * from "./state" export * from "./unpublishAppResponse" +export * from "./addedDatasource" // re-export public api types export * from "@budibase/server/api/controllers/public/mapping/types" From 0562cf511c28968e0b994702193c2b76c3d0539d Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Tue, 11 Apr 2023 15:44:00 +0100 Subject: [PATCH 02/57] Add tests for datasources --- qa-core/src/internal-api/api/apis/AppAPI.ts | 1 - .../internal-api/api/apis/DatasourcesAPI.ts | 7 +- .../src/internal-api/fixtures/datasources.ts | 36 +++++++-- .../tests/dataSources/example.spec.ts | 27 ------- .../tests/dataSources/mariaDB.spec.ts | 71 ++++++++++++++++++ .../tests/dataSources/mongoDB.spec.ts | 75 +++++++++++++++++++ .../tests/dataSources/postgresSQL.spec.ts | 21 ++++-- 7 files changed, 196 insertions(+), 42 deletions(-) delete mode 100644 qa-core/src/internal-api/tests/dataSources/example.spec.ts create mode 100644 qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts create mode 100644 qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts diff --git a/qa-core/src/internal-api/api/apis/AppAPI.ts b/qa-core/src/internal-api/api/apis/AppAPI.ts index bdbf5ba85d..992728899e 100644 --- a/qa-core/src/internal-api/api/apis/AppAPI.ts +++ b/qa-core/src/internal-api/api/apis/AppAPI.ts @@ -60,7 +60,6 @@ export default class AppAPI { const [response, json] = await this.client.post(`/applications`, { body }) expect(response).toHaveStatusCode(200) expect(json._id).toBeDefined() - this.client.state.appId = json._id return json } diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts index 15215b7ba4..f61692b02f 100644 --- a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -35,7 +35,6 @@ export default class DatasourcesAPI { } async add(body: any): Promise<[Response, AddedDatasource]> { - //temporarily using a hard coded datasource to test 500 error const [response, json] = await this.client.post(`/datasources`, { body }) expect(response).toHaveStatusCode(200) expect(json.datasource._id).toBeDefined() @@ -77,6 +76,12 @@ export default class DatasourcesAPI { return [response, json] } + async getQueryPermissions(queryId: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/permissions/${queryId}`) + expect(response).toHaveStatusCode(200) + return [response, json] + } + async delete(dataSourceId: string, revId: string): Promise { const [response, json] = await this.client.del( `/datasources/${dataSourceId}/${revId}` diff --git a/qa-core/src/internal-api/fixtures/datasources.ts b/qa-core/src/internal-api/fixtures/datasources.ts index feb51add32..a8d59b88a1 100644 --- a/qa-core/src/internal-api/fixtures/datasources.ts +++ b/qa-core/src/internal-api/fixtures/datasources.ts @@ -1,5 +1,4 @@ // Add information about the data source to the fixtures file from 1password - export const mongoDB = () => { return { datasource: { @@ -7,8 +6,8 @@ export const mongoDB = () => { source: "MONGODB", type: "datasource", config: { - connectionString: "", - db: "", + connectionString: process.env.MONGODB_CONNECTION_STRING, + db: process.env.MONGODB_DB, }, }, @@ -24,12 +23,33 @@ export const postgresSQL = () => { source: "POSTGRES", type: "datasource", config: { - database: "", - host: "", - password: "", - port: 1111, + database: process.env.POSTGRES_DB, + host: process.env.POSTGRES_HOST, + password: process.env.POSTGRES_PASSWORD, + port: process.env.POSTGRES_PORT, schema: "public", - user: "", + user: process.env.POSTGRES_USER, + }, + }, + fetchSchema: true, + } +} + +// Add the data source for MariaDB to the this file in the same style as above +export const mariaDB = () => { + return { + datasource: { + name: "MariaDB", + plus: true, + source: "MYSQL", + type: "datasource", + config: { + database: process.env.MARIADB_DB, + host: process.env.MARIADB_HOST, + password: process.env.MARIADB_PASSWORD, + port: process.env.MARIADB_PORT, + schema: "public", + user: process.env.MARIADB_USER, }, }, fetchSchema: true, diff --git a/qa-core/src/internal-api/tests/dataSources/example.spec.ts b/qa-core/src/internal-api/tests/dataSources/example.spec.ts deleted file mode 100644 index 0b8bc38a45..0000000000 --- a/qa-core/src/internal-api/tests/dataSources/example.spec.ts +++ /dev/null @@ -1,27 +0,0 @@ -import TestConfiguration from "../../config/TestConfiguration" -import * as fixtures from "../../fixtures" - -describe("Internal API - Data Sources", () => { - const config = new TestConfiguration() - - beforeAll(async () => { - await config.beforeAll() - }) - - afterAll(async () => { - await config.afterAll() - }) - - it("Create an app with a data source", async () => { - // Create app - await config.createApp() - - // Create Screen - const roleArray = ["BASIC", "POWER", "ADMIN", "PUBLIC"] - for (let role in roleArray) { - const [response, screen] = await config.api.screens.create( - fixtures.screens.generateScreen(roleArray[role]) - ) - } - }) -}) diff --git a/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts new file mode 100644 index 0000000000..4ff9a7cd0a --- /dev/null +++ b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts @@ -0,0 +1,71 @@ +import TestConfiguration from "../../config/TestConfiguration" +import * as fixtures from "../../fixtures" + +describe("Internal API - Data Sources: MariaDB", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + + it("Create an app with a data source - MariaDB", async () => { + // Create app + await config.createApp() + + // Add data source + const [dataSourceResponse, dataSourceJson] = + await config.api.datasources.add(fixtures.datasources.mariaDB()) + + // Update data source + const newDataSourceInfo = { + ...dataSourceJson.datasource, + name: "MariaDB2", + } + const [updatedDataSourceResponse, updatedDataSourceJson] = + await config.api.datasources.update(newDataSourceInfo) + + const dataSourceQuery = { + datasourceId: updatedDataSourceJson.datasource._id, + fields: { + sql: "SELECT * FROM employees;", + }, + name: "Query 1", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } + // Query data source + + const [queryResponse, queryJson] = + await config.api.datasources.previewQuery(dataSourceQuery) + + // Save query + const datasourcetoSave = { + ...dataSourceQuery, + parameters: [], + } + + const [saveQueryResponse, saveQueryJson] = + await config.api.datasources.saveQuery(datasourcetoSave) + // Get Query + const [getQueryResponse, getQueryJson] = + await config.api.datasources.getQuery(saveQueryJson._id) + + // Get Query permissions + const [getQueryPermissionsResponse, getQueryPermissionsJson] = + await config.api.datasources.getQueryPermissions( + saveQueryJson._id + ) + + // Delete data source + const deleteResponse = await config.api.datasources.delete( + updatedDataSourceJson.datasource._id, + updatedDataSourceJson.datasource._rev + ) + }) +}) diff --git a/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts new file mode 100644 index 0000000000..6c57467930 --- /dev/null +++ b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts @@ -0,0 +1,75 @@ +import TestConfiguration from "../../config/TestConfiguration" +import * as fixtures from "../../fixtures" + +describe("Internal API - Data Sources: MongoDB", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + + it("Create an app with a data source - MongoDB", async () => { + // Create app + await config.createApp() + + // Add data source + const [dataSourceResponse, dataSourceJson] = + await config.api.datasources.add(fixtures.datasources.mongoDB()) + + // Update data source + const newDataSourceInfo = { + ...dataSourceJson.datasource, + name: "MongoDB2", + } + const [updatedDataSourceResponse, updatedDataSourceJson] = + await config.api.datasources.update(newDataSourceInfo) + + const dataSourceQuery = { + datasourceId: updatedDataSourceJson.datasource._id, + fields: { + extra: { + collection: "movies", + actionType: "find", + }, + json: "", + }, + name: "Test Query", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } + // Query data source + + const [queryResponse, queryJson] = + await config.api.datasources.previewQuery(dataSourceQuery) + + // Save query + const datasourcetoSave = { + ...dataSourceQuery, + parameters: [], + } + + const [saveQueryResponse, saveQueryJson] = + await config.api.datasources.saveQuery(datasourcetoSave) + // Get Query + const [getQueryResponse, getQueryJson] = + await config.api.datasources.getQuery(saveQueryJson._id) + + // Get Query permissions + const [getQueryPermissionsResponse, getQueryPermissionsJson] = + await config.api.datasources.getQueryPermissions( + saveQueryJson._id + ) + + // Delete data source + const deleteResponse = await config.api.datasources.delete( + updatedDataSourceJson.datasource._id, + updatedDataSourceJson.datasource._rev + ) + }) +}) diff --git a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts index b244cbde4b..83d1fc782d 100644 --- a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts @@ -14,14 +14,13 @@ describe("Internal API - Data Sources: PostgresSQL", () => { it("Create an app with a data source - PostgresSQL", async () => { // Create app - const app = await config.api.apps.create({ - ...fixtures.apps.generateApp(), - useTemplate: "false", - }) + await config.createApp() // Add data source const [dataSourceResponse, dataSourceJson] = await config.api.datasources.add(fixtures.datasources.postgresSQL()) + + // Update data source const newDataSourceInfo = { ...dataSourceJson.datasource, name: "PostgresSQL2", @@ -46,11 +45,23 @@ describe("Internal API - Data Sources: PostgresSQL", () => { await config.api.datasources.previewQuery(dataSourceQuery) // Save query + const datasourcetoSave = { + ...dataSourceQuery, + parameters: [], + } + const [saveQueryResponse, saveQueryJson] = - await config.api.datasources.saveQuery(dataSourceQuery) + await config.api.datasources.saveQuery(datasourcetoSave) // Get Query const [getQueryResponse, getQueryJson] = await config.api.datasources.getQuery(saveQueryJson._id) + + // Get Query permissions + const [getQueryPermissionsResponse, getQueryPermissionsJson] = + await config.api.datasources.getQueryPermissions( + saveQueryJson._id + ) + // Delete data source const deleteResponse = await config.api.datasources.delete( updatedDataSourceJson.datasource._id, From a8460169d12c4b8786186096198512b40a5f5161 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 12 Apr 2023 18:18:28 +0100 Subject: [PATCH 03/57] Improvements on types, helpers and assertions --- .../types/src/documents/app/datasource.ts | 8 ++ packages/types/src/documents/app/query.ts | 4 + qa-core/src/environment.ts | 14 ++++ .../internal-api/api/BudibaseInternalAPI.ts | 9 +++ .../internal-api/api/apis/DatasourcesAPI.ts | 11 ++- .../internal-api/api/apis/IntegrationsAPI.ts | 18 +++++ .../internal-api/api/apis/PermissionsAPI.ts | 16 ++++ .../src/internal-api/api/apis/QueriesAPI.ts | 33 ++++++++ qa-core/src/internal-api/fixtures/index.ts | 1 + qa-core/src/internal-api/fixtures/queries.ts | 75 +++++++++++++++++++ .../tests/dataSources/mariaDB.spec.ts | 46 ++++++------ .../tests/dataSources/mongoDB.spec.ts | 50 ++++++------- .../tests/dataSources/postgresSQL.spec.ts | 46 ++++++------ qa-core/src/types/addedDatasource.ts | 5 -- 14 files changed, 251 insertions(+), 85 deletions(-) create mode 100644 qa-core/src/internal-api/api/apis/IntegrationsAPI.ts create mode 100644 qa-core/src/internal-api/api/apis/PermissionsAPI.ts create mode 100644 qa-core/src/internal-api/api/apis/QueriesAPI.ts create mode 100644 qa-core/src/internal-api/fixtures/queries.ts delete mode 100644 qa-core/src/types/addedDatasource.ts diff --git a/packages/types/src/documents/app/datasource.ts b/packages/types/src/documents/app/datasource.ts index 8dfdfe6d0f..9b498fb4b3 100644 --- a/packages/types/src/documents/app/datasource.ts +++ b/packages/types/src/documents/app/datasource.ts @@ -56,3 +56,11 @@ export interface RestConfig { } ] } + +export interface CreateDatasourceResponse { + datasource: Datasource +} + +export interface UpdatedDatasourceResponse { + datasource: Datasource +} diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts index 72b6c288a5..d0bbf05b5c 100644 --- a/packages/types/src/documents/app/query.ts +++ b/packages/types/src/documents/app/query.ts @@ -42,3 +42,7 @@ export interface PaginationValues { page: string | number | null limit: number | null } + +export interface PreviewQueryRequest extends Omit { + parameters: {} +} diff --git a/qa-core/src/environment.ts b/qa-core/src/environment.ts index 9377461a24..262f5505df 100644 --- a/qa-core/src/environment.ts +++ b/qa-core/src/environment.ts @@ -13,6 +13,20 @@ const env = { ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL, BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL, BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD, + POSTGRES_HOST: process.env.POSTGRES_HOST, + POSTGRES_PORT: process.env.POSTGRES_PORT, + POSTGRES_DB: process.env.POSTGRES_DB, + POSTGRES_USER: process.env.POSTGRES_USER, + POSTGRES_PASSWORD: process.env.POSTGRES_PASSWORD, + MONGODB_CONNECTION_STRING: process.env.MONGODB_CONNECTION_STRING, + MONGODB_DB: process.env.MONGODB_DB, + REST_API_BASE_URL: process.env.REST_API_BASE_URL, + REST_API_KEY: process.env.REST_API_KEY, + MARIADB_HOST: process.env.MARIADB_HOST, + MARIADB_PORT: process.env.MARIADB_PORT, + MARIADB_DB: process.env.MARIADB_DB, + MARIADB_USER: process.env.MARIADB_USER, + MARIADB_PASSWORD: process.env.MARIADB_PASSWORD, } export = env diff --git a/qa-core/src/internal-api/api/BudibaseInternalAPI.ts b/qa-core/src/internal-api/api/BudibaseInternalAPI.ts index 4796799396..316775b1b9 100644 --- a/qa-core/src/internal-api/api/BudibaseInternalAPI.ts +++ b/qa-core/src/internal-api/api/BudibaseInternalAPI.ts @@ -8,6 +8,9 @@ import SelfAPI from "./apis/SelfAPI" import TableAPI from "./apis/TableAPI" import UserAPI from "./apis/UserAPI" import DatasourcesAPI from "./apis/DatasourcesAPI" +import IntegrationsAPI from "./apis/IntegrationsAPI" +import QueriesAPI from "./apis/QueriesAPI" +import PermissionsAPI from "./apis/PermissionsAPI" import BudibaseInternalAPIClient from "./BudibaseInternalAPIClient" import { State } from "../../types" @@ -24,6 +27,9 @@ export default class BudibaseInternalAPI { tables: TableAPI users: UserAPI datasources: DatasourcesAPI + integrations: IntegrationsAPI + queries: QueriesAPI + permissions: PermissionsAPI constructor(state: State) { this.client = new BudibaseInternalAPIClient(state) @@ -38,5 +44,8 @@ export default class BudibaseInternalAPI { this.tables = new TableAPI(this.client) this.users = new UserAPI(this.client) this.datasources = new DatasourcesAPI(this.client) + this.integrations = new IntegrationsAPI(this.client) + this.queries = new QueriesAPI(this.client) + this.permissions = new PermissionsAPI(this.client) } } diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts index f61692b02f..7b9d7af789 100644 --- a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -1,6 +1,9 @@ import { Response } from "node-fetch" -import { Datasource } from "@budibase/types" -import { AddedDatasource } from "../../../types" +import { + Datasource, + CreateDatasourceResponse, + UpdatedDatasourceResponse, +} from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" export default class DatasourcesAPI { @@ -34,7 +37,7 @@ export default class DatasourcesAPI { return [response, json] } - async add(body: any): Promise<[Response, AddedDatasource]> { + async add(body: any): Promise<[Response, CreateDatasourceResponse]> { const [response, json] = await this.client.post(`/datasources`, { body }) expect(response).toHaveStatusCode(200) expect(json.datasource._id).toBeDefined() @@ -43,7 +46,7 @@ export default class DatasourcesAPI { return [response, json] } - async update(body: any): Promise<[Response, AddedDatasource]> { + async update(body: any): Promise<[Response, UpdatedDatasourceResponse]> { const [response, json] = await this.client.put(`/datasources/${body._id}`, { body, }) diff --git a/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts new file mode 100644 index 0000000000..b42b999825 --- /dev/null +++ b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts @@ -0,0 +1,18 @@ +import { Response } from "node-fetch" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" + +export default class IntegrationsAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async getAll(): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/integrations`) + expect(response).toHaveStatusCode(200) + const integrationsCount = Object.keys(json).length + expect(integrationsCount).toBe(16) + return [response, json] + } +} diff --git a/qa-core/src/internal-api/api/apis/PermissionsAPI.ts b/qa-core/src/internal-api/api/apis/PermissionsAPI.ts new file mode 100644 index 0000000000..e78ef7560d --- /dev/null +++ b/qa-core/src/internal-api/api/apis/PermissionsAPI.ts @@ -0,0 +1,16 @@ +import { Response } from "node-fetch" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" + +export default class PermissionsAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async getAll(id: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/permissions/${id}`) + expect(response).toHaveStatusCode(200) + return [response, json] + } +} diff --git a/qa-core/src/internal-api/api/apis/QueriesAPI.ts b/qa-core/src/internal-api/api/apis/QueriesAPI.ts new file mode 100644 index 0000000000..5c8ac9883e --- /dev/null +++ b/qa-core/src/internal-api/api/apis/QueriesAPI.ts @@ -0,0 +1,33 @@ +import { Response } from "node-fetch" +import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" +import { PreviewQueryRequest, Query } from "@budibase/types" + +export default class DatasourcesAPI { + client: BudibaseInternalAPIClient + + constructor(client: BudibaseInternalAPIClient) { + this.client = client + } + + async preview(body: PreviewQueryRequest): Promise<[Response, any]> { + const [response, json] = await this.client.post(`/queries/preview`, { + body, + }) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async save(body: Query): Promise<[Response, any]> { + const [response, json] = await this.client.post(`/queries`, { + body, + }) + expect(response).toHaveStatusCode(200) + return [response, json] + } + + async get(queryId: string): Promise<[Response, any]> { + const [response, json] = await this.client.get(`/queries/${queryId}`) + expect(response).toHaveStatusCode(200) + return [response, json] + } +} diff --git a/qa-core/src/internal-api/fixtures/index.ts b/qa-core/src/internal-api/fixtures/index.ts index 880ff8d3d9..38291052b8 100644 --- a/qa-core/src/internal-api/fixtures/index.ts +++ b/qa-core/src/internal-api/fixtures/index.ts @@ -5,3 +5,4 @@ export * as screens from "./screens" export * as tables from "./tables" export * as users from "./users" export * as datasources from "./datasources" +export * as queries from "./queries" diff --git a/qa-core/src/internal-api/fixtures/queries.ts b/qa-core/src/internal-api/fixtures/queries.ts new file mode 100644 index 0000000000..7ba81fc744 --- /dev/null +++ b/qa-core/src/internal-api/fixtures/queries.ts @@ -0,0 +1,75 @@ +import { PreviewQueryRequest } from "@budibase/types" + +const query = (datasourceId: string, fields: any): any => { + return { + datasourceId: datasourceId, + fields: fields, + name: "Query 1", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } +} + +export const mariaDB = (datasourceId: string): PreviewQueryRequest => { + const fields = { + sql: "SELECT * FROM employees LIMIT 10;", + } + return query(datasourceId, fields) +} + +export const mongoDB = (datasourceId: string): PreviewQueryRequest => { + const fields = { + extra: { + collection: "movies", + actionType: "find", + }, + json: "", + } + return query(datasourceId, fields) +} + +export const postgres = (datasourceId: string): PreviewQueryRequest => { + const fields = { + sql: "SELECT * FROM customers;", + } + return query(datasourceId, fields) +} + +export const expectedSchemaFields = { + mariaDB: { + birth_date: "string", + emp_no: "number", + first_name: "string", + gender: "string", + hire_date: "string", + last_name: "string", + }, + mongoDB: { + directors: "array", + genres: "array", + image: "string", + plot: "string", + rank: "number", + rating: "number", + release_date: "string", + running_time_secs: "number", + title: "string", + year: "number", + _id: "json", + }, + postgres: { + address: "string", + city: "string", + company_name: "string", + contact_name: "string", + contact_title: "string", + country: "string", + customer_id: "string", + fax: "string", + phone: "string", + postal_code: "string", + region: "string", + }, +} diff --git a/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts index 4ff9a7cd0a..44c2c03c8b 100644 --- a/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/mariaDB.spec.ts @@ -1,5 +1,6 @@ import TestConfiguration from "../../config/TestConfiguration" import * as fixtures from "../../fixtures" +import { Query } from "@budibase/types" describe("Internal API - Data Sources: MariaDB", () => { const config = new TestConfiguration() @@ -16,6 +17,9 @@ describe("Internal API - Data Sources: MariaDB", () => { // Create app await config.createApp() + // Get all integrations + await config.api.integrations.getAll() + // Add data source const [dataSourceResponse, dataSourceJson] = await config.api.datasources.add(fixtures.datasources.mariaDB()) @@ -28,44 +32,38 @@ describe("Internal API - Data Sources: MariaDB", () => { const [updatedDataSourceResponse, updatedDataSourceJson] = await config.api.datasources.update(newDataSourceInfo) - const dataSourceQuery = { - datasourceId: updatedDataSourceJson.datasource._id, - fields: { - sql: "SELECT * FROM employees;", - }, - name: "Query 1", - parameters: {}, - queryVerb: "read", - schema: {}, - transformer: "return data", - } // Query data source + const [queryResponse, queryJson] = await config.api.queries.preview( + fixtures.queries.mariaDB(updatedDataSourceJson.datasource._id!) + ) - const [queryResponse, queryJson] = - await config.api.datasources.previewQuery(dataSourceQuery) + expect(queryJson.rows.length).toEqual(10) + expect(queryJson.schemaFields).toEqual( + fixtures.queries.expectedSchemaFields.mariaDB + ) // Save query - const datasourcetoSave = { - ...dataSourceQuery, + const datasourcetoSave: Query = { + ...fixtures.queries.mariaDB(updatedDataSourceJson.datasource._id!), parameters: [], } - const [saveQueryResponse, saveQueryJson] = - await config.api.datasources.saveQuery(datasourcetoSave) + const [saveQueryResponse, saveQueryJson] = await config.api.queries.save( + datasourcetoSave + ) // Get Query - const [getQueryResponse, getQueryJson] = - await config.api.datasources.getQuery(saveQueryJson._id) + const [getQueryResponse, getQueryJson] = await config.api.queries.get( + saveQueryJson._id + ) // Get Query permissions const [getQueryPermissionsResponse, getQueryPermissionsJson] = - await config.api.datasources.getQueryPermissions( - saveQueryJson._id - ) + await config.api.permissions.getAll(saveQueryJson._id!) // Delete data source const deleteResponse = await config.api.datasources.delete( - updatedDataSourceJson.datasource._id, - updatedDataSourceJson.datasource._rev + updatedDataSourceJson.datasource._id!, + updatedDataSourceJson.datasource._rev! ) }) }) diff --git a/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts index 6c57467930..ed5178b57c 100644 --- a/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/mongoDB.spec.ts @@ -1,5 +1,6 @@ import TestConfiguration from "../../config/TestConfiguration" import * as fixtures from "../../fixtures" +import { Query } from "@budibase/types" describe("Internal API - Data Sources: MongoDB", () => { const config = new TestConfiguration() @@ -16,6 +17,9 @@ describe("Internal API - Data Sources: MongoDB", () => { // Create app await config.createApp() + // Get all integrations + await config.api.integrations.getAll() + // Add data source const [dataSourceResponse, dataSourceJson] = await config.api.datasources.add(fixtures.datasources.mongoDB()) @@ -28,48 +32,38 @@ describe("Internal API - Data Sources: MongoDB", () => { const [updatedDataSourceResponse, updatedDataSourceJson] = await config.api.datasources.update(newDataSourceInfo) - const dataSourceQuery = { - datasourceId: updatedDataSourceJson.datasource._id, - fields: { - extra: { - collection: "movies", - actionType: "find", - }, - json: "", - }, - name: "Test Query", - parameters: {}, - queryVerb: "read", - schema: {}, - transformer: "return data", - } // Query data source + const [queryResponse, queryJson] = await config.api.queries.preview( + fixtures.queries.mongoDB(updatedDataSourceJson.datasource._id!) + ) - const [queryResponse, queryJson] = - await config.api.datasources.previewQuery(dataSourceQuery) + expect(queryJson.rows.length).toBeGreaterThan(10) + expect(queryJson.schemaFields).toEqual( + fixtures.queries.expectedSchemaFields.mongoDB + ) // Save query - const datasourcetoSave = { - ...dataSourceQuery, + const datasourcetoSave: Query = { + ...fixtures.queries.mongoDB(updatedDataSourceJson.datasource._id!), parameters: [], } - const [saveQueryResponse, saveQueryJson] = - await config.api.datasources.saveQuery(datasourcetoSave) + const [saveQueryResponse, saveQueryJson] = await config.api.queries.save( + datasourcetoSave + ) // Get Query - const [getQueryResponse, getQueryJson] = - await config.api.datasources.getQuery(saveQueryJson._id) + const [getQueryResponse, getQueryJson] = await config.api.queries.get( + saveQueryJson._id + ) // Get Query permissions const [getQueryPermissionsResponse, getQueryPermissionsJson] = - await config.api.datasources.getQueryPermissions( - saveQueryJson._id - ) + await config.api.permissions.getAll(saveQueryJson._id!) // Delete data source const deleteResponse = await config.api.datasources.delete( - updatedDataSourceJson.datasource._id, - updatedDataSourceJson.datasource._rev + updatedDataSourceJson.datasource._id!, + updatedDataSourceJson.datasource._rev! ) }) }) diff --git a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts index 83d1fc782d..bc8d86b862 100644 --- a/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/postgresSQL.spec.ts @@ -1,5 +1,6 @@ import TestConfiguration from "../../config/TestConfiguration" import * as fixtures from "../../fixtures" +import { Query } from "@budibase/types" describe("Internal API - Data Sources: PostgresSQL", () => { const config = new TestConfiguration() @@ -16,6 +17,9 @@ describe("Internal API - Data Sources: PostgresSQL", () => { // Create app await config.createApp() + // Get all integrations + await config.api.integrations.getAll() + // Add data source const [dataSourceResponse, dataSourceJson] = await config.api.datasources.add(fixtures.datasources.postgresSQL()) @@ -28,44 +32,38 @@ describe("Internal API - Data Sources: PostgresSQL", () => { const [updatedDataSourceResponse, updatedDataSourceJson] = await config.api.datasources.update(newDataSourceInfo) - const dataSourceQuery = { - datasourceId: updatedDataSourceJson.datasource._id, - fields: { - sql: "SELECT * FROM categories;", - }, - name: "Query 1", - parameters: {}, - queryVerb: "read", - schema: {}, - transformer: "return data", - } // Query data source + const [queryResponse, queryJson] = await config.api.queries.preview( + fixtures.queries.postgres(updatedDataSourceJson.datasource._id!) + ) - const [queryResponse, queryJson] = - await config.api.datasources.previewQuery(dataSourceQuery) + expect(queryJson.rows.length).toEqual(91) + expect(queryJson.schemaFields).toEqual( + fixtures.queries.expectedSchemaFields.postgres + ) // Save query - const datasourcetoSave = { - ...dataSourceQuery, + const datasourcetoSave: Query = { + ...fixtures.queries.postgres(updatedDataSourceJson.datasource._id!), parameters: [], } - const [saveQueryResponse, saveQueryJson] = - await config.api.datasources.saveQuery(datasourcetoSave) + const [saveQueryResponse, saveQueryJson] = await config.api.queries.save( + datasourcetoSave + ) // Get Query - const [getQueryResponse, getQueryJson] = - await config.api.datasources.getQuery(saveQueryJson._id) + const [getQueryResponse, getQueryJson] = await config.api.queries.get( + saveQueryJson._id! + ) // Get Query permissions const [getQueryPermissionsResponse, getQueryPermissionsJson] = - await config.api.datasources.getQueryPermissions( - saveQueryJson._id - ) + await config.api.permissions.getAll(saveQueryJson._id!) // Delete data source const deleteResponse = await config.api.datasources.delete( - updatedDataSourceJson.datasource._id, - updatedDataSourceJson.datasource._rev + updatedDataSourceJson.datasource._id!, + updatedDataSourceJson.datasource._rev! ) }) }) diff --git a/qa-core/src/types/addedDatasource.ts b/qa-core/src/types/addedDatasource.ts deleted file mode 100644 index 65f51fd1bd..0000000000 --- a/qa-core/src/types/addedDatasource.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { Datasource } from "@budibase/types" - -export interface AddedDatasource { - datasource: Datasource -} From 695f77fd1d7b0fcab0816eb47cc37e46462b0be3 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Thu, 13 Apr 2023 11:13:21 +0100 Subject: [PATCH 04/57] Add types for datasources endpoints --- .../server/src/api/controllers/datasource.ts | 20 ++++++++++++++----- packages/types/src/api/web/app/datasource.ts | 19 ++++++++++++++++++ packages/types/src/api/web/app/index.ts | 1 + 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 packages/types/src/api/web/app/datasource.ts diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 3d41cd89af..b61b168980 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -12,7 +12,15 @@ import { getIntegration } from "../../integrations" import { getDatasourceAndQuery } from "./row/utils" import { invalidateDynamicVariables } from "../../threads/utils" import { db as dbCore, context, events } from "@budibase/backend-core" -import { UserCtx, Datasource, Row } from "@budibase/types" +import { + UserCtx, + Datasource, + Row, + CreateDatasourceResponse, + UpdateDatasourceResponse, + UpdateDatasourceRequest, + CreateDatasourceRequest, +} from "@budibase/types" import sdk from "../../sdk" export async function fetch(ctx: UserCtx) { @@ -146,7 +154,7 @@ async function invalidateVariables( await invalidateDynamicVariables(toInvalidate) } -export async function update(ctx: UserCtx) { +export async function update(ctx: UserCtx) { const db = context.getAppDB() const datasourceId = ctx.params.datasourceId let datasource = await sdk.datasources.get(datasourceId) @@ -187,15 +195,17 @@ export async function update(ctx: UserCtx) { } } -export async function save(ctx: UserCtx) { +export async function save( + ctx: UserCtx +) { const db = context.getAppDB() const plus = ctx.request.body.datasource.plus const fetchSchema = ctx.request.body.fetchSchema const datasource = { _id: generateDatasourceID({ plus }), - type: plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE, ...ctx.request.body.datasource, + type: plus ? DocumentType.DATASOURCE_PLUS : DocumentType.DATASOURCE, } let schemaError = null @@ -218,7 +228,7 @@ export async function save(ctx: UserCtx) { } } - const response: any = { + const response: CreateDatasourceResponse = { datasource: await sdk.datasources.removeSecretSingle(datasource), } if (schemaError) { diff --git a/packages/types/src/api/web/app/datasource.ts b/packages/types/src/api/web/app/datasource.ts new file mode 100644 index 0000000000..d54259eab5 --- /dev/null +++ b/packages/types/src/api/web/app/datasource.ts @@ -0,0 +1,19 @@ +import { Datasource } from "../../../documents" + +export interface CreateDatasourceResponse { + datasource: Datasource + error?: any +} + +export interface UpdateDatasourceResponse { + datasource: Datasource +} + +export interface CreateDatasourceRequest { + datasource: Datasource + fetchSchema?: boolean +} + +export interface UpdateDatasourceRequest extends Datasource { + datasource: Datasource +} diff --git a/packages/types/src/api/web/app/index.ts b/packages/types/src/api/web/app/index.ts index 1d73755cb6..9be15ecfe3 100644 --- a/packages/types/src/api/web/app/index.ts +++ b/packages/types/src/api/web/app/index.ts @@ -1 +1,2 @@ export * from "./backup" +export * from "./datasource" From e20838fd428d3b2a887531050b8a922a261336dc Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Fri, 14 Apr 2023 17:35:13 +0100 Subject: [PATCH 05/57] Add rest test and fix type --- .../types/src/documents/app/datasource.ts | 8 --- packages/types/src/documents/app/query.ts | 3 + .../src/internal-api/fixtures/datasources.ts | 18 ++++- qa-core/src/internal-api/fixtures/queries.ts | 48 +++++++++++++ .../tests/dataSources/restAPI.spec.ts | 69 +++++++++++++++++++ 5 files changed, 136 insertions(+), 10 deletions(-) create mode 100644 qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts diff --git a/packages/types/src/documents/app/datasource.ts b/packages/types/src/documents/app/datasource.ts index 9b498fb4b3..8dfdfe6d0f 100644 --- a/packages/types/src/documents/app/datasource.ts +++ b/packages/types/src/documents/app/datasource.ts @@ -56,11 +56,3 @@ export interface RestConfig { } ] } - -export interface CreateDatasourceResponse { - datasource: Datasource -} - -export interface UpdatedDatasourceResponse { - datasource: Datasource -} diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts index d0bbf05b5c..31a3a3ba09 100644 --- a/packages/types/src/documents/app/query.ts +++ b/packages/types/src/documents/app/query.ts @@ -45,4 +45,7 @@ export interface PaginationValues { export interface PreviewQueryRequest extends Omit { parameters: {} + flags?: { + urlName?: boolean + } } diff --git a/qa-core/src/internal-api/fixtures/datasources.ts b/qa-core/src/internal-api/fixtures/datasources.ts index a8d59b88a1..dcf6af824a 100644 --- a/qa-core/src/internal-api/fixtures/datasources.ts +++ b/qa-core/src/internal-api/fixtures/datasources.ts @@ -34,8 +34,6 @@ export const postgresSQL = () => { fetchSchema: true, } } - -// Add the data source for MariaDB to the this file in the same style as above export const mariaDB = () => { return { datasource: { @@ -55,3 +53,19 @@ export const mariaDB = () => { fetchSchema: true, } } + +export const restAPI = () => { + return { + datasource: { + name: "RestAPI", + source: "REST", + type: "datasource", + config: { + defaultHeaders: {}, + rejectUnauthorized: true, + url: process.env.REST_API_BASE_URL, + }, + }, + fetchSchema: false, + } +} diff --git a/qa-core/src/internal-api/fixtures/queries.ts b/qa-core/src/internal-api/fixtures/queries.ts index 7ba81fc744..83839a0b41 100644 --- a/qa-core/src/internal-api/fixtures/queries.ts +++ b/qa-core/src/internal-api/fixtures/queries.ts @@ -72,4 +72,52 @@ export const expectedSchemaFields = { postal_code: "string", region: "string", }, + restAPI: { + abilities: "array", + base_experience: "number", + forms: "array", + game_indices: "array", + height: "number", + held_items: "array", + id: "number", + is_default: "string", + location_area_encounters: "string", + moves: "array", + name: "string", + order: "number", + past_types: "array", + species: "json", + sprites: "json", + stats: "array", + types: "array", + weight: "number", + }, +} + +const request = (datasourceId: string, fields: any, flags: any): any => { + return { + datasourceId: datasourceId, + fields: fields, + flags: flags, + name: "Query 1", + parameters: {}, + queryVerb: "read", + schema: {}, + transformer: "return data", + } +} +export const restAPI = (datasourceId: string): PreviewQueryRequest => { + const fields = { + authConfigId: null, + bodyType: "none", + disabledHeaders: {}, + headers: {}, + pagination: {}, + path: `${process.env.REST_API_BASE_URL}/pokemon/ditto`, + queryString: "", + } + const flags = { + urlName: true, + } + return request(datasourceId, fields, flags) } diff --git a/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts b/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts new file mode 100644 index 0000000000..d7b75db514 --- /dev/null +++ b/qa-core/src/internal-api/tests/dataSources/restAPI.spec.ts @@ -0,0 +1,69 @@ +import TestConfiguration from "../../config/TestConfiguration" +import * as fixtures from "../../fixtures" +import { Query } from "@budibase/types" + +describe("Internal API - Data Sources: REST API", () => { + const config = new TestConfiguration() + + beforeAll(async () => { + await config.beforeAll() + }) + + afterAll(async () => { + await config.afterAll() + }) + + it("Create an app with a data source - REST API", async () => { + // Create app + await config.createApp() + + // Get all integrations + await config.api.integrations.getAll() + + // Add data source + const [dataSourceResponse, dataSourceJson] = + await config.api.datasources.add(fixtures.datasources.restAPI()) + + // Update data source + const newDataSourceInfo = { + ...dataSourceJson.datasource, + name: "RestAPI - Updated", + } + const [updatedDataSourceResponse, updatedDataSourceJson] = + await config.api.datasources.update(newDataSourceInfo) + + // Query data source + const [queryResponse, queryJson] = await config.api.queries.preview( + fixtures.queries.restAPI(updatedDataSourceJson.datasource._id!) + ) + + expect(queryJson.rows.length).toEqual(1) + expect(queryJson.schemaFields).toEqual( + fixtures.queries.expectedSchemaFields.restAPI + ) + + // Save query + const datasourcetoSave: Query = { + ...fixtures.queries.postgres(updatedDataSourceJson.datasource._id!), + parameters: [], + } + + const [saveQueryResponse, saveQueryJson] = await config.api.queries.save( + datasourcetoSave + ) + // Get Query + const [getQueryResponse, getQueryJson] = await config.api.queries.get( + saveQueryJson._id! + ) + + // Get Query permissions + const [getQueryPermissionsResponse, getQueryPermissionsJson] = + await config.api.permissions.getAll(saveQueryJson._id!) + + // Delete data source + const deleteResponse = await config.api.datasources.delete( + updatedDataSourceJson.datasource._id!, + updatedDataSourceJson.datasource._rev! + ) + }) +}) From f104e66acf1c9885d5706e627ffb9e7b7eeaeaa7 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Fri, 14 Apr 2023 18:14:47 +0100 Subject: [PATCH 06/57] Fix type --- qa-core/src/internal-api/api/apis/DatasourcesAPI.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts index 7b9d7af789..f29bb9d6bc 100644 --- a/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts +++ b/qa-core/src/internal-api/api/apis/DatasourcesAPI.ts @@ -2,7 +2,7 @@ import { Response } from "node-fetch" import { Datasource, CreateDatasourceResponse, - UpdatedDatasourceResponse, + UpdateDatasourceResponse, } from "@budibase/types" import BudibaseInternalAPIClient from "../BudibaseInternalAPIClient" @@ -46,7 +46,7 @@ export default class DatasourcesAPI { return [response, json] } - async update(body: any): Promise<[Response, UpdatedDatasourceResponse]> { + async update(body: any): Promise<[Response, UpdateDatasourceResponse]> { const [response, json] = await this.client.put(`/datasources/${body._id}`, { body, }) From f3be917da115069c27cad05f2f54b04abfc53a7e Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 25 Apr 2023 12:16:02 +0100 Subject: [PATCH 07/57] Enrich the upgradable version property when fetching the app package --- packages/builder/src/builderStore/store/frontend.js | 1 + .../builder/src/components/deploy/VersionModal.svelte | 9 ++++----- .../builder/portal/overview/[appId]/overview.svelte | 7 +++---- .../pages/builder/portal/overview/[appId]/version.svelte | 5 ++--- packages/server/src/api/controllers/application.ts | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index 3fc0eb769e..e264dc099b 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -134,6 +134,7 @@ export const getFrontendStore = () => { previousTopNavPath: {}, version: application.version, revertableVersion: application.revertableVersion, + upgradableVersion: application.upgradableVersion, navigation: application.navigation || {}, usedPlugins: application.usedPlugins || [], })) diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte index f357cc7820..75acc974ce 100644 --- a/packages/builder/src/components/deploy/VersionModal.svelte +++ b/packages/builder/src/components/deploy/VersionModal.svelte @@ -9,7 +9,6 @@ } from "@budibase/bbui" import { store } from "builderStore" import { API } from "api" - import clientPackage from "@budibase/client/package.json" export function show() { updateModal.show() @@ -25,9 +24,9 @@ $: appId = $store.appId $: updateAvailable = - clientPackage.version && + $store.upgradableVersion && $store.version && - clientPackage.version !== $store.version + $store.upgradableVersion !== $store.version $: revertAvailable = $store.revertableVersion != null const refreshAppPackage = async () => { @@ -46,7 +45,7 @@ // Don't wait for the async refresh, since this causes modal flashing refreshAppPackage() notifications.success( - `App updated successfully to version ${clientPackage.version}` + `App updated successfully to version ${$store.upgradableVersion}` ) } catch (err) { notifications.error(`Error updating app: ${err}`) @@ -91,7 +90,7 @@ {#if updateAvailable} This app is currently using version {$store.version}, but version - {clientPackage.version} is available. Updates can contain new features, + {$store.upgradableVersion} is available. Updates can contain new features, performance improvements and bug fixes. {:else} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte index 2d2b6775fb..c049a610b6 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte @@ -13,7 +13,6 @@ notifications, } from "@budibase/bbui" import { store } from "builderStore" - import clientPackage from "@budibase/client/package.json" import { processStringSync } from "@budibase/string-templates" import { users, auth, apps, groups, overview } from "stores/portal" import { fetchData } from "@budibase/frontend-core" @@ -40,7 +39,7 @@ }, }, }) - $: updateAvailable = clientPackage.version !== $store.version + $: updateAvailable = $store.upgradableVersion !== $store.version $: isPublished = app?.status === AppStatus.DEPLOYED $: appEditorId = !app?.updatedBy ? $auth.user._id : app?.updatedBy $: appEditorText = appEditor?.firstName || appEditor?.email @@ -172,8 +171,8 @@ {$store.version} {#if updateAvailable}
- New version {clientPackage.version} is available - - + New version {$store.upgradableVersion} is + available - { $goto("./version") diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte index 676d0b4f59..723e32984d 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/version.svelte @@ -1,12 +1,11 @@ @@ -18,7 +17,7 @@ {#if updateAvailable} The app is currently using version {$store.version} - but version {clientPackage.version} is available. + but version {$store.upgradableVersion} is available.
Updates can contain new features, performance improvements and bug fixes. diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index ec68ca4c72..77a4e7c7f1 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -223,7 +223,7 @@ export async function fetchAppPackage(ctx: UserCtx) { ) ctx.body = { - application, + application : {...application, upgradableVersion : envCore.VERSION}, screens, layouts, clientLibPath, From 72c72fc48ae49a1558b130177fc78541393f94d8 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 25 Apr 2023 12:31:52 +0100 Subject: [PATCH 08/57] Lint fix --- packages/server/src/api/controllers/application.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 77a4e7c7f1..ff0dbe015b 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -223,7 +223,7 @@ export async function fetchAppPackage(ctx: UserCtx) { ) ctx.body = { - application : {...application, upgradableVersion : envCore.VERSION}, + application: { ...application, upgradableVersion: envCore.VERSION }, screens, layouts, clientLibPath, From 91b2f4165db9155a5b5d2d45357ab8bbf53a5156 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 25 Apr 2023 14:28:18 +0100 Subject: [PATCH 09/57] Make it more obvious that multi select cells have overflow when using small line height --- .../src/components/grid/cells/DataCell.svelte | 2 ++ .../src/components/grid/cells/OptionsCell.svelte | 10 +++++++++- .../src/components/grid/layout/GridRow.svelte | 2 ++ .../src/components/grid/layout/StickyColumn.svelte | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/cells/DataCell.svelte b/packages/frontend-core/src/components/grid/cells/DataCell.svelte index 5a2e02340f..59e81b3081 100644 --- a/packages/frontend-core/src/components/grid/cells/DataCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/DataCell.svelte @@ -19,6 +19,7 @@ export let updateValue = rows.actions.updateValue export let invertX = false export let invertY = false + export let contentLines = 1 const emptyError = writable(null) @@ -84,5 +85,6 @@ {readonly} {invertY} {invertX} + {contentLines} /> diff --git a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte index f3b6b9b59d..9be26d9520 100644 --- a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte @@ -12,6 +12,7 @@ export let api export let invertX = false export let invertY = false + export let contentLines let isOpen = false let focusedOptionIdx = null @@ -86,7 +87,11 @@ class:open on:click|self={editable ? open : null} > -
+
1} + on:click={editable ? open : null} + > {#each values as val} {@const color = getOptionColor(val)} {#if color} @@ -160,6 +165,9 @@ grid-row-gap: var(--cell-padding); overflow: hidden; padding: var(--cell-padding); + flex-wrap: nowrap; + } + .values.wrap { flex-wrap: wrap; } .text { diff --git a/packages/frontend-core/src/components/grid/layout/GridRow.svelte b/packages/frontend-core/src/components/grid/layout/GridRow.svelte index eb1fd8b96a..ff182d4ec2 100644 --- a/packages/frontend-core/src/components/grid/layout/GridRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/GridRow.svelte @@ -15,6 +15,7 @@ selectedCellMap, focusedRow, columnHorizontalInversionIndex, + contentLines, } = getContext("grid") $: rowSelected = !!$selectedRows[row._id] @@ -44,6 +45,7 @@ focused={$focusedCellId === cellId} selectedUser={$selectedCellMap[cellId]} width={column.width} + contentLines={$contentLines} /> {/each}
diff --git a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte index 6f10c30695..44be0777cf 100644 --- a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte +++ b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte @@ -21,6 +21,7 @@ focusedRow, scrollLeft, dispatch, + contentLines, } = getContext("grid") $: rowCount = $rows.length @@ -85,6 +86,7 @@ selectedUser={$selectedCellMap[cellId]} width={$stickyColumn.width} column={$stickyColumn} + contentLines={$contentLines} /> {/if}
From c691dafc3909eba9b1df93fce13a21d8dccfd582 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 12:04:41 +0100 Subject: [PATCH 10/57] Add default value to contentLines --- .../src/components/grid/cells/OptionsCell.svelte | 2 +- .../src/components/grid/cells/RelationshipCell.svelte | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte index 9be26d9520..993d99fef1 100644 --- a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte @@ -12,7 +12,7 @@ export let api export let invertX = false export let invertY = false - export let contentLines + export let contentLines = 1 let isOpen = false let focusedOptionIdx = null diff --git a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte index 90182e9983..13dc2ae76f 100644 --- a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte @@ -29,6 +29,7 @@ export let onChange export let invertX = false export let invertY = false + export let contentLines = 1 const { API, dispatch } = getContext("grid") const color = getColor(0) @@ -243,7 +244,11 @@
-
(focused ? e.stopPropagation() : null)}> +
1} + on:wheel={e => (focused ? e.stopPropagation() : null)} + > {#each value || [] as relationship, idx} {#if relationship.primaryDisplay}
@@ -376,6 +381,9 @@ grid-row-gap: var(--cell-padding); overflow: hidden; padding: var(--cell-padding); + flex-wrap: nowrap; + } + .values.wrap { flex-wrap: wrap; } .count { From 15bf1ace68e9ab56676927934214af67584bbc74 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 12:10:12 +0100 Subject: [PATCH 11/57] Standardise width of design section side panels to fix drawer width issues --- .../layouts/[layoutId]/_components/LayoutSettingsPanel.svelte | 2 +- .../navigation/_components/NavigationInfoPanel.svelte | 2 +- .../[screenId]/screens/_components/ScreenSettingsPanel.svelte | 1 + .../design/[screenId]/theme/_components/ThemeInfoPanel.svelte | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte index 8e6ac603e7..bfc2f94f43 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/layouts/[layoutId]/_components/LayoutSettingsPanel.svelte @@ -35,7 +35,7 @@ } - + Custom layouts are being deprecated. They will be removed in a future diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte index dbd23c462f..614e1eed80 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/navigation/_components/NavigationInfoPanel.svelte @@ -9,7 +9,7 @@ } - + {#if $selectedScreen.layoutId} {#if $selectedScreen.layoutId} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte index 9593f0bff5..c3325852c8 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/theme/_components/ThemeInfoPanel.svelte @@ -3,7 +3,7 @@ import { Body, Layout } from "@budibase/bbui" - + Your theme is set across all the screens within your app. From 457c1ce0a12fe843121397de1313289546a4871d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 12:16:31 +0000 Subject: [PATCH 12/57] v2.5.6-alpha.31 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index ee4d8e8598..27b8e76640 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 7477406505..3c37d8cf7e 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/types": "2.5.6-alpha.31", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6d4ba0a882..dac3c37ad6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", + "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index ac8a626b0e..9226047059 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.30", - "@budibase/client": "2.5.6-alpha.30", - "@budibase/frontend-core": "2.5.6-alpha.30", - "@budibase/shared-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", + "@budibase/bbui": "2.5.6-alpha.31", + "@budibase/client": "2.5.6-alpha.31", + "@budibase/frontend-core": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index bdb41bec15..044809461e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/backend-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.31", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 66bd6d4c1e..4720dc10f8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.30", - "@budibase/frontend-core": "2.5.6-alpha.30", - "@budibase/shared-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/bbui": "2.5.6-alpha.31", + "@budibase/frontend-core": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.31", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 3f5345ef94..2270ad51bd 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.30", - "@budibase/shared-core": "2.5.6-alpha.30", + "@budibase/bbui": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.31", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0307ebfa6b..f05152cd48 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 6aadfd15a0..4be71fffc2 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.30", - "@budibase/client": "2.5.6-alpha.30", + "@budibase/backend-core": "2.5.6-alpha.31", + "@budibase/client": "2.5.6-alpha.31", "@budibase/pro": "2.5.6-alpha.30", - "@budibase/shared-core": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.31", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 75fe1950dc..a9ce442863 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.30" + "@budibase/types": "2.5.6-alpha.31" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 30ed86b2a7..63adf7f26b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 95f04b8495..78fbf474b5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index c0d50cab28..df15546241 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.30", + "version": "2.5.6-alpha.31", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.30", + "@budibase/backend-core": "2.5.6-alpha.31", "@budibase/pro": "2.5.6-alpha.30", - "@budibase/string-templates": "2.5.6-alpha.30", - "@budibase/types": "2.5.6-alpha.30", + "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.31", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 349f4b426ea6eb667291769101ef44dca3930799 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 12:18:01 +0000 Subject: [PATCH 13/57] Update pro version to 2.5.6-alpha.31 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4be71fffc2..9d7569a242 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.31", "@budibase/client": "2.5.6-alpha.31", - "@budibase/pro": "2.5.6-alpha.30", + "@budibase/pro": "2.5.6-alpha.31", "@budibase/shared-core": "2.5.6-alpha.31", "@budibase/string-templates": "2.5.6-alpha.31", "@budibase/types": "2.5.6-alpha.31", diff --git a/packages/worker/package.json b/packages/worker/package.json index df15546241..881f04efc9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.31", - "@budibase/pro": "2.5.6-alpha.30", + "@budibase/pro": "2.5.6-alpha.31", "@budibase/string-templates": "2.5.6-alpha.31", "@budibase/types": "2.5.6-alpha.31", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 260f0ae6a6..a119a9341d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.29": - version "2.5.6-alpha.29" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.29.tgz#71414f68a296535ef53ffb0453352ea137c4aeab" - integrity sha512-tQuzMOo2WFxKvsUgYAfUEcLabRpmAD7hPlhBhCFzYasaXNbJiPhcwv4i52US0i0Wr2IXMb2X0d7fwa8tnbKzIA== +"@budibase/pro@2.5.6-alpha.30": + version "2.5.6-alpha.30" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.30.tgz#9b8089a983fd61a062f31a8e5757d7bb5b56fb8c" + integrity sha512-YTyjMHK/wsSOFJkON7a5WRJSgAr8Gh/cflRzifm6Jw1Gb8S8B8Z6uTWW/S7+psVBRGeUfV1s8biYNr71tXz2Ng== dependencies: - "@budibase/backend-core" "2.5.6-alpha.29" + "@budibase/backend-core" "2.5.6-alpha.30" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.29" + "@budibase/types" "2.5.6-alpha.30" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 13134e0bb04a9c67935d5a47b2a77fbf6bf0aceb Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 26 Apr 2023 14:22:23 +0100 Subject: [PATCH 14/57] Removed client package from builder dependencies --- packages/builder/package.json | 1 - yarn.lock | 58 +++++++++++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/packages/builder/package.json b/packages/builder/package.json index 0bf4940d94..736eba5473 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -59,7 +59,6 @@ }, "dependencies": { "@budibase/bbui": "2.5.6-alpha.27", - "@budibase/client": "2.5.6-alpha.27", "@budibase/frontend-core": "2.5.6-alpha.27", "@budibase/shared-core": "2.5.6-alpha.27", "@budibase/string-templates": "2.5.6-alpha.27", diff --git a/yarn.lock b/yarn.lock index 0d89d2cadf..8a77fcafc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1386,6 +1386,45 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/backend-core@2.5.6-alpha.26": + version "2.5.6-alpha.26" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.5.6-alpha.26.tgz#72029afe5a85402fa996e92b84ad56cb8c6bde45" + integrity sha512-ktP2SWwLjaDzJYLnadU1BcZlrfQkvhRb3T+v1SEciTBWi0vF7MUa7k5OW0EKwECpGA3VA576sbI7FgGu7m7Sxw== + dependencies: + "@budibase/nano" "10.1.2" + "@budibase/pouchdb-replication-stream" "1.2.10" + "@budibase/types" "2.5.6-alpha.26" + "@shopify/jest-koa-mocks" "5.0.1" + "@techpass/passport-openidconnect" "0.3.2" + aws-cloudfront-sign "2.2.0" + aws-sdk "2.1030.0" + bcrypt "5.0.1" + bcryptjs "2.4.3" + bull "4.10.1" + correlation-id "4.0.0" + dotenv "16.0.1" + emitter-listener "1.1.2" + ioredis "4.28.0" + joi "17.6.0" + jsonwebtoken "9.0.0" + koa-passport "4.1.4" + koa-pino-logger "4.0.0" + lodash "4.17.21" + lodash.isarguments "3.1.0" + node-fetch "2.6.7" + passport-google-oauth "2.0.0" + passport-jwt "4.0.0" + passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" + posthog-node "1.3.0" + pouchdb "7.3.0" + pouchdb-find "7.2.2" + redlock "4.2.0" + sanitize-s3-objectkey "0.0.1" + semver "7.3.7" + tar-fs "2.1.1" + uuid "8.3.2" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1486,15 +1525,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.25": - version "2.5.6-alpha.25" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.25.tgz#bfe99536060422adb60da2f195acb05b24898c98" - integrity sha512-LEQec9N9gS+j5gt/eKwGzci5oKW1sRTIG8oUvH7faCoJjD7BWIhmNuQNFrNfg70C/zkxYy4CL/2s1P9oVR1B3g== +"@budibase/pro@2.5.6-alpha.26": + version "2.5.6-alpha.26" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.26.tgz#979f0de77db78ad4596e6295083047b71f7c7bcc" + integrity sha512-d0ZsggojThcg1m81UEPUHp7fuPaSVwG+HYXh3ElEXmeH7HJNOJrbD2K0U7zkaWzufLK9ay1H6qcaZ9ZHVg/z/Q== dependencies: - "@budibase/backend-core" "2.5.6-alpha.25" + "@budibase/backend-core" "2.5.6-alpha.26" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.25" + "@budibase/types" "2.5.6-alpha.26" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1547,6 +1586,13 @@ resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.44-alpha.1.tgz#1679657aa180d9c59afa1dffa611bff0638bd933" integrity sha512-Sq+8HfM75EBMoOvKYFwELdlxmVN6wNZMofDjT/2G+9aF+Zfe5Tzw69C+unmdBgcGGjGCHEYWSz4mF0v8FPAGbg== +"@budibase/types@2.5.6-alpha.26": + version "2.5.6-alpha.26" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.5.6-alpha.26.tgz#09ac8f1e4f4dfd5e7e109839cd9db36d5c563dc4" + integrity sha512-C1eHWj4tRwsQb2dJbMdukxRFVqiyzRBhwIMuCSIdJg763sbn9TXTqWTBbljyG7ppH+Dwge+py9KtiFP2MpMCfQ== + dependencies: + scim-patch "^0.7.0" + "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" From 5447422c4eea6163d0f691fa606cd12a3fe461fc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 14:39:54 +0100 Subject: [PATCH 15/57] Remove leftover spreadsheet entry in manifest --- packages/client/manifest.json | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 84ffca314c..71637723c1 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5225,36 +5225,5 @@ "type": "schema", "suffix": "repeater" } - }, - "spreadsheet": { - "name": "Spreadsheet", - "icon": "ViewGrid", - "settings": [ - { - "key": "table", - "type": "table", - "label": "Table" - }, - { - "type": "filter", - "label": "Filtering", - "key": "filter" - }, - { - "type": "field/sortable", - "label": "Sort Column", - "key": "sortColumn" - }, - { - "type": "select", - "label": "Sort Order", - "key": "sortOrder", - "options": [ - "Ascending", - "Descending" - ], - "defaultValue": "Ascending" - } - ] } } From e178afe171dd76cc3088ab47ba41be8d8f2072bd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 13:47:10 +0000 Subject: [PATCH 16/57] v2.5.6-alpha.32 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 12 ++++++------ packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 27b8e76640..a542a51851 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 3c37d8cf7e..96f16747e0 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/types": "2.5.6-alpha.32", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index dac3c37ad6..7664855326 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 9226047059..0c240baf2c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,11 +58,11 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.31", - "@budibase/client": "2.5.6-alpha.31", - "@budibase/frontend-core": "2.5.6-alpha.31", - "@budibase/shared-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", + "@budibase/bbui": "2.5.6-alpha.32", + "@budibase/client": "2.5.6-alpha.32", + "@budibase/frontend-core": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 044809461e..f3ebc3beb9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/backend-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.32", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 4720dc10f8..69d38ed1c3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.31", - "@budibase/frontend-core": "2.5.6-alpha.31", - "@budibase/shared-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/bbui": "2.5.6-alpha.32", + "@budibase/frontend-core": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.32", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2270ad51bd..70cec3f9e0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.31", - "@budibase/shared-core": "2.5.6-alpha.31", + "@budibase/bbui": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.32", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index f05152cd48..c38dedec7d 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9d7569a242..30ef842461 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.31", - "@budibase/client": "2.5.6-alpha.31", + "@budibase/backend-core": "2.5.6-alpha.32", + "@budibase/client": "2.5.6-alpha.32", "@budibase/pro": "2.5.6-alpha.31", - "@budibase/shared-core": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.32", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index a9ce442863..9b9eb21db1 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.31" + "@budibase/types": "2.5.6-alpha.32" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 63adf7f26b..8ac9d477b9 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 78fbf474b5..3a4bcd9efa 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 881f04efc9..fc94a224f2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.31", + "version": "2.5.6-alpha.32", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.31", + "@budibase/backend-core": "2.5.6-alpha.32", "@budibase/pro": "2.5.6-alpha.31", - "@budibase/string-templates": "2.5.6-alpha.31", - "@budibase/types": "2.5.6-alpha.31", + "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.32", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 71c8fec4db7ed91531eb703da910108f06955f16 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 13:48:46 +0000 Subject: [PATCH 17/57] Update pro version to 2.5.6-alpha.32 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 30ef842461..1bc50f61d6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.32", "@budibase/client": "2.5.6-alpha.32", - "@budibase/pro": "2.5.6-alpha.31", + "@budibase/pro": "2.5.6-alpha.32", "@budibase/shared-core": "2.5.6-alpha.32", "@budibase/string-templates": "2.5.6-alpha.32", "@budibase/types": "2.5.6-alpha.32", diff --git a/packages/worker/package.json b/packages/worker/package.json index fc94a224f2..77594a9896 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.32", - "@budibase/pro": "2.5.6-alpha.31", + "@budibase/pro": "2.5.6-alpha.32", "@budibase/string-templates": "2.5.6-alpha.32", "@budibase/types": "2.5.6-alpha.32", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index a119a9341d..653c549ffd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.30": - version "2.5.6-alpha.30" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.30.tgz#9b8089a983fd61a062f31a8e5757d7bb5b56fb8c" - integrity sha512-YTyjMHK/wsSOFJkON7a5WRJSgAr8Gh/cflRzifm6Jw1Gb8S8B8Z6uTWW/S7+psVBRGeUfV1s8biYNr71tXz2Ng== +"@budibase/pro@2.5.6-alpha.31": + version "2.5.6-alpha.31" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.31.tgz#e711fed348c64bffac5eb3b4dfed6be15c2253c9" + integrity sha512-gIpq5uICd0tQP+RB1Dv+v9m9EPG//HJJb95qFXv1rjuXT2ANT7rAmhJrOoQpqhTGwB0aPFsz00/wqFQVQVGzPQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.30" + "@budibase/backend-core" "2.5.6-alpha.31" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.30" + "@budibase/types" "2.5.6-alpha.31" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5226385367cd9ff353dee66c61244acf229f0870 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 26 Apr 2023 15:51:25 +0100 Subject: [PATCH 18/57] Change integration count assertion --- qa-core/src/internal-api/api/apis/IntegrationsAPI.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts index b42b999825..2478823bfa 100644 --- a/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts +++ b/qa-core/src/internal-api/api/apis/IntegrationsAPI.ts @@ -12,7 +12,7 @@ export default class IntegrationsAPI { const [response, json] = await this.client.get(`/integrations`) expect(response).toHaveStatusCode(200) const integrationsCount = Object.keys(json).length - expect(integrationsCount).toBe(16) + expect(integrationsCount).toBeGreaterThan(0) return [response, json] } } From f6a0a664378ad14490107a2dfc119c839568315d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 14:58:55 +0000 Subject: [PATCH 19/57] v2.5.6-alpha.33 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index a542a51851..00f91b58b3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 96f16747e0..739d441452 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/types": "2.5.6-alpha.33", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7664855326..15dc572cf3 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3159400080..b436b72f16 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.32", - "@budibase/frontend-core": "2.5.6-alpha.32", - "@budibase/shared-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", + "@budibase/bbui": "2.5.6-alpha.33", + "@budibase/frontend-core": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index f3ebc3beb9..9f49d8188f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/backend-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.33", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 69d38ed1c3..e0ecde8164 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.32", - "@budibase/frontend-core": "2.5.6-alpha.32", - "@budibase/shared-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/bbui": "2.5.6-alpha.33", + "@budibase/frontend-core": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.33", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 70cec3f9e0..586522bcdb 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.32", - "@budibase/shared-core": "2.5.6-alpha.32", + "@budibase/bbui": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.33", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c38dedec7d..1a18bc9411 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 1bc50f61d6..2f2fc63180 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.32", - "@budibase/client": "2.5.6-alpha.32", + "@budibase/backend-core": "2.5.6-alpha.33", + "@budibase/client": "2.5.6-alpha.33", "@budibase/pro": "2.5.6-alpha.32", - "@budibase/shared-core": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.33", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 9b9eb21db1..a9c40ed23c 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.32" + "@budibase/types": "2.5.6-alpha.33" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 8ac9d477b9..ba7c279deb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 3a4bcd9efa..46c7520783 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 77594a9896..e1a3e89243 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.32", + "version": "2.5.6-alpha.33", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.32", + "@budibase/backend-core": "2.5.6-alpha.33", "@budibase/pro": "2.5.6-alpha.32", - "@budibase/string-templates": "2.5.6-alpha.32", - "@budibase/types": "2.5.6-alpha.32", + "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.33", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 2119ef36bdb2a81bfbfab9aafca7a09dd4b6d738 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 15:00:25 +0000 Subject: [PATCH 20/57] Update pro version to 2.5.6-alpha.33 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 2f2fc63180..a9872dbbc9 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.33", "@budibase/client": "2.5.6-alpha.33", - "@budibase/pro": "2.5.6-alpha.32", + "@budibase/pro": "2.5.6-alpha.33", "@budibase/shared-core": "2.5.6-alpha.33", "@budibase/string-templates": "2.5.6-alpha.33", "@budibase/types": "2.5.6-alpha.33", diff --git a/packages/worker/package.json b/packages/worker/package.json index e1a3e89243..8fa6f11ca3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.33", - "@budibase/pro": "2.5.6-alpha.32", + "@budibase/pro": "2.5.6-alpha.33", "@budibase/string-templates": "2.5.6-alpha.33", "@budibase/types": "2.5.6-alpha.33", "@koa/router": "8.0.8", From 44ef27299a79696bb10cd2c860d0f6bae4f64fe5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 16:04:14 +0100 Subject: [PATCH 21/57] Update grid keyboard handling to bring invalid origin consideration to be highest precedence --- .../grid/overlays/KeyboardManager.svelte | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte index e0e842dc16..f0f56118d9 100644 --- a/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte +++ b/packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte @@ -15,8 +15,22 @@ selectedRows, } = getContext("grid") + const ignoredOriginSelectors = [ + ".spectrum-Modal", + "#builder-side-panel-container", + ] + // Global key listener which intercepts all key events const handleKeyDown = e => { + // Avoid processing events sourced from certain origins + if (e.target?.closest) { + for (let selector of ignoredOriginSelectors) { + if (e.target.closest(selector)) { + return + } + } + } + // If nothing selected avoid processing further key presses if (!$focusedCellId) { if (e.key === "Tab" || e.key?.startsWith("Arrow")) { @@ -60,11 +74,6 @@ return } } - - // Avoid processing events sourced from modals - if (e.target?.closest?.(".spectrum-Modal")) { - return - } e.preventDefault() // Handle the key ourselves From 6e795064454d774eb7e7d8e788adbcb842abe4ca Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Wed, 26 Apr 2023 16:45:00 +0100 Subject: [PATCH 22/57] Fix failing test --- packages/server/src/integration-test/postgres.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts index 36285e2831..78075b4e54 100644 --- a/packages/server/src/integration-test/postgres.spec.ts +++ b/packages/server/src/integration-test/postgres.spec.ts @@ -349,7 +349,7 @@ describe("row api - postgres", () => { }, plus: true, source: "POSTGRES", - type: "datasource", + type: "datasource_plus", _id: expect.any(String), _rev: expect.any(String), createdAt: expect.any(String), From aad034e53e1bf7f980f67c3cba87e3e0efa33a10 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 16:16:22 +0000 Subject: [PATCH 23/57] v2.5.6-alpha.34 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 00f91b58b3..2f6f845d3e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 739d441452..ef86096a60 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/types": "2.5.6-alpha.34", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 15dc572cf3..3f85234fc5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index b436b72f16..aced0ecd59 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.33", - "@budibase/frontend-core": "2.5.6-alpha.33", - "@budibase/shared-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", + "@budibase/bbui": "2.5.6-alpha.34", + "@budibase/frontend-core": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9f49d8188f..069398aeef 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/backend-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.34", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index e0ecde8164..39d83f9c01 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.33", - "@budibase/frontend-core": "2.5.6-alpha.33", - "@budibase/shared-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/bbui": "2.5.6-alpha.34", + "@budibase/frontend-core": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.34", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 586522bcdb..3d1320316a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.33", - "@budibase/shared-core": "2.5.6-alpha.33", + "@budibase/bbui": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.34", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1a18bc9411..168f0c3e5f 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a9872dbbc9..0769470aec 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.33", - "@budibase/client": "2.5.6-alpha.33", + "@budibase/backend-core": "2.5.6-alpha.34", + "@budibase/client": "2.5.6-alpha.34", "@budibase/pro": "2.5.6-alpha.33", - "@budibase/shared-core": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.34", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index a9c40ed23c..9359e7ba59 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.33" + "@budibase/types": "2.5.6-alpha.34" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ba7c279deb..fd537f8b0f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 46c7520783..631c475d85 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 8fa6f11ca3..5cca48a05e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.33", + "version": "2.5.6-alpha.34", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.33", + "@budibase/backend-core": "2.5.6-alpha.34", "@budibase/pro": "2.5.6-alpha.33", - "@budibase/string-templates": "2.5.6-alpha.33", - "@budibase/types": "2.5.6-alpha.33", + "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.34", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 34b0a1fa2da71ebf6059b62f5758169575dd7a3a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 26 Apr 2023 16:17:58 +0000 Subject: [PATCH 24/57] Update pro version to 2.5.6-alpha.34 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0769470aec..df88362fc1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.34", "@budibase/client": "2.5.6-alpha.34", - "@budibase/pro": "2.5.6-alpha.33", + "@budibase/pro": "2.5.6-alpha.34", "@budibase/shared-core": "2.5.6-alpha.34", "@budibase/string-templates": "2.5.6-alpha.34", "@budibase/types": "2.5.6-alpha.34", diff --git a/packages/worker/package.json b/packages/worker/package.json index 5cca48a05e..d57547c9df 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.34", - "@budibase/pro": "2.5.6-alpha.33", + "@budibase/pro": "2.5.6-alpha.34", "@budibase/string-templates": "2.5.6-alpha.34", "@budibase/types": "2.5.6-alpha.34", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 404952f815..c8adee7527 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.32": - version "2.5.6-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.32.tgz#6d52da231efcacbb163a5af0cfe8284199ff659e" - integrity sha512-XzM55VcxpxTXCxYhLUOYvYqlCAPRPASJBbNonuRV6qUtXZxE5xSSEDnHQehhD8TrNP3QQ94DlCJ5DQCm/f3yJQ== +"@budibase/pro@2.5.6-alpha.33": + version "2.5.6-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.33.tgz#15666778fe90f0b2ef8435b91e20e347f96576d3" + integrity sha512-UJZhErUjj+J4d8X+NDU453VvpT/THAaK8r+0QAHxjBB9xiN5XynXb2SxpOpbkR51WQlURpULtwnbqmWiB0+DFA== dependencies: - "@budibase/backend-core" "2.5.6-alpha.32" + "@budibase/backend-core" "2.5.6-alpha.33" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.32" + "@budibase/types" "2.5.6-alpha.33" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 09ec898a4d2d22be181c8b2725d9817087922a27 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 18:43:56 +0100 Subject: [PATCH 25/57] Update readonly cell border to be gray --- .../frontend-core/src/components/grid/cells/GridCell.svelte | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte index dfc53f6f0c..6589c18d07 100644 --- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte @@ -117,6 +117,9 @@ .cell.error { --cell-color: var(--spectrum-global-color-red-500); } + .cell.readonly { + --cell-color: var(--spectrum-global-color-gray-600); + } .cell:not(.focused) { user-select: none; } From 78c50df4bdc566c001bc4c236f927fe0a2ab0a59 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 18:52:16 +0100 Subject: [PATCH 26/57] Add overlay to autocolumns when creating rows --- .../src/components/grid/cells/DataCell.svelte | 1 + .../src/components/grid/layout/NewRow.svelte | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/cells/DataCell.svelte b/packages/frontend-core/src/components/grid/cells/DataCell.svelte index 59e81b3081..0aa0cd54f4 100644 --- a/packages/frontend-core/src/components/grid/cells/DataCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/DataCell.svelte @@ -87,4 +87,5 @@ {invertX} {contentLines} /> + diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 54fef78301..48c5dcec69 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -181,7 +181,11 @@ rowIdx={0} invertX={columnIdx >= $columnHorizontalInversionIndex} {invertY} - /> + > + {#if column?.schema?.autocolumn} +
Can't edit auto column
+ {/if} + {/key} {/each}
@@ -262,4 +266,21 @@ width: 0; display: flex; } + + /* Readonly cell overlay */ + .readonly { + position: absolute; + top: 0; + left: 0; + height: var(--row-height); + width: 100%; + padding: var(--cell-padding); + font-style: italic; + color: var(--spectrum-global-color-gray-600); + z-index: 1; + user-select: none; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } From 5b03ce05666c89e5e71d0ac039c5d2eb013d7434 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 26 Apr 2023 19:23:06 +0100 Subject: [PATCH 27/57] Add loading state to new row component --- .../src/components/grid/layout/NewRow.svelte | 49 +++++++++++++++---- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 48c5dcec69..607dc9e1f0 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -27,13 +27,14 @@ columnHorizontalInversionIndex, } = getContext("grid") + let visible = false let isAdding = false let newRow = {} let offset = 0 $: firstColumn = $stickyColumn || $renderedColumns[0] $: width = GutterWidth + ($stickyColumn?.width || 0) - $: $tableId, (isAdding = false) + $: $tableId, (visible = false) $: invertY = shouldInvertY(offset, $rowVerticalInversionIndex, $renderedRows) const shouldInvertY = (offset, inversionIndex, rows) => { @@ -45,7 +46,8 @@ const addRow = async () => { // Blur the active cell and tick to let final value updates propagate - $focusedCellAPI?.blur() + isAdding = true + $focusedCellId = null await tick() // Create row @@ -60,17 +62,19 @@ $focusedCellId = `${savedRow._id}-${firstColumn.name}` } } + isAdding = false } const clear = () => { isAdding = false + visible = false $focusedCellId = null $hoveredRowId = null document.removeEventListener("keydown", handleKeyPress) } const startAdding = async () => { - if (isAdding) { + if (visible) { return } @@ -95,7 +99,7 @@ // Update state and select initial cell newRow = {} - isAdding = true + visible = true $hoveredRowId = NewRowID if (firstColumn) { $focusedCellId = `${NewRowID}-${firstColumn.name}` @@ -115,7 +119,7 @@ } const handleKeyPress = e => { - if (!isAdding) { + if (!visible) { return } if (e.key === "Escape") { @@ -137,7 +141,7 @@ -{#if isAdding} +{#if visible}
0} @@ -148,6 +152,9 @@
+ {#if isAdding} +
+ {/if} {#if $stickyColumn} {@const cellId = `${NewRowID}-${$stickyColumn.name}`} @@ -161,7 +168,14 @@ {updateValue} rowIdx={0} {invertY} - /> + > + {#if $stickyColumn?.schema?.autocolumn} +
Can't edit auto column
+ {/if} + {#if isAdding} +
+ {/if} + {/if}
@@ -183,7 +197,10 @@ {invertY} > {#if column?.schema?.autocolumn} -
Can't edit auto column
+
Can't edit auto column
+ {/if} + {#if isAdding} +
{/if} {/key} @@ -192,7 +209,7 @@
- +
@@ -268,7 +285,7 @@ } /* Readonly cell overlay */ - .readonly { + .readonly-overlay { position: absolute; top: 0; left: 0; @@ -283,4 +300,16 @@ white-space: nowrap; text-overflow: ellipsis; } + + /* Overlay while row is being added */ + .loading-overlay { + position: absolute; + top: 0; + left: 0; + height: var(--row-height); + width: 100%; + z-index: 1; + background: var(--spectrum-global-color-gray-400); + opacity: 0.25; + } From 972e2257b76bd60dc20424c8f9c77de86f772ac2 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 27 Apr 2023 08:25:53 +0100 Subject: [PATCH 28/57] [draft] Pricing/fixes (#10424) * Fix qa core suite * Update package.json * Lint * Handle conflict on account metadata * Fix issue adding users via csv import when on paid plan * Fix user invites * Lint --- .../users/_components/ImportUsersModal.svelte | 2 +- packages/builder/src/stores/portal/users.js | 14 ++++++++------ .../worker/src/api/controllers/global/users.ts | 2 ++ packages/worker/src/sdk/accounts/metadata.ts | 13 +++++++++++-- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte index be0023ec21..b35c6c998f 100644 --- a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte @@ -25,7 +25,7 @@ $: invalidEmails = [] $: userCount = $licensing.userCount + userEmails.length - $: willExceed = userCount > $licensing.userLimit + $: willExceed = licensing.willExceedUserLimit(userCount) $: importDisabled = !userEmails.length || !validEmails(userEmails) || !usersRole || willExceed diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js index d223239f67..898d47c0e2 100644 --- a/packages/builder/src/stores/portal/users.js +++ b/packages/builder/src/stores/portal/users.js @@ -114,11 +114,13 @@ export function createUsersStore() { const getUserRole = ({ admin, builder }) => admin?.global ? "admin" : builder?.global ? "developer" : "appUser" - const refreshUsage = fn => async args => { - const response = await fn(args) - await licensing.setQuotaUsage() - return response - } + const refreshUsage = + fn => + async (...args) => { + const response = await fn(...args) + await licensing.setQuotaUsage() + return response + } return { subscribe, @@ -133,7 +135,7 @@ export function createUsersStore() { updateInvite, getUserCountByApp, // any operation that adds or deletes users - acceptInvite: refreshUsage(acceptInvite), + acceptInvite, create: refreshUsage(create), save: refreshUsage(save), bulkDelete: refreshUsage(bulkDelete), diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index 8db2d29691..d9ebc87517 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -424,7 +424,9 @@ export const inviteAccept = async ( if (err.code === ErrorCode.USAGE_LIMIT_EXCEEDED) { // explicitly re-throw limit exceeded errors ctx.throw(400, err) + return } + console.warn("Error inviting user", err) ctx.throw(400, "Unable to create new user, invitation invalid.") } } diff --git a/packages/worker/src/sdk/accounts/metadata.ts b/packages/worker/src/sdk/accounts/metadata.ts index 64065e8b78..11ab069839 100644 --- a/packages/worker/src/sdk/accounts/metadata.ts +++ b/packages/worker/src/sdk/accounts/metadata.ts @@ -18,8 +18,17 @@ export const saveMetadata = async ( if (existing) { metadata._rev = existing._rev } - const res = await db.put(metadata) - metadata._rev = res.rev + try { + const res = await db.put(metadata) + metadata._rev = res.rev + } catch (e: any) { + // account can be updated frequently + // ignore 409 + if (e.status !== 409) { + throw e + } + } + return metadata }) } From f8d4e95fbd6ee570a07eeff8359c2d9c758dd971 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 07:34:19 +0000 Subject: [PATCH 29/57] v2.5.6-alpha.35 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 2f6f845d3e..77b105ce3c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ef86096a60..2af6de59e5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/types": "2.5.6-alpha.35", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 3f85234fc5..fe0dfdc2d5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index aced0ecd59..6983b365db 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.34", - "@budibase/frontend-core": "2.5.6-alpha.34", - "@budibase/shared-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", + "@budibase/bbui": "2.5.6-alpha.35", + "@budibase/frontend-core": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 069398aeef..94bf0825ad 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/backend-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.35", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 39d83f9c01..2d70e5e847 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.34", - "@budibase/frontend-core": "2.5.6-alpha.34", - "@budibase/shared-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/bbui": "2.5.6-alpha.35", + "@budibase/frontend-core": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.35", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 3d1320316a..2ec43faef0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.34", - "@budibase/shared-core": "2.5.6-alpha.34", + "@budibase/bbui": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.35", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 168f0c3e5f..7bbb57aa92 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index df88362fc1..07b5a04606 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.34", - "@budibase/client": "2.5.6-alpha.34", + "@budibase/backend-core": "2.5.6-alpha.35", + "@budibase/client": "2.5.6-alpha.35", "@budibase/pro": "2.5.6-alpha.34", - "@budibase/shared-core": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.35", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 9359e7ba59..e821537eac 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.34" + "@budibase/types": "2.5.6-alpha.35" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index fd537f8b0f..023fc5d17a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 631c475d85..f284179e81 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index d57547c9df..e33747e3c8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.34", + "version": "2.5.6-alpha.35", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.34", + "@budibase/backend-core": "2.5.6-alpha.35", "@budibase/pro": "2.5.6-alpha.34", - "@budibase/string-templates": "2.5.6-alpha.34", - "@budibase/types": "2.5.6-alpha.34", + "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.35", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d6e5647b89a4e4f9bf8f63ddd9bf79aa0fe816ec Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 07:36:01 +0000 Subject: [PATCH 30/57] Update pro version to 2.5.6-alpha.35 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 07b5a04606..a131a5dd31 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.35", "@budibase/client": "2.5.6-alpha.35", - "@budibase/pro": "2.5.6-alpha.34", + "@budibase/pro": "2.5.6-alpha.35", "@budibase/shared-core": "2.5.6-alpha.35", "@budibase/string-templates": "2.5.6-alpha.35", "@budibase/types": "2.5.6-alpha.35", diff --git a/packages/worker/package.json b/packages/worker/package.json index e33747e3c8..01662722ce 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.35", - "@budibase/pro": "2.5.6-alpha.34", + "@budibase/pro": "2.5.6-alpha.35", "@budibase/string-templates": "2.5.6-alpha.35", "@budibase/types": "2.5.6-alpha.35", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index c8adee7527..9020feb28a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.33": - version "2.5.6-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.33.tgz#15666778fe90f0b2ef8435b91e20e347f96576d3" - integrity sha512-UJZhErUjj+J4d8X+NDU453VvpT/THAaK8r+0QAHxjBB9xiN5XynXb2SxpOpbkR51WQlURpULtwnbqmWiB0+DFA== +"@budibase/pro@2.5.6-alpha.34": + version "2.5.6-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.34.tgz#b992dd7830479e1e869c03fedc11b552d0cea2ca" + integrity sha512-mK/gVZuR+3USPQidTq+xSm0H5VRX2/DgWNOoDp2b8XzrHeTDPV/Qy7yJd3Cxidemk25+ddwbU/VRrPMa+6PKSw== dependencies: - "@budibase/backend-core" "2.5.6-alpha.33" + "@budibase/backend-core" "2.5.6-alpha.34" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.33" + "@budibase/types" "2.5.6-alpha.34" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From d4b9531b95b375fb36ff3312bd0730f2ac608c95 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 09:02:49 +0100 Subject: [PATCH 31/57] Add keyboard shortcut indicators for adding new rows --- .../grid/layout/KeyboardShortcut.svelte | 53 +++++++++++++++++++ .../src/components/grid/layout/NewRow.svelte | 23 +++++++- .../grid/layout/StickyColumn.svelte | 5 +- 3 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 packages/frontend-core/src/components/grid/layout/KeyboardShortcut.svelte diff --git a/packages/frontend-core/src/components/grid/layout/KeyboardShortcut.svelte b/packages/frontend-core/src/components/grid/layout/KeyboardShortcut.svelte new file mode 100644 index 0000000000..5024a24ea7 --- /dev/null +++ b/packages/frontend-core/src/components/grid/layout/KeyboardShortcut.svelte @@ -0,0 +1,53 @@ + + +
+ {#each parsedKeys as key} +
+ {key} +
+ {/each} +
+ + diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 607dc9e1f0..71c390c946 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -7,6 +7,7 @@ import { GutterWidth } from "../lib/constants" import { NewRowID } from "../lib/constants" import GutterCell from "../cells/GutterCell.svelte" + import KeyboardShortcut from "./KeyboardShortcut.svelte" const { hoveredRowId, @@ -209,8 +210,18 @@
- - + +
{/if} @@ -261,6 +272,14 @@ top: calc(var(--row-height) + var(--offset) + 24px); left: var(--gutter-width); } + .button-with-keys { + display: flex; + gap: 6px; + align-items: center; + } + .button-with-keys :global(> div) { + padding-top: 2px; + } /* Sticky column styles */ .sticky-column { diff --git a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte index 44be0777cf..6301112110 100644 --- a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte +++ b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte @@ -7,6 +7,7 @@ import HeaderCell from "../cells/HeaderCell.svelte" import { GutterWidth, BlankRowID } from "../lib/constants" import GutterCell from "../cells/GutterCell.svelte" + import KeyboardShortcut from "./KeyboardShortcut.svelte" const { rows, @@ -105,7 +106,9 @@ + > + + {/if}
{/if} From e239d1e5596e9b8aa194939ba0b1f648bb79d647 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 09:55:59 +0100 Subject: [PATCH 32/57] Use 'high-low' nomenclature for sorting on numeric columns in header cells --- .../src/components/grid/cells/HeaderCell.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte index 165711c51f..72b0ad0ff1 100644 --- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte @@ -37,6 +37,8 @@ $: sortedBy = column.name === $sort.column $: canMoveLeft = orderable && idx > 0 $: canMoveRight = orderable && idx < $renderedColumns.length - 1 + $: ascendingLabel = column.schema?.type === "number" ? "low-high" : "A-Z" + $: descendingLabel = column.schema?.type === "number" ? "high-low" : "Z-A" const editColumn = () => { dispatch("edit-column", column.schema) @@ -179,14 +181,14 @@ on:click={sortAscending} disabled={column.name === $sort.column && $sort.order === "ascending"} > - Sort A-Z + Sort {ascendingLabel} - Sort Z-A + Sort {descendingLabel} Move left From 46b079497aa86a119617770d4664ebc34497c5a6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 10:03:23 +0100 Subject: [PATCH 33/57] Use 'high-low' nomenclature for numerical columns in grid sort button --- .../grid/controls/SortButton.svelte | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/frontend-core/src/components/grid/controls/SortButton.svelte b/packages/frontend-core/src/components/grid/controls/SortButton.svelte index 26eba050bf..bd75249216 100644 --- a/packages/frontend-core/src/components/grid/controls/SortButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/SortButton.svelte @@ -3,16 +3,13 @@ import { ActionButton, Popover, Select } from "@budibase/bbui" const { sort, columns, stickyColumn } = getContext("grid") - const orderOptions = [ - { label: "A-Z", value: "ascending" }, - { label: "Z-A", value: "descending" }, - ] let open = false let anchor $: columnOptions = getColumnOptions($stickyColumn, $columns) $: checkValidSortColumn($sort.column, $stickyColumn, $columns) + $: orderOptions = getOrderOptions($sort.column, columnOptions) const getColumnOptions = (stickyColumn, columns) => { let options = [] @@ -20,6 +17,7 @@ options.push({ label: stickyColumn.label || stickyColumn.name, value: stickyColumn.name, + type: stickyColumn.schema?.type, }) } return [ @@ -27,10 +25,25 @@ ...columns.map(col => ({ label: col.label || col.name, value: col.name, + type: col.schema?.type, })), ] } + const getOrderOptions = (column, columnOptions) => { + const type = columnOptions.find(col => col.value === column)?.type + return [ + { + label: type === "number" ? "Low-high" : "A-Z", + value: "ascending", + }, + { + label: type === "number" ? "High-low" : "Z-A", + value: "descending", + }, + ] + } + const updateSortColumn = e => { sort.update(state => ({ ...state, From ead89bf0bf32f84ca9c4ef963857ed2b0297ee3f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 09:31:32 +0000 Subject: [PATCH 34/57] v2.5.6-alpha.36 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 77b105ce3c..6633dc9eee 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 2af6de59e5..fedb763e75 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/types": "2.5.6-alpha.36", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fe0dfdc2d5..ca17df6ce2 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6983b365db..3d2a05e998 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/frontend-core": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/frontend-core": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 94bf0825ad..6a2f7bf373 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 2d70e5e847..080d67e780 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/frontend-core": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/frontend-core": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2ec43faef0..fabc8b265c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", + "@budibase/bbui": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.36", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7bbb57aa92..77bee658f9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a131a5dd31..a66729df54 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.35", - "@budibase/client": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/client": "2.5.6-alpha.36", "@budibase/pro": "2.5.6-alpha.35", - "@budibase/shared-core": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index e821537eac..0cbf9fe2da 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.35" + "@budibase/types": "2.5.6-alpha.36" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 023fc5d17a..0818e222f2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index f284179e81..bb44434d1f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 01662722ce..1a23c490a7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.35", + "version": "2.5.6-alpha.36", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.35", + "@budibase/backend-core": "2.5.6-alpha.36", "@budibase/pro": "2.5.6-alpha.35", - "@budibase/string-templates": "2.5.6-alpha.35", - "@budibase/types": "2.5.6-alpha.35", + "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.36", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 1b815c363a2497bc026c59f9e134c851fad47c8c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 09:32:55 +0000 Subject: [PATCH 35/57] Update pro version to 2.5.6-alpha.36 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a66729df54..4390ea3882 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.36", "@budibase/client": "2.5.6-alpha.36", - "@budibase/pro": "2.5.6-alpha.35", + "@budibase/pro": "2.5.6-alpha.36", "@budibase/shared-core": "2.5.6-alpha.36", "@budibase/string-templates": "2.5.6-alpha.36", "@budibase/types": "2.5.6-alpha.36", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1a23c490a7..4e27f3e73c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.36", - "@budibase/pro": "2.5.6-alpha.35", + "@budibase/pro": "2.5.6-alpha.36", "@budibase/string-templates": "2.5.6-alpha.36", "@budibase/types": "2.5.6-alpha.36", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 9020feb28a..806073b5a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.34": - version "2.5.6-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.34.tgz#b992dd7830479e1e869c03fedc11b552d0cea2ca" - integrity sha512-mK/gVZuR+3USPQidTq+xSm0H5VRX2/DgWNOoDp2b8XzrHeTDPV/Qy7yJd3Cxidemk25+ddwbU/VRrPMa+6PKSw== +"@budibase/pro@2.5.6-alpha.35": + version "2.5.6-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" + integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== dependencies: - "@budibase/backend-core" "2.5.6-alpha.34" + "@budibase/backend-core" "2.5.6-alpha.35" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.34" + "@budibase/types" "2.5.6-alpha.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5363693ac305bb28af6a34282f1525f45e050d30 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 27 Apr 2023 11:36:52 +0100 Subject: [PATCH 36/57] Removing automation logs from app exports as they are not useful - they take up space and the imported app won't have ran any automations yet. I have added it as a flag so that this does not affect backups (as you would want to maintain logs for backups). --- packages/server/src/db/utils.ts | 1 + .../server/src/sdk/app/backups/exports.ts | 23 ++++++++++++++----- yarn.lock | 12 +++++----- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts index 50341e4abc..e08392c3a1 100644 --- a/packages/server/src/db/utils.ts +++ b/packages/server/src/db/utils.ts @@ -27,6 +27,7 @@ export const isProdAppID = dbCore.isProdAppID export const USER_METDATA_PREFIX = `${DocumentType.ROW}${SEPARATOR}${dbCore.InternalTable.USER_METADATA}${SEPARATOR}` export const LINK_USER_METADATA_PREFIX = `${DocumentType.LINK}${SEPARATOR}${dbCore.InternalTable.USER_METADATA}${SEPARATOR}` export const TABLE_ROW_PREFIX = `${DocumentType.ROW}${SEPARATOR}${DocumentType.TABLE}` +export const AUTOMATION_LOG_PREFIX = `${DocumentType.AUTOMATION_LOG}${SEPARATOR}` export const ViewName = dbCore.ViewName export const InternalTables = dbCore.InternalTable export const UNICODE_MAX = dbCore.UNICODE_MAX diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts index 27a907fceb..57342e7462 100644 --- a/packages/server/src/sdk/app/backups/exports.ts +++ b/packages/server/src/sdk/app/backups/exports.ts @@ -3,6 +3,7 @@ import { budibaseTempDir } from "../../../utilities/budibaseDir" import { streamFile, createTempFolder } from "../../../utilities/fileSystem" import { ObjectStoreBuckets } from "../../../constants" import { + AUTOMATION_LOG_PREFIX, LINK_USER_METADATA_PREFIX, TABLE_ROW_PREFIX, USER_METDATA_PREFIX, @@ -20,11 +21,15 @@ const uuid = require("uuid/v4") const tar = require("tar") const MemoryStream = require("memorystream") -type ExportOpts = { +interface DBDumpOpts { filter?: any exportPath?: string +} + +interface ExportOpts extends DBDumpOpts { tar?: boolean excludeRows?: boolean + excludeLogs?: boolean } function tarFilesToTmp(tmpDir: string, files: string[]) { @@ -49,7 +54,7 @@ function tarFilesToTmp(tmpDir: string, files: string[]) { * a filter function or the name of the export. * @return {*} either a readable stream or a string */ -export async function exportDB(dbName: string, opts: ExportOpts = {}) { +export async function exportDB(dbName: string, opts: DBDumpOpts = {}) { const exportOpts = { filter: opts?.filter, batch_size: 1000, @@ -76,11 +81,14 @@ export async function exportDB(dbName: string, opts: ExportOpts = {}) { }) } -function defineFilter(excludeRows?: boolean) { +function defineFilter(excludeRows?: boolean, excludeLogs?: boolean) { const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX] if (excludeRows) { ids.push(TABLE_ROW_PREFIX) } + if (excludeLogs) { + ids.push(AUTOMATION_LOG_PREFIX) + } return (doc: any) => !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr) } @@ -130,8 +138,7 @@ export async function exportApp(appId: string, config?: ExportOpts) { // enforce an export of app DB to the tmp path const dbPath = join(tmpPath, DB_EXPORT_FILE) await exportDB(appId, { - ...config, - filter: defineFilter(config?.excludeRows), + filter: defineFilter(config?.excludeRows, config?.excludeLogs), exportPath: dbPath, }) // if tar requested, return where the tarball is @@ -155,6 +162,10 @@ export async function exportApp(appId: string, config?: ExportOpts) { * @returns {*} a readable stream of the backup which is written in real time */ export async function streamExportApp(appId: string, excludeRows: boolean) { - const tmpPath = await exportApp(appId, { excludeRows, tar: true }) + const tmpPath = await exportApp(appId, { + excludeRows, + excludeLogs: true, + tar: true, + }) return streamFile(tmpPath) } diff --git a/yarn.lock b/yarn.lock index 806073b5a4..fff37f62e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.35": - version "2.5.6-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" - integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== +"@budibase/pro@2.5.6-alpha.36": + version "2.5.6-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" + integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.35" + "@budibase/backend-core" "2.5.6-alpha.36" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.35" + "@budibase/types" "2.5.6-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 5728cf9b2a66e42b7a886c3d6915d7c527069478 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Apr 2023 11:55:03 +0100 Subject: [PATCH 37/57] Add clickoutside handlers to options, long form and relationship cells --- .../src/components/grid/cells/LongFormCell.svelte | 2 ++ .../src/components/grid/cells/OptionsCell.svelte | 3 ++- .../src/components/grid/cells/RelationshipCell.svelte | 10 ++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte index 00e12dc6a3..886d4ef8b0 100644 --- a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte @@ -1,5 +1,6 @@ - + From 06cdb7c20267fd607a8c132ec1ed3d09102e8ce7 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 13:47:04 +0000 Subject: [PATCH 39/57] v2.5.6-alpha.37 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 6633dc9eee..ad2dcaee32 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index fedb763e75..aa558ba75c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/types": "2.5.6-alpha.37", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index ca17df6ce2..fe9787e689 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3d2a05e998..5dd65a613c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/frontend-core": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/frontend-core": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6a2f7bf373..8858872699 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 080d67e780..2a9750fa47 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/frontend-core": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/frontend-core": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index fabc8b265c..28e78c05a0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", + "@budibase/bbui": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.37", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 77bee658f9..a270fe9a55 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4390ea3882..201135eae8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.36", - "@budibase/client": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/client": "2.5.6-alpha.37", "@budibase/pro": "2.5.6-alpha.36", - "@budibase/shared-core": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 0cbf9fe2da..4f7c40b73f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.36" + "@budibase/types": "2.5.6-alpha.37" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 0818e222f2..aeed9aca4c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index bb44434d1f..1b228362a9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4e27f3e73c..05b0fc1846 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.36", + "version": "2.5.6-alpha.37", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.36", + "@budibase/backend-core": "2.5.6-alpha.37", "@budibase/pro": "2.5.6-alpha.36", - "@budibase/string-templates": "2.5.6-alpha.36", - "@budibase/types": "2.5.6-alpha.36", + "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.37", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From a896a75f8fd36bd4eb3d6d9a87cb5b36b19953bc Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 13:48:47 +0000 Subject: [PATCH 40/57] Update pro version to 2.5.6-alpha.37 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 201135eae8..561104bca1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.37", "@budibase/client": "2.5.6-alpha.37", - "@budibase/pro": "2.5.6-alpha.36", + "@budibase/pro": "2.5.6-alpha.37", "@budibase/shared-core": "2.5.6-alpha.37", "@budibase/string-templates": "2.5.6-alpha.37", "@budibase/types": "2.5.6-alpha.37", diff --git a/packages/worker/package.json b/packages/worker/package.json index 05b0fc1846..30e5a15432 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/pro": "2.5.6-alpha.36", + "@budibase/pro": "2.5.6-alpha.37", "@budibase/string-templates": "2.5.6-alpha.37", "@budibase/types": "2.5.6-alpha.37", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 806073b5a4..fff37f62e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.35": - version "2.5.6-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.35.tgz#b065c39f23829db191ced3a583285bcecf7c1dde" - integrity sha512-YxKCRSkLprOK9ipu+R9vg9LIumas4zM0ZTTPyL+0NRDhJRwINRQziJIkakNaIHPLEPadVQFNrBY33HOS3hzdZg== +"@budibase/pro@2.5.6-alpha.36": + version "2.5.6-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" + integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.35" + "@budibase/backend-core" "2.5.6-alpha.36" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.35" + "@budibase/types" "2.5.6-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From 47933b9a92bfd2a392c49f6c823698717531d763 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 27 Apr 2023 16:08:25 +0100 Subject: [PATCH 41/57] Hide manage or renew button when customer uses invoicing + css updates (#10436) * Hide manage or renew button when customer uses invoicing + css updates * Remove usages of 'pro' and 'pro plan' from ui * Enterprise plan -> Enterprise on enforce single sign on * lint --- .../pages/builder/portal/account/usage.svelte | 50 +++++++++---------- .../overview/[appId]/backups/index.svelte | 2 +- .../builder/portal/settings/auth/index.svelte | 2 +- .../builder/portal/settings/branding.svelte | 2 +- .../builder/portal/users/groups/index.svelte | 2 +- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index 80e42d52a8..8dc02c6c80 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -43,12 +43,18 @@ } $: quotaUsage = $licensing.quotaUsage + $: license = $auth.user?.license + $: plan = license?.plan + $: usesInvoicing = plan?.usesInvoicing + $: accountPortalAccess = $auth?.user?.accountPortalAccess $: quotaReset = quotaUsage?.quotaReset $: canManagePlan = ($admin.cloud && accountPortalAccess) || (!$admin.cloud && $auth.isAdmin) + $: showButton = !usesInvoicing && accountPortalAccess + const setMonthlyUsage = () => { monthlyUsage = [] if (quotaUsage.monthly) { @@ -121,7 +127,7 @@ const setTextRows = () => { textRows = [] - if (cancelAt) { + if (cancelAt && !usesInvoicing) { textRows.push({ message: "Subscription has been cancelled" }) textRows.push({ message: `${getDaysRemaining(cancelAt)} days remaining`, @@ -213,7 +219,7 @@ description="YOUR CURRENT PLAN" title={planTitle()} {primaryActionText} - primaryAction={accountPortalAccess ? goToAccountPortal : undefined} + primaryAction={showButton ? goToAccountPortal : undefined} {textRows} >
@@ -224,33 +230,23 @@
{/each} + + Monthly limits +
+ + + Resets in {daysRemainingInMonth} days + + +
+ + + {#each monthlyUsage as usage} + + {/each} +
- - {#if monthlyUsage.length} -
- - - Monthly limits -
- - - Resets in {daysRemainingInMonth} days - - -
- - - {#each monthlyUsage as usage} - - {/each} - - -
- {/if}
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte index 4ff9ea386a..77d76c9609 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte @@ -176,7 +176,7 @@ Backups {#if !$licensing.backupsEnabled} - Pro plan + Premium {/if}
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte index 60f84049a3..38f5e0788b 100644 --- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte @@ -378,7 +378,7 @@
{#if !$licensing.enforceableSSO} - Enterprise plan + Enterprise {/if}
diff --git a/packages/builder/src/pages/builder/portal/settings/branding.svelte b/packages/builder/src/pages/builder/portal/settings/branding.svelte index 2184280e89..ae22d310a1 100644 --- a/packages/builder/src/pages/builder/portal/settings/branding.svelte +++ b/packages/builder/src/pages/builder/portal/settings/branding.svelte @@ -213,7 +213,7 @@ {/if} {#if isCloud && !brandingEnabled} - Pro + Premium {/if} diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte index 1a0bad7b11..6abc63811f 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte @@ -94,7 +94,7 @@ Groups {#if !$licensing.groupsEnabled} - Pro plan + Business {/if} From d223643e93776efa0fd06014ebb576af4996719f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 15:16:50 +0000 Subject: [PATCH 42/57] v2.5.6-alpha.38 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index ad2dcaee32..7ce908a52e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index aa558ba75c..291bed47dd 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/types": "2.5.6-alpha.38", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fe9787e689..04f18d2666 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5dd65a613c..43a4da9b4a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/frontend-core": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/frontend-core": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 8858872699..553362761f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 2a9750fa47..f84545f649 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/frontend-core": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/frontend-core": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 28e78c05a0..50d266859a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", + "@budibase/bbui": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.38", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a270fe9a55..8977131c1a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 561104bca1..741b909326 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.37", - "@budibase/client": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", + "@budibase/client": "2.5.6-alpha.38", "@budibase/pro": "2.5.6-alpha.37", - "@budibase/shared-core": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 4f7c40b73f..6c2725577e 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.37" + "@budibase/types": "2.5.6-alpha.38" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index aeed9aca4c..6f80c7bdd6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 1b228362a9..0173d89b50 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 30e5a15432..086d340417 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.37", + "version": "2.5.6-alpha.38", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.37", + "@budibase/backend-core": "2.5.6-alpha.38", "@budibase/pro": "2.5.6-alpha.37", - "@budibase/string-templates": "2.5.6-alpha.37", - "@budibase/types": "2.5.6-alpha.37", + "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.38", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From bea67941fe3f9d4c859b296568ac09bc9bb0e58e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 15:18:15 +0000 Subject: [PATCH 43/57] Update pro version to 2.5.6-alpha.38 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 741b909326..c4c35239bf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.38", "@budibase/client": "2.5.6-alpha.38", - "@budibase/pro": "2.5.6-alpha.37", + "@budibase/pro": "2.5.6-alpha.38", "@budibase/shared-core": "2.5.6-alpha.38", "@budibase/string-templates": "2.5.6-alpha.38", "@budibase/types": "2.5.6-alpha.38", diff --git a/packages/worker/package.json b/packages/worker/package.json index 086d340417..3acc367066 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.38", - "@budibase/pro": "2.5.6-alpha.37", + "@budibase/pro": "2.5.6-alpha.38", "@budibase/string-templates": "2.5.6-alpha.38", "@budibase/types": "2.5.6-alpha.38", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index fff37f62e4..37947af3b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.36": - version "2.5.6-alpha.36" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.36.tgz#361afe64b0881ee436a5ef294fb315c05ea94ce6" - integrity sha512-uX1wgOk47aVGl/yIJZiZS8x31sTS6wGDEFv0AMZ2h6rwIp6GwHDGq2/QT6a8hRMsAM4sqr8R2GkyyAG+dm0DGQ== +"@budibase/pro@2.5.6-alpha.37": + version "2.5.6-alpha.37" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.37.tgz#3f4c7ba36bd01e2f7cbc56461c1249cc4098bc38" + integrity sha512-D0P4ePioE43yZ+CvLE5XdO84x6/UcF8oY3rHIhd8+bS1LW1yrzAf4kG9lyBRsNUPZoTMPmJeD9zqGRw67pdjzA== dependencies: - "@budibase/backend-core" "2.5.6-alpha.36" + "@budibase/backend-core" "2.5.6-alpha.37" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.36" + "@budibase/types" "2.5.6-alpha.37" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From b654985ab9b8d78fc53f40bc1d5cae002f8e3d29 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 16:18:51 +0000 Subject: [PATCH 44/57] v2.5.6-alpha.39 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 7ce908a52e..7356540633 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 291bed47dd..4db1619306 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/types": "2.5.6-alpha.39", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 04f18d2666..5d4b67752e 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 43a4da9b4a..5245b5dc88 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.38", - "@budibase/frontend-core": "2.5.6-alpha.38", - "@budibase/shared-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", + "@budibase/bbui": "2.5.6-alpha.39", + "@budibase/frontend-core": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 553362761f..9efe246270 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/backend-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.39", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index f84545f649..ce1bfa0e68 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.38", - "@budibase/frontend-core": "2.5.6-alpha.38", - "@budibase/shared-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/bbui": "2.5.6-alpha.39", + "@budibase/frontend-core": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.39", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 50d266859a..2f14d2eb36 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.38", - "@budibase/shared-core": "2.5.6-alpha.38", + "@budibase/bbui": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.39", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 8977131c1a..0120f5df39 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index c4c35239bf..a4652e6b97 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.38", - "@budibase/client": "2.5.6-alpha.38", + "@budibase/backend-core": "2.5.6-alpha.39", + "@budibase/client": "2.5.6-alpha.39", "@budibase/pro": "2.5.6-alpha.38", - "@budibase/shared-core": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.39", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 6c2725577e..c342939aa9 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.38" + "@budibase/types": "2.5.6-alpha.39" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6f80c7bdd6..023d9e9c2b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 0173d89b50..7bcec178a1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3acc367066..e7bb51e4eb 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.38", + "version": "2.5.6-alpha.39", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.38", + "@budibase/backend-core": "2.5.6-alpha.39", "@budibase/pro": "2.5.6-alpha.38", - "@budibase/string-templates": "2.5.6-alpha.38", - "@budibase/types": "2.5.6-alpha.38", + "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.39", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From eb86127bbea302baabea1b86a2ae25571e5d7b90 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 27 Apr 2023 16:20:56 +0000 Subject: [PATCH 45/57] Update pro version to 2.5.6-alpha.39 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index a4652e6b97..9d50771c8f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.39", "@budibase/client": "2.5.6-alpha.39", - "@budibase/pro": "2.5.6-alpha.38", + "@budibase/pro": "2.5.6-alpha.39", "@budibase/shared-core": "2.5.6-alpha.39", "@budibase/string-templates": "2.5.6-alpha.39", "@budibase/types": "2.5.6-alpha.39", diff --git a/packages/worker/package.json b/packages/worker/package.json index e7bb51e4eb..7c8a65caa8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.39", - "@budibase/pro": "2.5.6-alpha.38", + "@budibase/pro": "2.5.6-alpha.39", "@budibase/string-templates": "2.5.6-alpha.39", "@budibase/types": "2.5.6-alpha.39", "@koa/router": "8.0.8", From a20dfa588a3a1d8fcde4b951921ee9f99eadd547 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 27 Apr 2023 16:07:57 +0100 Subject: [PATCH 46/57] Type updates for plan changed event --- .../src/events/publishers/license.ts | 23 ++++++++----------- .../tests/core/utilities/mocks/events.ts | 1 - .../types/src/documents/account/account.ts | 1 + packages/types/src/sdk/events/event.ts | 2 -- packages/types/src/sdk/events/license.ts | 14 +++++------ 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/packages/backend-core/src/events/publishers/license.ts b/packages/backend-core/src/events/publishers/license.ts index aff3286c87..d86e9f1266 100644 --- a/packages/backend-core/src/events/publishers/license.ts +++ b/packages/backend-core/src/events/publishers/license.ts @@ -3,30 +3,28 @@ import { Event, LicenseActivatedEvent, LicensePlanChangedEvent, - LicenseTierChangedEvent, PlanType, Account, LicensePortalOpenedEvent, LicenseCheckoutSuccessEvent, LicenseCheckoutOpenedEvent, LicensePaymentFailedEvent, - LicensePaymentRecoveredEvent, + LicensePaymentRecoveredEvent, PriceDuration, } from "@budibase/types" -async function tierChanged(account: Account, from: number, to: number) { - const properties: LicenseTierChangedEvent = { - accountId: account.accountId, - to, - from, - } - await publishEvent(Event.LICENSE_TIER_CHANGED, properties) -} - -async function planChanged(account: Account, from: PlanType, to: PlanType) { +async function planChanged( + account: Account, + from: PlanType, + to: PlanType, + quantity: number | undefined, + duration: PriceDuration | undefined +) { const properties: LicensePlanChangedEvent = { accountId: account.accountId, to, from, + quantity, + duration } await publishEvent(Event.LICENSE_PLAN_CHANGED, properties) } @@ -74,7 +72,6 @@ async function paymentRecovered(account: Account) { } export default { - tierChanged, planChanged, activated, checkoutOpened, diff --git a/packages/backend-core/tests/core/utilities/mocks/events.ts b/packages/backend-core/tests/core/utilities/mocks/events.ts index dacf7dcce8..81de1f8175 100644 --- a/packages/backend-core/tests/core/utilities/mocks/events.ts +++ b/packages/backend-core/tests/core/utilities/mocks/events.ts @@ -123,7 +123,6 @@ beforeAll(async () => { jest.spyOn(events.plugin, "imported") jest.spyOn(events.plugin, "deleted") - jest.spyOn(events.license, "tierChanged") jest.spyOn(events.license, "planChanged") jest.spyOn(events.license, "activated") jest.spyOn(events.license, "checkoutOpened") diff --git a/packages/types/src/documents/account/account.ts b/packages/types/src/documents/account/account.ts index 8678085df0..62ac8ef37a 100644 --- a/packages/types/src/documents/account/account.ts +++ b/packages/types/src/documents/account/account.ts @@ -39,6 +39,7 @@ export interface Account extends CreateAccount { // licensing tier: string // deprecated planType?: PlanType + /** @deprecated */ planTier?: number license?: License installId?: string diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts index c4990f869b..0d0b166253 100644 --- a/packages/types/src/sdk/events/event.ts +++ b/packages/types/src/sdk/events/event.ts @@ -138,7 +138,6 @@ export enum Event { // LICENSE LICENSE_PLAN_CHANGED = "license:plan:changed", - LICENSE_TIER_CHANGED = "license:tier:changed", LICENSE_ACTIVATED = "license:activated", LICENSE_PAYMENT_FAILED = "license:payment:failed", LICENSE_PAYMENT_RECOVERED = "license:payment:recovered", @@ -328,7 +327,6 @@ export const AuditedEventFriendlyName: Record = { // LICENSE - NOT AUDITED [Event.LICENSE_PLAN_CHANGED]: undefined, - [Event.LICENSE_TIER_CHANGED]: undefined, [Event.LICENSE_ACTIVATED]: undefined, [Event.LICENSE_PAYMENT_FAILED]: undefined, [Event.LICENSE_PAYMENT_RECOVERED]: undefined, diff --git a/packages/types/src/sdk/events/license.ts b/packages/types/src/sdk/events/license.ts index a12fc6bbb5..b92c556cc8 100644 --- a/packages/types/src/sdk/events/license.ts +++ b/packages/types/src/sdk/events/license.ts @@ -1,15 +1,15 @@ -import { PlanType } from "../licensing" - -export interface LicenseTierChangedEvent { - accountId: string - from: number - to: number -} +import { PlanType, PriceDuration } from "../licensing" export interface LicensePlanChangedEvent { accountId: string from: PlanType to: PlanType + // may not be on historical events + // free plans won't have a duration + duration: PriceDuration | undefined + // may not be on historical events + // free plans won't have a quantity + quantity: number | undefined } export interface LicenseActivatedEvent { From 56f43d3f45ce23c6a467b169718f962ae5b266b2 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 28 Apr 2023 11:12:04 +0100 Subject: [PATCH 47/57] Hubspot updates (#10442) * Hubspot updates for per user pricing * Lint --- .../backend-core/src/events/publishers/license.ts | 5 +++-- .../tests/core/utilities/structures/licenses.ts | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/events/publishers/license.ts b/packages/backend-core/src/events/publishers/license.ts index d86e9f1266..d1ff4d7609 100644 --- a/packages/backend-core/src/events/publishers/license.ts +++ b/packages/backend-core/src/events/publishers/license.ts @@ -9,7 +9,8 @@ import { LicenseCheckoutSuccessEvent, LicenseCheckoutOpenedEvent, LicensePaymentFailedEvent, - LicensePaymentRecoveredEvent, PriceDuration, + LicensePaymentRecoveredEvent, + PriceDuration, } from "@budibase/types" async function planChanged( @@ -24,7 +25,7 @@ async function planChanged( to, from, quantity, - duration + duration, } await publishEvent(Event.LICENSE_PLAN_CHANGED, properties) } diff --git a/packages/backend-core/tests/core/utilities/structures/licenses.ts b/packages/backend-core/tests/core/utilities/structures/licenses.ts index 24b120451e..38392925d9 100644 --- a/packages/backend-core/tests/core/utilities/structures/licenses.ts +++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts @@ -7,16 +7,30 @@ import { PlanType, PriceDuration, PurchasedPlan, + PurchasedPrice, Quotas, Subscription, } from "@budibase/types" +export function price(): PurchasedPrice { + return { + amount: 10000, + amountMonthly: 10000, + currency: "usd", + duration: PriceDuration.MONTHLY, + priceId: "price_123", + dayPasses: undefined, + isPerUser: true, + } +} + export const plan = (type: PlanType = PlanType.FREE): PurchasedPlan => { return { type, usesInvoicing: false, minUsers: 1, model: PlanModel.PER_USER, + price: price(), } } From 0b88848277d284b0f6ef416a9486d79a9a6371bd Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 28 Apr 2023 11:24:05 +0100 Subject: [PATCH 48/57] Lint --- .../backend-core/src/events/publishers/license.ts | 5 +++-- yarn.lock | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/backend-core/src/events/publishers/license.ts b/packages/backend-core/src/events/publishers/license.ts index d86e9f1266..d1ff4d7609 100644 --- a/packages/backend-core/src/events/publishers/license.ts +++ b/packages/backend-core/src/events/publishers/license.ts @@ -9,7 +9,8 @@ import { LicenseCheckoutSuccessEvent, LicenseCheckoutOpenedEvent, LicensePaymentFailedEvent, - LicensePaymentRecoveredEvent, PriceDuration, + LicensePaymentRecoveredEvent, + PriceDuration, } from "@budibase/types" async function planChanged( @@ -24,7 +25,7 @@ async function planChanged( to, from, quantity, - duration + duration, } await publishEvent(Event.LICENSE_PLAN_CHANGED, properties) } diff --git a/yarn.lock b/yarn.lock index ecdb35847a..56ca4bc340 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.38": - version "2.5.6-alpha.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.38.tgz#09e8dfbb6cefe856b5c01845a5a5c02a406faedf" - integrity sha512-CBZv6V+163USHPN0SuEIrXeGA+9gB1QNmHrMEPSmwlOCZbNW2dhniz00EVSuVh3ypHSjDECgozasDJTNRhiufQ== +"@budibase/pro@2.5.6-alpha.39": + version "2.5.6-alpha.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.39.tgz#31ff637f01936cc55a21cb39c01c26afb42a7c54" + integrity sha512-Y33wjTLJ8P1KuYdz9T0QRrFxuvCNG9J6gkzp4lPZvrYr1RLFbvDIyz2wVMe5A0379EsYzTxuca7sXNvY21np/g== dependencies: - "@budibase/backend-core" "2.5.6-alpha.38" + "@budibase/backend-core" "2.5.6-alpha.39" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.38" + "@budibase/types" "2.5.6-alpha.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From dadf6128bc5230eda3f4aa70fb979550edf8024d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 28 Apr 2023 11:05:14 +0000 Subject: [PATCH 49/57] v2.5.6-alpha.40 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 7356540633..600714ad18 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4db1619306..4519b20dbe 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/types": "2.5.6-alpha.40", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5d4b67752e..a92e865e75 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5245b5dc88..065651aacf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.39", - "@budibase/frontend-core": "2.5.6-alpha.39", - "@budibase/shared-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", + "@budibase/bbui": "2.5.6-alpha.40", + "@budibase/frontend-core": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9efe246270..2e2f4238e5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/backend-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.40", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index ce1bfa0e68..5aec333011 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.39", - "@budibase/frontend-core": "2.5.6-alpha.39", - "@budibase/shared-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/bbui": "2.5.6-alpha.40", + "@budibase/frontend-core": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.40", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 2f14d2eb36..6b7ac7e774 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.39", - "@budibase/shared-core": "2.5.6-alpha.39", + "@budibase/bbui": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.40", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0120f5df39..b348653568 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9d50771c8f..635630c70f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.39", - "@budibase/client": "2.5.6-alpha.39", + "@budibase/backend-core": "2.5.6-alpha.40", + "@budibase/client": "2.5.6-alpha.40", "@budibase/pro": "2.5.6-alpha.39", - "@budibase/shared-core": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.40", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index c342939aa9..3b6d130527 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.39" + "@budibase/types": "2.5.6-alpha.40" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 023d9e9c2b..6526070627 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 7bcec178a1..4c6c5f6f4e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7c8a65caa8..090fcbfca9 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.39", + "version": "2.5.6-alpha.40", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.39", + "@budibase/backend-core": "2.5.6-alpha.40", "@budibase/pro": "2.5.6-alpha.39", - "@budibase/string-templates": "2.5.6-alpha.39", - "@budibase/types": "2.5.6-alpha.39", + "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.40", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ecb12272da95867d71a0043945cd8e9e720443db Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 28 Apr 2023 11:06:45 +0000 Subject: [PATCH 50/57] Update pro version to 2.5.6-alpha.40 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 635630c70f..d4693e095c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.40", "@budibase/client": "2.5.6-alpha.40", - "@budibase/pro": "2.5.6-alpha.39", + "@budibase/pro": "2.5.6-alpha.40", "@budibase/shared-core": "2.5.6-alpha.40", "@budibase/string-templates": "2.5.6-alpha.40", "@budibase/types": "2.5.6-alpha.40", diff --git a/packages/worker/package.json b/packages/worker/package.json index 090fcbfca9..1dbe057b72 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.40", - "@budibase/pro": "2.5.6-alpha.39", + "@budibase/pro": "2.5.6-alpha.40", "@budibase/string-templates": "2.5.6-alpha.40", "@budibase/types": "2.5.6-alpha.40", "@koa/router": "8.0.8", From 26fb21785024616d81767ed2ea4c70d005798112 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 28 Apr 2023 22:40:06 +0100 Subject: [PATCH 51/57] Add licenseRequestedAt time to license type --- packages/types/src/documents/account/account.ts | 1 + yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/types/src/documents/account/account.ts b/packages/types/src/documents/account/account.ts index 62ac8ef37a..dad8abed30 100644 --- a/packages/types/src/documents/account/account.ts +++ b/packages/types/src/documents/account/account.ts @@ -48,6 +48,7 @@ export interface Account extends CreateAccount { stripeCustomerId?: string licenseKey?: string licenseKeyActivatedAt?: number + licenseRequestedAt?: number licenseOverrides?: LicenseOverrides quotaUsage?: QuotaUsage } diff --git a/yarn.lock b/yarn.lock index 56ca4bc340..cf8e311c3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.39": - version "2.5.6-alpha.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.39.tgz#31ff637f01936cc55a21cb39c01c26afb42a7c54" - integrity sha512-Y33wjTLJ8P1KuYdz9T0QRrFxuvCNG9J6gkzp4lPZvrYr1RLFbvDIyz2wVMe5A0379EsYzTxuca7sXNvY21np/g== +"@budibase/pro@2.5.6-alpha.40": + version "2.5.6-alpha.40" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.40.tgz#96e85d22b61425bfd055377864938245c6ef17ec" + integrity sha512-hWKPVbGbjWcO3evIViICOL6g4hsv051lwUqCLRdZnSIiKCPlrr5JSsiINFinMHof55rHK5LALbGzJL4Ju82UeQ== dependencies: - "@budibase/backend-core" "2.5.6-alpha.39" + "@budibase/backend-core" "2.5.6-alpha.40" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.39" + "@budibase/types" "2.5.6-alpha.40" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From a89d7f1f46aaa621ed97d9d9c39344789fb117ca Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Sat, 29 Apr 2023 09:06:58 +0000 Subject: [PATCH 52/57] v2.5.6-alpha.41 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 600714ad18..0c65845ddb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 4519b20dbe..63ef522827 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/types": "2.5.6-alpha.41", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a92e865e75..4b0c3cb588 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 065651aacf..8b8c5a25fe 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.40", - "@budibase/frontend-core": "2.5.6-alpha.40", - "@budibase/shared-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", + "@budibase/bbui": "2.5.6-alpha.41", + "@budibase/frontend-core": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2e2f4238e5..96aab6c687 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/backend-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.41", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 5aec333011..cc6d913791 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.40", - "@budibase/frontend-core": "2.5.6-alpha.40", - "@budibase/shared-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/bbui": "2.5.6-alpha.41", + "@budibase/frontend-core": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.41", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 6b7ac7e774..22b516fb26 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.40", - "@budibase/shared-core": "2.5.6-alpha.40", + "@budibase/bbui": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.41", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index b348653568..4e3128a840 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d4693e095c..5416287c88 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.40", - "@budibase/client": "2.5.6-alpha.40", + "@budibase/backend-core": "2.5.6-alpha.41", + "@budibase/client": "2.5.6-alpha.41", "@budibase/pro": "2.5.6-alpha.40", - "@budibase/shared-core": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.41", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 3b6d130527..1b7e52a064 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.40" + "@budibase/types": "2.5.6-alpha.41" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6526070627..606ed0c367 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4c6c5f6f4e..95573987bc 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1dbe057b72..dea750f007 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.40", + "version": "2.5.6-alpha.41", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.40", + "@budibase/backend-core": "2.5.6-alpha.41", "@budibase/pro": "2.5.6-alpha.40", - "@budibase/string-templates": "2.5.6-alpha.40", - "@budibase/types": "2.5.6-alpha.40", + "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.41", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6026794e894c6d44b0aa19c5bafe190d4f5d5c02 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Sat, 29 Apr 2023 09:08:19 +0000 Subject: [PATCH 53/57] Update pro version to 2.5.6-alpha.41 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5416287c88..4969f7ee53 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.41", "@budibase/client": "2.5.6-alpha.41", - "@budibase/pro": "2.5.6-alpha.40", + "@budibase/pro": "2.5.6-alpha.41", "@budibase/shared-core": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.41", "@budibase/types": "2.5.6-alpha.41", diff --git a/packages/worker/package.json b/packages/worker/package.json index dea750f007..e6b47c34ba 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.41", - "@budibase/pro": "2.5.6-alpha.40", + "@budibase/pro": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.41", "@budibase/types": "2.5.6-alpha.41", "@koa/router": "8.0.8", From 38d0fd943ae50b8105495ba21427d265512b25bc Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Sat, 29 Apr 2023 22:06:41 +0100 Subject: [PATCH 54/57] Remove business minimum quantity from backend --- .../tests/core/utilities/structures/licenses.ts | 1 - packages/types/src/sdk/licensing/plan.ts | 2 -- packages/types/src/sdk/licensing/quota.ts | 6 ------ yarn.lock | 12 ++++++------ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/packages/backend-core/tests/core/utilities/structures/licenses.ts b/packages/backend-core/tests/core/utilities/structures/licenses.ts index 38392925d9..810f31cf4f 100644 --- a/packages/backend-core/tests/core/utilities/structures/licenses.ts +++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts @@ -28,7 +28,6 @@ export const plan = (type: PlanType = PlanType.FREE): PurchasedPlan => { return { type, usesInvoicing: false, - minUsers: 1, model: PlanModel.PER_USER, price: price(), } diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts index 360d7d08e5..3e214a01ff 100644 --- a/packages/types/src/sdk/licensing/plan.ts +++ b/packages/types/src/sdk/licensing/plan.ts @@ -17,7 +17,6 @@ export enum PriceDuration { export interface AvailablePlan { type: PlanType maxUsers: number - minUsers: number prices: AvailablePrice[] } @@ -38,7 +37,6 @@ export interface PurchasedPlan { type: PlanType model: PlanModel usesInvoicing: boolean - minUsers: number price?: PurchasedPrice } diff --git a/packages/types/src/sdk/licensing/quota.ts b/packages/types/src/sdk/licensing/quota.ts index ea51f7a490..73afa1ed05 100644 --- a/packages/types/src/sdk/licensing/quota.ts +++ b/packages/types/src/sdk/licensing/quota.ts @@ -55,12 +55,6 @@ export const isConstantQuota = ( return quotaType === QuotaType.CONSTANT } -export interface Minimums { - users: number -} - -export type PlanMinimums = { [key in PlanType]: Minimums } - export type PlanQuotas = { [key in PlanType]: Quotas | undefined } export type MonthlyQuotas = { diff --git a/yarn.lock b/yarn.lock index cf8e311c3a..3b403d6444 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.40": - version "2.5.6-alpha.40" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.40.tgz#96e85d22b61425bfd055377864938245c6ef17ec" - integrity sha512-hWKPVbGbjWcO3evIViICOL6g4hsv051lwUqCLRdZnSIiKCPlrr5JSsiINFinMHof55rHK5LALbGzJL4Ju82UeQ== +"@budibase/pro@2.5.6-alpha.41": + version "2.5.6-alpha.41" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.41.tgz#2632b398159211bf64bf6caff9753c877b6fc09d" + integrity sha512-8Zfm+RtcXY77gdXXHti8QT+Vt+1ApuVqYL3KCkxBVbpzgQci/F3mipNXUX8bEy/y+QYAdgn6psDTWAqyr9VALg== dependencies: - "@budibase/backend-core" "2.5.6-alpha.40" + "@budibase/backend-core" "2.5.6-alpha.41" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.40" + "@budibase/types" "2.5.6-alpha.41" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From bad6eb30f4191fdb529388416e148378f87a100c Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Sun, 30 Apr 2023 22:57:08 +0100 Subject: [PATCH 55/57] Update usage bar to warn when greater than 100% --- packages/builder/src/components/usage/Usage.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte index 6e81abfe63..23d8ddc2f3 100644 --- a/packages/builder/src/components/usage/Usage.svelte +++ b/packages/builder/src/components/usage/Usage.svelte @@ -27,7 +27,7 @@ onMount(() => { unlimited = isUnlimited() percentage = getPercentage() - if (warnWhenFull && percentage === 100) { + if (warnWhenFull && percentage >= 100) { showWarning = true } }) From 9f7b212f2223ee6a7ba3e4abe78bb2740730d45f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 2 May 2023 08:44:05 +0000 Subject: [PATCH 56/57] v2.5.6-alpha.42 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 0c65845ddb..5ad64883d4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 63ef522827..1302568db5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.42", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4b0c3cb588..ff82bbc2c4 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 8b8c5a25fe..0015174bcf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.41", - "@budibase/frontend-core": "2.5.6-alpha.41", - "@budibase/shared-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/bbui": "2.5.6-alpha.42", + "@budibase/frontend-core": "2.5.6-alpha.42", + "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 96aab6c687..87f8885baa 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/backend-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/types": "2.5.6-alpha.42", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index cc6d913791..7ff0ddae9c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.41", - "@budibase/frontend-core": "2.5.6-alpha.41", - "@budibase/shared-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/bbui": "2.5.6-alpha.42", + "@budibase/frontend-core": "2.5.6-alpha.42", + "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/types": "2.5.6-alpha.42", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 22b516fb26..c0b60cb091 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.41", - "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/bbui": "2.5.6-alpha.42", + "@budibase/shared-core": "2.5.6-alpha.42", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 4e3128a840..13cc20f9e9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4969f7ee53..c33af6ea45 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.41", - "@budibase/client": "2.5.6-alpha.41", + "@budibase/backend-core": "2.5.6-alpha.42", + "@budibase/client": "2.5.6-alpha.42", "@budibase/pro": "2.5.6-alpha.41", - "@budibase/shared-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/types": "2.5.6-alpha.42", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 1b7e52a064..4ea3deea5f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.41" + "@budibase/types": "2.5.6-alpha.42" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 606ed0c367..e1397182dc 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 95573987bc..3068068d4c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e6b47c34ba..0d47c30299 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.41", + "@budibase/backend-core": "2.5.6-alpha.42", "@budibase/pro": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/types": "2.5.6-alpha.42", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 003ac1c380c7dd88b2b8baa7fdfb9bc59992e03f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 2 May 2023 08:45:36 +0000 Subject: [PATCH 57/57] Update pro version to 2.5.6-alpha.42 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index c33af6ea45..cc8a8208dc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.42", "@budibase/client": "2.5.6-alpha.42", - "@budibase/pro": "2.5.6-alpha.41", + "@budibase/pro": "2.5.6-alpha.42", "@budibase/shared-core": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.6-alpha.42", "@budibase/types": "2.5.6-alpha.42", diff --git a/packages/worker/package.json b/packages/worker/package.json index 0d47c30299..ae9358f084 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.42", - "@budibase/pro": "2.5.6-alpha.41", + "@budibase/pro": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.6-alpha.42", "@budibase/types": "2.5.6-alpha.42", "@koa/router": "8.0.8",