Commit Graph

800 Commits

Author SHA1 Message Date
Rory Powell 0b88848277 Lint 2023-04-28 11:24:05 +01:00
Rory Powell a20dfa588a Type updates for plan changed event 2023-04-27 21:58:42 +01:00
Adria Navarro c47ff6ccfb Merge branch 'develop' into chore/remove_package.json_dependency 2023-04-24 18:42:55 +02:00
Martin McKeaveney 86dc082f57 Merge pull request #10366 from Budibase/budi-5186-dynamic-filter-contains-option
Dynamic filter contains option
2023-04-24 09:32:58 +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
Mel O'Hagan 458b23fc1b Add escape for forward slash 2023-04-20 21:57:48 +01:00
Mel O'Hagan 66a573dcc9 Fix fuzzy search internal DB 2023-04-20 18:14:41 +01:00
Mel O'Hagan 68ba2402a0 Fix substring regex 2023-04-20 17:51:58 +01:00
Mel O'Hagan e58cd0a106 Check substring if contains not array 2023-04-20 17:30:45 +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
mike12345567 3b03766f9e Adding plugin validation unit tests. 2023-04-18 16:36:03 +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 b6f14a3f55 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-17 14:58:40 +01:00
adrinr 8e95121ac8 Implement find version 2023-04-17 14:07:49 +01:00
mike12345567 453d5cc0e6 Further PR comments. 2023-04-17 14:03:54 +01:00
adrinr e5227febd8 Use version from environment 2023-04-17 14:02:50 +01:00
adrinr 33c3b67f8c Merge branch 'develop' into chore/remove_old_zlib_ref 2023-04-17 11:28:43 +01:00
adrinr ac4e45a433 Replace usages 2023-04-17 10:27:37 +01:00
Mateus Badan de Pieri de968b5332 changin syntax to permission function 2023-04-17 10:04:50 +01:00
Mateus Badan de Pieri 643ca614a4 changing test to it 2023-04-16 22:27:02 +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
Mateus Badan de Pieri 5180ac29d2 final functions being tested 2023-04-14 12:16:01 +01:00
Mateus Badan de Pieri 2f98ce9772 reverting some breaking changes 2023-04-14 11:45:27 +01:00
Mateus Badan de Pieri 038476523f doesHaveBasePermission tests 2023-04-14 11:39:52 +01:00
Mateus Badan de Pieri 696eea9f92 exporting function to test 2023-04-14 11:39:36 +01:00
Mateus Badan de Pieri fa83c5d7a1 added get allowed levels (not working yet) 2023-04-14 10:29:52 +01:00
Mateus Badan de Pieri 9bf580e761 Merge branch 'develop' into permissions-test 2023-04-14 10:27:35 +01:00
Mateus Badan de Pieri 62b5e08cde primary test cases, level to number working already 2023-04-14 10:25:38 +01:00
mike12345567 23e99ca4b7 Adding group and user tests for user sync. 2023-04-12 19:59:05 +01:00
mike12345567 a9fb09424b Merge branch 'develop' of github.com:Budibase/budibase into labday/automation-plugins 2023-04-12 14:27:50 +01:00
mike12345567 3eb718ea6d Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-12 13:42:46 +01:00
Mateus Badan de Pieri df38368eaf removing tests 2023-04-12 11:06:01 +01:00
mike12345567 ada052e043 Merging in develop - fixing some test cases which broke in the process. 2023-04-12 10:56:21 +01:00
Mateus Badan de Pieri f427763308 export function to make test easier 2023-04-12 02:29:30 +01:00
Mateus Badan de Pieri ef0293bc6c encryption tests 100% 2023-04-12 02:25:53 +01:00
mike12345567 1aafdbe9a7 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-11 17:28:14 +01:00
adrinr c77ed3d737 Renames 2023-04-11 13:39:13 +01:00
adrinr e1279ffecd Use proper errors instead of string throwing 2023-04-11 13:39:13 +01:00
mike12345567 c4a4bdc9da Fixing tenancy.spec.ts - mocking was a bit messed up, moving it all around to work as expected. 2023-04-11 10:54:04 +01:00
Mateus Badan de Pieri de613d2b28 latest version 2023-04-11 10:22:47 +01:00
Michael Drury 1c7c06e983 Bulk of the automation plugin system, supporting custom plugins. 2023-04-10 23:48:54 +01:00
Michael Drury 4badd04e33 Some automation fixes and adding option to disable logging for CLI. 2023-04-10 22:33:53 +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
mike12345567 0803b08217 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-05 17:59:18 +01:00
Mateus Badan de Pieri f1b7ff0f7c fixing expect on throw 2023-04-05 16:30:00 +01:00
Mateus Badan de Pieri b0df710a2a tweaks on some tests 2023-04-05 16:13:39 +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
Mateus Badan de Pieri 6bd950717c mocked correctly 2023-04-05 14:14:55 +01:00
Rory Powell 976b3a55ca Update logging to support dd trace attributes (#10086)
* Update logging middleware to integrate with pino for console logging

* Remove elastic apm references, use updated core middlewares

* Remove redundant LOG_LEVEL definitions

* Remove no longer needed jest logging overrides

* lint

* Backwards compat between console log helpers and pino

* Configurable DISABLE_HTTP_LOGGING

* Don't log 4xx as errors

* Remove redundant ENABLE_4XX_HTTP_LOGGING

* Cleanup migrations and event logging

* Improve bb-alert logging

* Add DISABLE_HTTP_LOGGING to helm chart

* Add ops endpoints for testing

* Disable http logging in dev

* Backwards compatible tracing implementation

* Naming update on http logging env var

* lint

* Update packages/backend-core/src/environment.ts

Co-authored-by: Adria Navarro <adria@revityapp.com>

* Merge

* Lint

* Fix console.warn failing mock by replacing with alerts mock instead

* Lint

---------

Co-authored-by: Adria Navarro <adria@revityapp.com>
2023-04-04 15:08:46 +01:00
mike12345567 e128642bce Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-04 13:37:59 +01:00