1
0
Fork 0
mirror of synced 2024-08-12 08:31:27 +12:00
Commit graph

378 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
Andrew Kingston
9b2b071b88 Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-18 21:00:42 +01:00
Michael Drury
42c37eea46 Merge pull request #10276 from Budibase/labday/automation-plugins
Automation step plugins
2023-04-18 17:33:25 +01:00
Andrew Kingston
7ae3341e22 Add rowHeight property to table types 2023-04-18 10:38:29 +01:00
Andrew Kingston
a4515e1162 Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-18 08:29:27 +01:00
Andrew Kingston
208e481bbc Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-17 17:00:56 +01:00
mike12345567
b4e6cbce7a Some final updates to get tests passing again, issue with publisher tenant ID being the 'unique' format which cannot actually be used. 2023-04-17 15:59:59 +01:00
mike12345567
453d5cc0e6 Further PR comments. 2023-04-17 14:03:54 +01:00
Michael Drury
ef5bcc4b66 Main body of PR comments, switching event handling to be a publisher of async events, a generic event; then adding a new async document update processor, which can later be converted to be part of the event processing pipeline. 2023-04-15 00:37:22 +01:00
Michael Drury
941947f04c Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-14 22:42:02 +01:00
Andrew Kingston
69f6834886 Improve sheet integration with data section and add horizontal cell inversion 2023-04-13 12:01:16 +01:00
mike12345567
a9fb09424b Merge branch 'develop' of github.com:Budibase/budibase into labday/automation-plugins 2023-04-12 14:27:50 +01:00
adrinr
f882993091 Name and its fields are optional 2023-04-11 16:12:18 +01:00
Michael Drury
1c7c06e983 Bulk of the automation plugin system, supporting custom plugins. 2023-04-10 23:48:54 +01:00
mike12345567
400a112a4b Refactoring automation steps to be better defined in Typescript, which allows writing the validator for automations. 2023-04-06 18:11:44 +01:00
Michael Drury
0771ec55fb Small change to make sure no duplicates ever occur. 2023-04-05 21:22:50 +01:00
mike12345567
0803b08217 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-05 17:59:18 +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
mike12345567
e128642bce Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-04 13:37:59 +01:00
Michael Drury
ff98ba5a0a Adding a document update queue based on the events which can be used to track when certain documents have changed, using this for users and groups to detect when a re-sync is needed. 2023-04-04 00:25:15 +01:00
adrinr
e0bcc42c80 Make scim info extensible and the object unaware of the data 2023-04-03 19:06:03 +01:00
adrinr
ad4f70b826 Type emails 2023-04-03 16:45:55 +01:00
Adria Navarro
e1669c8260 Merge pull request #10022 from Budibase/feature/scim
Feature - SCIM endpoints
2023-04-03 13:22:01 +02:00
Michael Drury
09a48a1d21 Merge branch 'develop' of github.com:Budibase/budibase into fix/no-iterations-loop 2023-03-31 23:29:21 +01:00
Peter Clement
0a567a3302 add new status to handle no iterations during loop 2023-03-31 12:23:10 +01:00
Rory Powell
38e6d61709 Explictly check for google datasource configured (#10165)
* Explictly check for google datasource configured

* Unit tests for getGoogleDatasourceConfig

* Update /api/global/configs/public test + lint
2023-03-30 13:40:59 +01:00
adrinr
18ccb0fd27 Add and map display name in scim 2023-03-29 10:41:37 +01:00
adrinr
f7a34dedfa Use generic types instead of overrides 2023-03-28 16:46:23 +01:00
adrinr
1a9653a4db Tests configs 2023-03-28 16:46:23 +01:00
adrinr
d0772ee142 Test when scim is disabled 2023-03-28 16:46:23 +01:00
adrinr
4a4ba487a0 Allow scim config type 2023-03-28 16:46:23 +01:00
adrinr
1838f75dbc Add test 2023-03-28 16:46:23 +01:00
adrinr
d9ff01b5f0 Clean code 2023-03-28 16:46:23 +01:00
adrinr
c48952d056 Add group event scim messages 2023-03-28 16:46:23 +01:00
adrinr
8a6400c7d0 Add viaScim to group events 2023-03-28 16:46:23 +01:00
adrinr
7821c637c6 Move event one level up 2023-03-28 16:46:23 +01:00
adrinr
099cc145bf Clean code 2023-03-28 16:46:23 +01:00
adrinr
62cd6a43f2 Remove "duplicated" events 2023-03-28 16:46:23 +01:00
adrinr
648247b10e Add scim info in update/delete user events 2023-03-28 16:46:23 +01:00
adrinr
6df08799bb Add isScim to user created event 2023-03-28 16:46:23 +01:00
adrinr
31eaa36883 Unify create events 2023-03-28 16:46:23 +01:00
adrinr
924c103ccc Use ids instead of email on the events 2023-03-28 16:46:23 +01:00
adrinr
26f077cc1c Event on delete 2023-03-28 16:46:23 +01:00
adrinr
cbadf69a29 Dispatch event on user update 2023-03-28 16:46:23 +01:00
adrinr
e6ff0a44fb Dispatch event on scim user created 2023-03-28 16:46:23 +01:00
adrinr
7bfdd31daa Test different patch use cases 2023-03-28 16:46:23 +01:00
adrinr
9d0aff96e4 Add members to group 2023-03-28 16:46:23 +01:00
adrinr
586275ed89 Allow fields edit 2023-03-28 16:46:22 +01:00
adrinr
771e3b8862 Bookmark optional 2023-03-28 16:46:22 +01:00
adrinr
beb4118582 Renames 2023-03-28 16:46:22 +01:00