Commit Graph

6671 Commits

Author SHA1 Message Date
melohagan 395cf4a667 Add JSON payload support for Make and Zapier (#10529)
* Rename Integromat to Make. Update logo.

* Add JSON type for automations

* Support deprecated values in JSON

* Fix json query editor width bug

* Push body to schema if missing

* Support JSON body

* Add JSON payload support for Zapier

* Update packages/server/src/automations/steps/make.ts

Co-authored-by: Martin McKeaveney <martin@budibase.com>

* July -> November

* Add unit tests

---------

Co-authored-by: Martin McKeaveney <martin@budibase.com>
2023-05-11 17:49:33 +01:00
Adria Navarro 9b6cb5d09d Merge branch 'develop' into budi-6158/prevent_duplicated_group_names 2023-05-10 10:58:41 +02:00
Adria Navarro eae4f5c9b9 Merge pull request #10508 from Budibase/budi-6158/extract_components
BUDI-6158 - Extract components
2023-05-10 10:57:06 +02:00
Adria Navarro ad257366cf Merge branch 'develop' into budi-6158/paginage-group-users 2023-05-10 10:37:38 +02:00
Adria Navarro a80f00c954 Merge branch 'develop' into budi-6158/prevent_duplicated_group_names
# Conflicts:
#	packages/pro
2023-05-10 10:34:27 +02:00
Adria Navarro 3a9c90ac6b Show error pre-submit 2023-05-08 13:07:54 +02:00
Adria Navarro 51f5f4c018 Display error when populated from the backend 2023-05-08 11:53:14 +02:00
Adria Navarro f59a9da809 Display error when populated from the backend 2023-05-08 11:31:35 +02:00
Adria Navarro b1f1095c89 Split components 2023-05-05 20:21:06 +01:00
Adria Navarro e4b0c55aa6 Split group users component 2023-05-05 20:10:54 +01:00
Adria Navarro 5e8a2de089 Handle cursors on refresh 2023-05-05 16:33:02 +01:00
Adria Navarro e91f9ea5cd Refetch initial data instead of refreshing 2023-05-05 16:33:01 +01:00
Adria Navarro 89afec9bfc Refetch users on changes 2023-05-05 16:33:01 +01:00
Adria Navarro 2c49232fa8 Renames 2023-05-05 16:33:01 +01:00
Adria Navarro 8102c54bc3 Add searching for users back 2023-05-05 16:33:01 +01:00
Adria Navarro 10fcca92f6 Paginate users on group views 2023-05-05 16:33:01 +01:00
Adria Navarro bbd0690518 Type response 2023-05-05 16:32:27 +01:00
mike12345567 c880282be3 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-05-05 15:44:32 +01:00
melohagan 25b42f0a28 Rename Integromat to Make. Update logo. (#10492) 2023-05-05 12:41:24 +01:00
Martin McKeaveney 79a294e173 Merge pull request #10434 from Budibase/improve-automations-error-message
Improve Automations Error Message
2023-05-05 12:00:50 +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
Peter Clement 1fe7f2fe1b fix copy 2023-05-04 11:09:21 +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
Rory Powell 47933b9a92 Hide manage or renew button when customer uses invoicing + css updates (#10436)
* Hide manage or renew button when customer uses invoicing + css updates

* Remove usages of 'pro' and 'pro plan' from ui

* Enterprise plan -> Enterprise on enforce single sign on

* lint
2023-04-27 16:08:25 +01:00
Gerard Burns 8d6c00644a Improve Automations Error Message 2023-04-27 14:09:52 +01:00
Rory Powell 972e2257b7 [draft] Pricing/fixes (#10424)
* Fix qa core suite

* Update package.json

* Lint

* Handle conflict on account metadata

* Fix issue adding users via csv import when on paid plan

* Fix user invites

* Lint
2023-04-27 08:25:53 +01:00
Dean dbd73a1135 Merge remote-tracking branch 'origin/develop' into fix/client-versioning 2023-04-26 14:25:09 +01:00
Andrew Kingston 15bf1ace68 Standardise width of design section side panels to fix drawer width issues 2023-04-26 12:10:12 +01:00
Dean f3be917da1 Enrich the upgradable version property when fetching the app package 2023-04-25 12:16:02 +01:00
Michael Drury e37b377036 Merge pull request #10406 from Budibase/fix/budi-6920
Fix automation history first load in multi-tenant environments
2023-04-25 11:43:08 +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 123c47c4d1 Fix real root issue 2023-04-25 08:44:57 +01:00
Andrew Kingston 22d81fd858 Clear selected app ID from overview store when unmounting, and avoid sending up 'null' and 'undefined' string app ID headers 2023-04-25 08:35:25 +01:00
Michael Drury 14545729ac Fix for #10403 - when app overview loads, sometimes old store doesn't get a valid app ID. 2023-04-24 20:39:39 +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
Martin McKeaveney 779d5fe53c Merge pull request #9836 from Budibase/fix/lastName-validation-accept-invite
Fix to clear empty lastName string when accepting an invite to budibase
2023-04-24 09:35:16 +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
mike12345567 72d1394873 Further linting. 2023-04-21 12:07:28 +01:00
Andrew Kingston 943d17966e Remove import button for users table 2023-04-21 10:50:50 +01:00
mike12345567 2056623897 Fixing linting. 2023-04-20 17:51:43 +01:00