Commit Graph

46 Commits

Author SHA1 Message Date
jvcalderon 5b2f55a592 Per user per creator changes 2023-10-18 13:36:34 +02:00
Martin McKeaveney 65af2ed7c2 backmerge from master 2023-09-27 17:06:57 +01:00
mike12345567 6b52adc294 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7458 2023-09-25 17:55:06 +01:00
Adria Navarro 2530ebda2b Fix tests 2023-09-25 09:48:27 +02:00
Martin McKeaveney 6d4e3082e3 type tidy up and lint 2023-09-24 22:07:40 +01:00
mike12345567 fe5cc6878b Adding licensing checks to import/export API. 2023-09-22 17:38:34 +01:00
Adria Navarro 6d6b3dd971 Refactor 2023-09-19 13:28:24 +02:00
Adria Navarro 561fe3cbe9 Merge branch 'develop' into BUDI-7393-view-permissions-behind-feature-flag 2023-08-22 11:49:07 +03:00
Adria Navarro 664f257239 Implemment checks 2023-08-22 11:27:06 +03:00
Michael Drury 4ea61140e8 Merge branch 'develop' into fix/test-flakiness 2023-08-18 16:53:44 +01:00
mike12345567 a5a1c62eb1 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 14:34:08 +01:00
mike12345567 7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
mike12345567 3e2010fb26 Attempting to improve on test flakiness, don't depend on a timeout for docker startup, wait for port to respond. 2023-08-18 14:18:47 +01:00
mike12345567 621b1fadea Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 13:22:34 +01:00
Martin McKeaveney fd099658a0 revert develop into master 2023-08-17 10:28:15 +01:00
mike12345567 e97c042e95 Adding test cases. 2023-08-15 15:35:52 +01:00
Adria Navarro 516e2ff09a Merge branch 'develop' into BUDI-6785-update-to-node-18 2023-08-07 12:32:20 +01:00
Adria Navarro e011ccd0c4 Merge branch 'develop' into chore/typecheck_tests 2023-08-01 16:49:06 +01:00
Adria Navarro 9b9081d437 Check types on cli 2023-08-01 13:11:04 +02:00
mike12345567 8522cb94d3 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-28 17:10:43 +01:00
Adria Navarro e2ac7e3463 Fix minio usage 2023-07-28 18:03:03 +02:00
Adria Navarro beaeff90cc Improve lodash imports 2023-07-28 17:11:48 +02:00
mike12345567 454f832b75 Updates after running through tests, adding mocking of app builders feature for test cases to work. 2023-07-28 12:58:05 +01:00
mike12345567 8253ad0a2e Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-26 14:24:29 +01:00
Adria Navarro 3ce92e8034 Implement and test external field selector 2023-07-25 19:48:46 +02:00
Adria Navarro 67f502579e Test schema 2023-07-25 19:48:46 +02:00
mike12345567 c375f860ba Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-24 13:46:49 +01:00
Rory Powell 2645e4cdad Build fixes 2023-07-20 14:56:01 +01:00
mike12345567 91847504c8 Adding test cases for admin/builder checking middlewares. 2023-07-18 18:10:15 +01:00
Rory Powell 4a38d55ce8 Lint 2023-07-14 16:55:48 +01:00
Rory Powell 3326d061f1 core structure updates 2023-07-14 11:44:05 +01:00
Rory Powell 41dc86436c Add structures for Installation type 2023-07-14 09:21:23 +01:00
Rory Powell 1371a009a8 use automocking in offline.spec.ts 2023-07-13 22:06:52 +01:00
Rory Powell 052a74f1d7 offline license structure 2023-07-13 21:53:05 +01:00
Peter Clement d271bbdadb rename syncWebHooks to syncAutomations 2023-05-19 10:07:02 +01:00
Peter Clement c86c2b4096 add synchronous webhook functionality 2023-05-12 15:57:34 +01:00
Rory Powell 9647ac5dee Create hubspot expansions and churns as users are added and deleted 2023-05-02 20:08:51 +01:00
Rory Powell 38d0fd943a Remove business minimum quantity from backend 2023-04-29 22:06:41 +01:00
Rory Powell 56f43d3f45 Hubspot updates (#10442)
* Hubspot updates for per user pricing

* Lint
2023-04-28 11:12:04 +01:00
Rory Powell a20dfa588a Type updates for plan changed event 2023-04-27 21:58:42 +01:00
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
mike12345567 3b03766f9e Adding plugin validation unit tests. 2023-04-18 16:36:03 +01:00
mike12345567 ada052e043 Merging in develop - fixing some test cases which broke in the process. 2023-04-12 10:56:21 +01:00
mike12345567 b19df9da22 Some final updates to get event spyOn working again. 2023-03-30 17:15:49 +01:00
mike12345567 24fc72657d Fixing all broken test cases after breaking out context fully from jestSetup/backend-core jest loading. 2023-03-30 16:35:25 +01:00
mike12345567 47897c8afa Basic moving around of assets. 2023-03-30 16:07:59 +01:00