Commit Graph

4364 Commits

Author SHA1 Message Date
Andrew Kingston 98ca05d97f Merge pull request #10396 from Budibase/grid-tweaks
Grid tweaks
2023-04-24 16:53:46 +01:00
Andrew Kingston 5155727b56 Update grid button text and refactor gutter cell into own component 2023-04-24 11:22:03 +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
melohagan 476bf65957 Set default enum values (#10377) 2023-04-21 14:37:15 +01:00
Andrew Kingston 943d17966e Remove import button for users table 2023-04-21 10:50:50 +01:00
Andrew Kingston 7afd716e91 Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-20 15:24:25 +01:00
Andrew Kingston 6bf6d15849 Rename sheet to grid 2023-04-20 08:17:07 +01:00
Andrew Kingston 9025e18f15 Misc fixes (#10345)
* Fix some issues with component and screen settings layout

* Fix issue with component setting labels when multi-line

* Remove early termination of form validation when encountering an errored field

* Update free logo badge to be a sticky footer

* Close side panels when clicking on links
2023-04-19 14:21:11 +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
mike12345567 22dbb8d379 Updating automation action add modal to split out plugins into their own section. 2023-04-18 16:12:08 +01:00
Gerard Burns d36cd3b1f8 Builder Unit Test PoC (#10173)
* wip

* wip
2023-04-18 14:37:29 +01:00
Andrew Kingston 06e1f2954a Add schemaOverrides prop to sheet and use it to customise user table schema 2023-04-18 13:41:17 +01:00
Andrew Kingston a06f584e7d Use unique user edit modal for editing users in sheets 2023-04-18 13:12:20 +01:00
Andrew Kingston 91ee5be7c5 Disable row import button for users table and add optional chaining to spreadsheetsocket invocations to fix tests 2023-04-18 11:31:19 +01:00
Andrew Kingston 876522bf1e Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-18 10:48:53 +01:00
Gerard Burns 7e5b99aa84 Fix Help Menu (#10257)
* Fix Help Menu

* PR Feedback

* linting
2023-04-18 10:37:11 +01:00
Andrew Kingston 8aff208acd Improve sheet loading state 2023-04-18 09:08:38 +01:00
Andrew Kingston ffd3e5d008 Fix table selection not working when on datasource page 2023-04-18 08:55:54 +01:00
Andrew Kingston 140729b1d7 Remove unused code and change selected table faster in data section 2023-04-18 08:51:00 +01:00
Andrew Kingston 208e481bbc Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-17 17:00:56 +01:00
Andrew Kingston c614c0739f Lint 2023-04-17 16:22:59 +01:00
mike12345567 b36702ca72 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-04-14 17:32:04 +01:00
Andrew Kingston f7f1ee49a6 Improve sheet loading states 2023-04-13 14:30:01 +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
melohagan 6ca999722c Add file/upload size validation option (#10262)
* Add file/upload size validation option

* Max upload size handler

* Update max total upload label
2023-04-12 11:51:18 +01:00
Andrew Kingston 7bbb8e5648 Fix importing and exporting with sheets 2023-04-12 10:03:58 +01:00
Andrew Kingston 38f326dce4 Fix filters not working 2023-04-11 23:25:19 +01:00
Andrew Kingston 6290112d06 Improve data fetch reset logic, fix issues with stale cache in spreadsheets 2023-04-11 22:21:07 +01:00
Andrew Kingston 0ee63417c1 Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-04-11 17:36:28 +01:00
Michael Drury 1c7c06e983 Bulk of the automation plugin system, supporting custom plugins. 2023-04-10 23:48:54 +01:00
Michael Drury bfec84e1df Removing console logging. 2023-04-05 20:32:41 +01:00
mike12345567 022b3acbcc Linting. 2023-04-05 17:54:05 +01:00
mike12345567 373952a59b Fixing #10155 - some options errors were being swallowed and in general it was never considered to be an error state due to the 'handled' flag being consistently sent, changed the logic a bit here. 2023-04-05 17:43:35 +01:00
Michael Drury 9e68e9cf2f Merge pull request #10181 from Budibase/fix/same-tab-googlesheets-onboarding
Minor googlesheets onboarding improvement
2023-04-03 12:22:09 +01: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
mike12345567 8673ed1dae Minor improvement - opening the google authorization in the same tab as onboarding rather than creating a dead tab. 2023-03-31 14:03:34 +01:00
Andrew Kingston 7050c6713a Remove log and add notification when creating or editing columns 2023-03-31 13:21:53 +01:00
Michael Drury 1c6465edcb Merge pull request #10172 from Budibase/fix/budi-6797
Googlesheets onboarding - fix in cloud, disable self host
2023-03-31 13:19:29 +01:00
mike12345567 e9f69dcfea Adding default state. 2023-03-31 12:51:45 +01:00
Peter Clement 0a567a3302 add new status to handle no iterations during loop 2023-03-31 12:23:10 +01:00
Andrew Kingston b2d2cf3989 Merge branch 'develop' of github.com:Budibase/budibase into spreadsheet-integration 2023-03-31 12:08:58 +01:00
adrinr 6f69798f27 Undo wrongly commited code 2023-03-31 11:27:44 +01:00
adrinr faa1c27d29 Refresh sql columns on defining relationships 2023-03-31 10:53:50 +01:00
mike12345567 42320b1d95 Merge branch 'develop' of github.com:Budibase/budibase into fix/budi-6797 2023-03-30 17:29:58 +01:00
Andrew Kingston 7570c52879 Allow expanding rows using existing edit row modal 2023-03-30 16:12:28 +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
Andrew Kingston d3c17308ab Fix one-to-many relationships allowing selecting multiple rows on both sides 2023-03-30 08:53:09 +01:00
mike12345567 32c78ec9bf This makes it so that Googlesheets works correctly as part of onboarding in the Cloud, in self host the googlesheets onboarding option has been hidden as it is too complex to get the user to setup the correct integrations with their google account while doing the first time onboarding to an app. 2023-03-29 19:58:24 +01:00