Commit Graph

199 Commits

Author SHA1 Message Date
Rory Powell ec06f13aa6 Per user pricing (#10378)
* Update pro version to 2.4.44-alpha.9 (#10231)

Co-authored-by: Budibase Staging Release Bot <>

* Track installation and unique tenant id on licence activate (#10146)

* changes and exports

* removing the extend

* Lint + tidy

* Update account.ts

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>

* Type updates for loading new plans (#10245)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS` (#10247)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete + migration (#10250)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Lint

* Types and structures for user subscription quantity sync (#10280)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Prevent old installs from activating, track install info via get license request instead of on activation.

* Add usesInvoicing to PurchasedPlan

* Add min/max users to PurchasedPlan

* Additional test structures for generating a license, remove maxUsers from PurchasedPlan - this is already present in the license quotas

* Stripe integration for monthly prorations on annual plans

* Integrate annual prorations with test clocks

* Updated types, test utils and date processing for licensing (#10346)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Prevent old installs from activating, track install info via get license request instead of on activation.

* Add usesInvoicing to PurchasedPlan

* Add min/max users to PurchasedPlan

* Additional test structures for generating a license, remove maxUsers from PurchasedPlan - this is already present in the license quotas

* Stripe integration for monthly prorations on annual plans

* Integrate annual prorations with test clocks

* Updated types, test utils and date processing

* Lint

* Pricing/billing page (#10353)

* bbui updates for billing page

* Require all PlanTypes in PlanMinimums for compile time safety

* fix test package utils

* Incoming user limits warnings (#10379)

* incoming user limits warning

* fix inlinealert button

* add corretc button link and text to user alert

* pr comments

* simplify limit check

* Types and test updates for subscription quantity changes in account-portal (#10372)

* Add chance extensions for `arrayOf`. Update events spies with license events

* Add generics to doInTenant response

* Update account structure with quota usage

* User count limits (#10385)

* incoming user limits warning

* fix inlinealert button

* add corretc button link and text to user alert

* pr comments

* simplify limit check

* user limit messaging on add users modal

* user limit messaging on import users modal

* update licensing store to be more generic

* some styling updates

* remove console log

* Store tweaks

* Add startDate to Quota type

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>

* Lint

* Support custom lock options

* Reactivity fixes for add user modals

* Update ethereal email creds

* Add warn for getting invite from code error

* Extract disabling user import condition

* Handling unlimited users in modals logic and adding start date processing to store

* Lint

* Integration testing fixes (#10389)

* lint

---------

Co-authored-by: Mateus Badan de Pieri <mateuspieri@gmail.com>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Peter Clement <PClmnt@users.noreply.github.com>
2023-04-24 09:31:48 +01:00
adrinr afc5c99c6f Revert "Merge pull request #10367 from Budibase/revert-10267-chore/pro_as_submodule"
This reverts commit df18119b56, reversing
changes made to 676b85dbd8.
2023-04-20 19:48:29 +01:00
adrinr e65225996e Revert https://github.com/Budibase/budibase/pull/10267 2023-04-20 19:04:20 +01:00
Michael Drury 1bd1857533 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-20 11:35:29 +01:00
adrinr cfbb25449d Link pro only when it exists locally 2023-04-19 10:09:12 +01:00
mike12345567 af72b730e0 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-14 13:06:57 +01:00
adrinr 68769602cd Fix release pro script 2023-04-13 21:41:42 +01:00
mike12345567 361005b521 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-04-13 17:23:58 +01:00
adrinr ceacf38ed6 Bootstrap submodule 2023-04-13 10:44:28 +01:00
adrinr b8d9311b49 Merge branch 'chore/yarn_workspaces' into chore/pro_as_submodule 2023-04-13 09:41:59 +01:00
adrinr 181d0ee236 Run pro bootstrap if submodule exists 2023-04-12 18:36:58 +01:00
Rory Powell 3b9887c66c Use helm .Chart.AppVersion instead of specifying value (#9933)
* Use helm .Chart.AppVersion instead of specifying value

* Backwards compatibility with existing process for deploying chart from source where Chart.AppVersion hasn't been generated yet
2023-04-12 13:49:25 +01:00
adrinr 000e49a229 Bootstrap using submodule 2023-04-11 16:53:51 +01:00
adrinr 5ea8086be0 Remove scripts 2023-04-11 16:52:59 +01:00
Rory Powell 77ffb8d86d Run integration suite in CI again / auto detect tenancy / refactors (#10209)
* qa-core-ci-fixes

* global setup and teardown wip

* Updates to logs and setup

* Remove date and console mocking

* Update CI to spin up minimal dev env

* Update readme

* Fix scopeBackend.sh

* Ensure docker services are initialised before starting worker

* Lint

* Fix admin user being created on startup (#10219)

* use regular bootstrap and build

* Lint

* Temp: re-use global setup to get around app limit in QA
2023-04-05 15:33:56 +01:00
adrinr 87aaf3b172 Use esbuild for worker 2023-03-31 12:32:41 +01:00
adrinr e8e77cc140 Use esbuild for server 2023-03-31 12:32:41 +01:00
Adria Navarro 158703daef Bug - BUDI-6068 filters do not work for google sheets (#9886)
* Add data-utils with filters

* Create data-utils

* Add data-utils to compiled code

* Reuse constants

* Fix tests

* Rename package to shared-core

* Namespace export shared-core

* Rely on rollup to bundle shared-core

* Revert "Rely on rollup to bundle shared-core"

This reverts commit e8b5a2bb9a.

* Updating version and removing private.

* Update version

* Increment versions.

* Implement sort

* Enabling sort

* v2.3.21-alpha.2

* Fix build

* Improve readability

* Move deepGet to shared helper

* Better type usage

* Fix types

* Configure types

* Fix vite refs

* Add dep

* Fixing depencencies on client

* Add missing dev command

* Fix loading issues

* Update versions to latest

* Multiple es6 and commonjs configs

* Config

* Use local packages on rollup for client

* Change shared-core and types entry points

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-03-09 08:50:26 +00:00
Michael Drury 03ff4daca3 Revert "pinning MinIO versions" 2023-03-08 13:35:26 +00:00
Martin McKeaveney d72114eba3 pinning MinIO versions 2023-03-08 12:17:15 +00:00
mike12345567 ef30c03fa6 Merge branch 'develop' of github.com:Budibase/budibase into feature/audit-logs 2023-02-21 17:26:24 +00:00
mike12345567 6ec5e97ce9 Required work to support the new lucene audit logs search indexing. 2023-02-17 16:26:55 +00:00
Rory Powell 89829965d4 Remove test on release-develop job (temporary) (#9711)
* Remove test on release-develop job (temporary)

* Remove test on release-develop job (temporary)

* Speed up pro release script by adding no verify flag to version update commits
2023-02-16 14:14:22 +00:00
mike12345567 c60b6da0ab Removing pro from backend-core. 2023-02-15 13:49:30 +00:00
mike12345567 1ed4f4b8fe Update on audit logs, getting the full write flow from events configured. 2023-02-15 12:37:32 +00:00
adrinr a4555dc641 Change install script to support only mac explicitly 2023-02-03 11:06:31 +00:00
adrinr 909da26423 Setup plugins 2023-02-02 13:45:36 +00:00
adrinr 4b9d178086 Add setup in md 2023-02-02 12:36:25 +00:00
Rory Powell b635614f77 Allow proxy upstream URLs to be configured at runtime (#7413)
* allow proxy upstream urls to be configured at runtime

* make dynamic upstream urls in proxy the default behaviour

* reorder env directives

* Use appVersion for proxy image

* Update couch upstream for proxy

* proxy ci updates - WIP

* allowing custom resolvers in proxy service deployment

* remove generateProxyConf script for prod and remove from builds

* remove generateProxyConfig script

* removing nginx dev conf

* delete generated nginx conf

Co-authored-by: Thomas Weiß <panos@unbunt.org>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
2022-12-20 16:28:13 +00:00
Rory Powell 5aa7291677 Only build pro after bootstrapping and after backend-core build (#9130)
* Update .npmignore path to include all subdirectories of dist

The dist/* pattern was including only the first level of files inside
the dist folder.

Update to no longer wildcard to include all the folder contents

* Only build pro after bootstrapping and after backend-core build

This protects against the scenario of a breaking change in backend-core
that is relied on by the pro package.

Introducing to fix the current build as the published backend-core package is corrupted.
This change ensures the local filsystem version of core will be used.

* Debug line

* Debug lines

* Update build script
2022-12-20 14:30:31 +00:00
Peter Clement 9d841bc947 Server and Worker tests (#8928)
* automation unit tests

* row processor tests

* update executeQuery test

* update groups assertion

* some more worker tests

* plugin tests and tidying up

* linting

* temporarily disable group tests

* more tests

* fix import

* fix backup tests

* add pro mocks to worker

* check for app existence in import test

* test new tsconfig

* testing changes

* Pro test utils (#9020)

* Pro test utils changes

* Add test fixes

* Remove ts-ignore

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Rory Powell <rory.codes@gmail.com>
2022-12-12 22:02:32 +00:00
Rory Powell 1612044dc1 Merge branch 'develop' into subdomain-tenancy 2022-11-15 16:18:59 +00:00
Rory Powell 5da699e27c Fail pro scripts on error, unify TS versions, update test and coverage configs, use pro source mappings 2022-11-14 13:29:46 +00:00
Rory Powell 6783fd713e Update tenancy detection to honour any subdomain pattern according to platform url 2022-11-09 16:35:16 +00:00
tomamplius 75559dddce add verbose to rm 2022-10-21 21:09:54 +02:00
tomamplius bc8331ddd4 use egrep to replace grep + awk 2022-10-21 21:09:03 +02:00
tomamplius c4b029f78d remove move on / 2022-10-09 09:35:21 +02:00
mike12345567 a86cdb3291 Fixing issue #8079 - making sure TARGETARCH gets correctly exported to environment to pick correct minio bundle. 2022-10-06 14:05:01 +01:00
Rory Powell 43c8bfffed Update scripts/pro/install.sh 2022-10-04 14:56:30 +01:00
Mel O'Hagan 95ff0d9665 Fallback 2022-10-04 14:50:21 +01:00
Rory Powell a551532e73 Navigation updates, cookie constant, update link-dependencies and localdomain scripts 2022-09-14 10:53:14 +01:00
Dean bbbf8bfc0b Updated bootstrapping flow to include the account portal. 2022-08-31 15:19:57 +01:00
Rory Powell 51e66d271e update pro release script 2022-07-27 14:23:17 -04:00
Rory Powell e190d1cae9 Update lockfiles in pro release 2022-07-27 13:42:06 -04:00
Rory Powell 1e32256311 Update server and worker lockfiles after pro release 2022-07-27 12:28:22 -04:00
Martin McKeaveney adb265564e merge 2022-07-11 10:19:07 +01:00
Rory Powell 0a078df5ae Add test:pro command 2022-07-08 11:36:31 +01:00
mike12345567 2e5c5e1af5 Updating pro release script to fix dependencies. 2022-07-07 12:02:13 +01:00
mike12345567 d390bb9c20 Moving majority of automation logging functionality to pro. 2022-07-04 15:44:47 +01:00
mike12345567 2a17e9f732 Review comments. 2022-06-22 12:40:33 +01:00
mike12345567 b42e0c1c5e Adding command for multiarch building with buildx, need to install qemu on Linux to make this work. 2022-06-21 19:52:44 +01:00
mike12345567 9ad9860a9c Fixing cleanup script, adding ARM support to dockerfile, as well as adding ARM client. 2022-06-21 17:56:55 +01:00
mike12345567 af60582dad Slimming build down from 4GB to 1.8GB for single image. 2022-06-16 20:38:24 +01:00
mike12345567 148c7010e8 Updating the single image docker build to pin versions before build to allow it to work with develop etc. Also optimising the image a bit so that it can be built significantly faster. 2022-06-16 19:30:34 +01:00
Rory Powell ee9a19a1d5 Back populate no-op migrations on new app and tenant create 2022-06-13 10:51:29 +01:00
Rory Powell 2a00f6498d Merge branch 'feature/posthog-v2' into feature/event-backfill 2022-05-29 00:25:40 +01:00
Rory Powell c0d6fa34a4 Identity tenant and installation groups, property updates 2022-05-28 21:38:22 +01:00
Martin McKeaveney f7272c29b6 proxy generation for release env 2022-05-27 00:10:43 +01:00
Martin McKeaveney e6678a17ae kick off release 2022-05-24 12:18:39 +01:00
Rory Powell d736e558f9 Update pro install script to checkout base branch only when feature branch doesn't exist 2022-04-26 17:55:33 +01:00
Rory Powell b9a39e193e Fix developer count migration when only single developer 2022-04-25 15:38:37 +01:00
Rory Powell 6b48028177 git add changed package.json files 2022-04-25 12:58:34 +01:00
Rory Powell f6284cc697 Sync versions of pro and backend-core 2022-04-25 12:19:36 +01:00
Rory Powell 12279aff53 Path fixes 2022-04-22 12:10:39 +01:00
Rory Powell 6d97099448 Bash updates 2022-04-22 11:49:15 +01:00
Rory Powell fcc8db9e34 Skip pro install on community forks 2022-04-22 11:45:45 +01:00
Rory Powell 63397aa047 Update release script 2022-04-22 11:37:55 +01:00
Rory Powell 1141fdd483 Release script updates 2022-04-22 11:01:27 +01:00
Rory Powell 35e18e7ac1 Bash updates 2022-04-22 10:40:17 +01:00
Rory Powell 15e1464a85 Uncomment release script 2022-04-22 10:21:47 +01:00
Rory Powell e10bbb5eb0 Pro build fixes 2022-04-22 10:16:09 +01:00
Rory Powell 0edc8800bd Pro build fixes 2022-04-22 09:43:51 +01:00
Rory Powell 77a79e26d1 Update clone authorization 2022-04-21 22:18:19 +01:00
Rory Powell 96de55bf4f Update pro install scripts with branch handling 2022-04-21 22:12:57 +01:00
Rory Powell 381c23325a Update pro install and release scripts 2022-04-21 21:55:16 +01:00
Rory Powell 197891078a Remove CI check from dependency link script 2022-04-13 22:10:58 +01:00
Rory Powell 08edd0e2d8 Move all dependency linking into budibase 2022-04-13 12:41:14 +01:00
Martin McKeaveney 1cbca0578a removing need for handlebars in nginx script, automating proxy service deployment 2022-02-22 13:24:21 +01:00
Martin McKeaveney 7334fc6748 automate helm deployment with CI 2021-12-09 11:05:43 +00:00
Martin McKeaveney 5a614f33c3 CI Automation for helm chart release 2021-12-08 17:13:00 +00:00
Martin McKeaveney 7ff93e975a completely automate helm chart incrementing and semver 2021-12-08 16:27:33 +00:00
Martin McKeaveney 8269e85eb9 helm chart release 2021-12-06 18:33:31 +01:00
Martin McKeaveney 5f86321f0b packaging helm chart with consolidated config 2021-12-06 17:19:53 +01:00
mike12345567 1ba0584c64 Reverting bbui lock, making sure it isn't upgrading again, fixing vite to the best version we can use. 2021-11-17 19:12:54 +00:00
mike12345567 7802bb1e45 Adding audit script and commiting all of the audits that it made, updating all yarn locks. 2021-11-17 18:04:16 +00:00
Martin McKeaveney 5843fa0286 test K8S CI 2021-08-18 18:09:40 +01:00
Martin McKeaveney 6e8924ff94 script for pinning dev versions of BB packages 2021-08-05 12:59:33 +01:00
Andrew Kingston 88e700c19e Remove symlink dev script 2021-04-01 10:18:45 +01:00
Andrew Kingston 44ad38fdf8 Add BBUI to monorepo and use vite for builder, client lib and standard components 2021-03-31 16:14:56 +01:00
Andrew Kingston dbbeb61297 Support BBUI hot reloading 2021-03-31 10:59:26 +01:00
Martin McKeaveney d42528cdbc remove materialdesign from setup script 2021-02-27 20:42:09 +00:00
mike12345567 d22ea5c722 Linting. 2021-01-18 17:47:24 +00:00
mike12345567 419c6b9393 Adding the handlebars library, still need to add testcases to this. 2021-01-18 17:40:19 +00:00
Andrew Kingston dc010cd769 Add client source map 2020-11-25 16:08:28 +00:00
Martin McKeaveney 3c9af5336e formatting 2020-05-18 11:01:17 +01:00
Michael Shanks 7d6046d021 allow bb home folder to bem anywhere 2020-05-11 15:42:42 +01:00
Martin McKeaveney 96a1bc52de added model props 2020-05-07 14:59:06 +01:00
Martin McKeaveney 0ec47971d0 formatting + fixing builder tests 2020-05-07 10:53:34 +01:00
Martin McKeaveney ddb1880b98 development setup, adding data components 2020-05-06 10:33:30 +01:00