1
0
Fork 0
mirror of synced 2024-09-21 20:01:32 +12:00
Commit graph

4404 commits

Author SHA1 Message Date
Michael Drury
c08d67d299 Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend 2023-05-26 08:44:39 +01:00
melohagan
b5c98871ad Update table data via CSV import (#10313)
* Add identifierFields select for import

* Update rows on import (Internal DB)

* Only allow internal DB to upsert import CSV

* Clear identifierFields when turning off update

* Passing table instead of tableId

* Pass table

* Pass tableType
2023-05-25 18:05:07 +01:00
Adria Navarro
237cda064c Simplify integration features 2023-05-24 10:50:51 +02:00
Adria Navarro
0c97f61cc8 Validate feature toggle 2023-05-24 10:03:49 +02:00
Adria Navarro
7be824b2e6 Remove secondary action 2023-05-24 10:03:49 +02:00
Adria Navarro
2b2b252900 Update messages 2023-05-24 10:03:49 +02:00
Adria Navarro
6659a697de Improve messaging 2023-05-24 10:03:49 +02:00
Adria Navarro
d6b00efa90 Verify datasouce before updating 2023-05-24 10:03:49 +02:00
Adria Navarro
886b726627 Verify datasouce before saving 2023-05-24 10:03:49 +02:00
Adria Navarro
cff9c26ef2 Lint 2023-05-19 17:46:34 +02:00
José Vte. Calderón
4928778b0b Merge pull request #10542 from Budibase/user-limit-ui
Adds account locking if user limit is exceeded
2023-05-17 09:20:55 +02:00
mike12345567
14806809e8 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-05-16 14:54:44 +01:00
Andrew Kingston
e28ec0a5a8 Merge pull request #10556 from Budibase/cheeks-fixes
Sort tables in data section + show full screen URLs on hover
2023-05-15 13:54:55 +01:00
Dean
6fa59da628 Merge remote-tracking branch 'origin/develop' into feature/portal-pending-users-section 2023-05-15 11:02:25 +01:00
jvcalderon
b4d531f886 Change a literal 2023-05-15 09:47:57 +02:00
jvcalderon
fc846e1580 Merge branch 'develop' into user-limit-ui 2023-05-15 08:38:45 +02:00
Andrew Kingston
a00d502acb Add title attribute to reveal full screen URLs when hovering in screen list panel 2023-05-12 08:04:34 +01:00
Andrew Kingston
f5a4ad58ab Fix alphabetical sorting for tables 2023-05-12 08:02:21 +01:00
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
jvcalderon
58878ac57c Adds account locking if user limit is exceeded 2023-05-11 08:20:52 +02:00
mike12345567
c880282be3 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-05-05 15:44:32 +01:00
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
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
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
Dean
19ed0ec3f5 Feedback updates and a fix for z-index issue in user side panel 2023-05-03 11:22:38 +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
Gerard Burns
8d6c00644a Improve Automations Error Message 2023-04-27 14:09:52 +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