1
0
Fork 0
mirror of synced 2024-07-03 21:40:55 +12:00
Commit graph

20 commits

Author SHA1 Message Date
Michael Drury 1b3d92ae86 Merge pull request #10369 from Budibase/chore/pro_as_submodule
Chore - use pro as submodule
2023-04-24 13:26:30 +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
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
adrinr cfbb25449d Link pro only when it exists locally 2023-04-19 10:09:12 +01:00
adrinr 000e49a229 Bootstrap using submodule 2023-04-11 16:53:51 +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
mike12345567 6ec5e97ce9 Required work to support the new lucene audit logs search indexing. 2023-02-17 16:26:55 +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
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 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
mike12345567 d390bb9c20 Moving majority of automation logging functionality to pro. 2022-07-04 15:44:47 +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 c0d6fa34a4 Identity tenant and installation groups, property updates 2022-05-28 21:38:22 +01:00
Rory Powell b9a39e193e Fix developer count migration when only single developer 2022-04-25 15:38:37 +01:00
Rory Powell 0edc8800bd Pro build fixes 2022-04-22 09:43:51 +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