Commit Graph

4380 Commits

Author SHA1 Message Date
Dean 03c048f978 Merge remote-tracking branch 'origin/master' into fix/inclusion-row-parsing 2023-05-05 15:22:49 +01:00
melohagan 25b42f0a28 Rename Integromat to Make. Update logo. (#10492) 2023-05-05 12:41:24 +01:00
Andrew Kingston 687d3a9267 Merge pull request #10491 from Budibase/more-grid-tweaks
Grid improvements and fixes
2023-05-05 11:38:24 +01:00
Andrew Kingston 86ce8eb831 Fix table ID being passed in to access modal 2023-05-05 10:45:34 +01:00
Andrew Kingston e01e91e075 Fix row selection being cleared when exporting rows, and ignore download-js click events in click-outside handler 2023-05-05 09:13:06 +01:00
Andrew Kingston 9b4fa75954 Merge branch 'develop' of github.com:Budibase/budibase into more-grid-tweaks 2023-05-05 08:29:03 +01:00
Dean 98963c1505 Fix for inclusion parsing for arrays and options. View table fix to hide edit button 2023-05-04 11:21:24 +01:00
Peter Clement 75d8dd907f fix for limit banner re-appearing 2023-05-04 11:00:04 +01:00
Rory Powell e1a147e823 Merge branch 'master' into develop 2023-05-03 16:06:42 +01:00
Rory Powell bad6eb30f4 Update usage bar to warn when greater than 100% 2023-04-30 22:57:08 +01:00
Andrew Kingston b07e5095e9 Increase support for lower resolutions in the grid UI by using tooltips instead of text for some buttons at low horizontal breakpoints 2023-04-28 11:13:40 +01:00
Dean f3be917da1 Enrich the upgradable version property when fetching the app package 2023-04-25 12:16:02 +01:00
Andrew Kingston 0204f13c1a Merge pull request #10409 from Budibase/more-grid-tweaks
More grid tweaks
2023-04-25 09:58:56 +01:00
Gerard Burns 0c38124f6a Form Block Improvements (#10404)
* Form Block Improvements

* PR Fixes

* PR feedback
2023-04-25 09:57:21 +01:00
Andrew Kingston 128411a61b Fix legacy delete button in edit row modal not doing anything 2023-04-25 08:58:41 +01:00
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
Michael Drury 145c0834bb Fix for #10358 - making sure that client-side we don't check the content type for CSV, check if it might be JSON, if not assume we can try it as a CSV - this is a fix for an issue which occurs on Windows, in Firefox. (#10359) 2023-04-20 15:21:50 +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