Commit Graph

46 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
Rory Powell 4c43ba2943 Bypass password onboarding for enforced sso (#9851) 2023-03-01 21:56:30 +00:00
Gerard Burns e64e3a9e45 New Onboarding URL Validation (#9507)
* New Onboarding URL Validation

* linting

* PR Feedback
2023-02-21 15:03:58 +00:00
Dean f73b4f8b01 Review updates 2022-11-15 17:03:35 +00:00
Dean 67437c3db1 Centralised licensing types to frontend-core contants. Some minor refactoring 2022-09-29 09:17:22 +01:00
Rory Powell 8cfd6a9faa Merge branch 'develop' into feature/day-pass-pricing 2022-09-15 08:55:33 +01:00
mike12345567 30817751ad Updating plugin backend, refactoring a bit, correctly allowing a set of headers to be used for a URL. 2022-09-12 19:12:05 +01:00
Rory Powell fe09208bb1 Usage page updates WIP 2022-08-30 09:53:16 +01:00
Andrew Kingston 364f25341e Remove concept of frontend preview types 2022-05-12 09:46:21 +01:00
Andrew Kingston eb4d8d5e52 Add full navigation settings panel in new design UI. Remove navigation theme settings from theme panel 2022-05-06 13:51:27 +01:00
Andrew Kingston afa5f5e6cd Move some role logic to frontend core and enable client library to preferentially route to home screens 2022-04-28 15:13:33 +01:00
Andrew Kingston 15956ec099 Improve screen list sorting order 2022-04-27 08:22:41 +01:00
Andrew Kingston 03be935e6c Refactor routes and start updating core design UI into new components 2022-04-22 16:03:47 +01:00
Andrew Kingston 50b818fec8 Add new design side nav and update routing 2022-04-21 15:11:07 +01:00
Martin McKeaveney 19d27c97a4 code review and merge with develop 2022-01-26 17:45:28 +01:00
Rory Powell bc67974996 Share validation between app modals, add yup based validation framework, add url to app modals 2022-01-20 16:01:09 +00:00
mike12345567 5936fe0f5f Adding all response capabilities. 2021-12-06 17:39:51 +00:00
mike12345567 740abf8445 Adding radio group of body types. 2021-12-02 17:53:14 +00:00
mike12345567 3e5f9b9505 Updating REST creation, removing the modal step, updating the config page to move things around as per designs. 2021-11-30 16:21:16 +00:00
Martin McKeaveney f9b2a3c5e1 Google sheets integration CRUD E2E 2021-11-25 18:12:12 +01:00
Rory Powell f94a0eadbe Merge branch 'develop' into oracle-datasource 2021-11-22 10:47:48 +00:00
Rory Powell 9273edc794 Integrate with UI 2021-11-08 22:08:47 +00:00
mike12345567 2f1c22085c Removing constants import that was breaking things. 2021-11-08 18:59:27 +00:00
mike12345567 b310918ec4 Fixing #3182 so that sorting is disabled for certain column types that we cannot use, as well as fixing some issues with MS-SQL plus tables. 2021-11-08 17:25:05 +00:00
Peter Clement 39192e4e7f add base wizard for datasources 2021-09-23 21:47:22 +01:00
Martin McKeaveney 2e4f32269b adding alphanumeric app name validation 2021-08-17 10:41:37 +01:00
Martin McKeaveney e3cced9d97 consolidate data sources and queries together in one UI 2021-06-15 19:48:05 +01:00
Andrew Kingston f63f9a7c51 Update app list screen to show unified app list with publish status 2021-05-21 10:32:16 +01:00
Andrew Kingston 441fbd37fb Prevent creating, deleting or editing global fields for user in the backend UI of the builder 2021-05-19 18:46:15 +01:00
mike12345567 cea82f9335 A general re-work of some parts of the auth lib, as well as moving roles/permissions around to make it possible to build an admin API which has role knowledge. 2021-05-14 15:43:41 +01:00
Martin McKeaveney 48006408f1 publish button 2021-05-13 17:33:31 +01:00
Martin McKeaveney 95c80f2b4a set up live replication between prod and dev instances 2021-05-13 17:24:32 +01:00
Martin McKeaveney c2c74678e4 lock concept in UI, make dev links go to builder and prod links go to real apps 2021-05-13 12:39:35 +01:00
mike12345567 38a99e10a3 Adding a few fixes for bugs related to user table, user table views and some async functions that weren't awaiting promises. 2021-02-23 16:29:50 +00:00
Martin McKeaveney 39473cb029 merge 2020-12-07 21:20:35 +00:00
Martin McKeaveney f05d696ef7 email as default user identifier 2020-12-04 12:22:45 +00:00
Martin McKeaveney 277524b86e accommodate login layout 2020-12-03 17:31:38 +00:00
Martin McKeaveney 9b25a61706 allow editing of screen layout from modal 2020-12-02 16:15:14 +00:00
mike12345567 1a9f1aed9b Merge branch 'feature/security-update' of github.com:Budibase/budibase into feature/page-refactor 2020-12-02 13:26:57 +00:00
mike12345567 05225f7787 Changing the naming of access levels to be roles. 2020-12-02 13:20:56 +00:00
Martin McKeaveney 33c40063af layouts and screens switcher, merge with component sdk 2020-12-01 16:22:06 +00:00
mike12345567 b55c4bc9c0 Merge branch 'master' of github.com:Budibase/budibase into feature/page-refactor 2020-11-30 11:47:08 +00:00
mike12345567 8a013c33c3 Major re-work, client library stills needs some work but it appears layouts and screens are no longer inter-dependent. 2020-11-25 17:56:09 +00:00
Martin McKeaveney a92d54f9a7 user table and relationships complete 2020-11-24 14:04:14 +00:00
Martin McKeaveney 1106026687 cut over to new frontend store 2020-11-04 17:09:45 +00:00
Martin McKeaveney 5b4bce8b8f component library modules and definitions refactor - moved to backend. More routing and middleware reorganisation 2020-05-02 15:29:10 +01:00