Commit Graph

4767 Commits

Author SHA1 Message Date
Dean c2f8d54a8a Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-15 10:59:28 +01:00
Dean e8f28113da Merge commit 2023-06-15 10:56:46 +01:00
Andrew Kingston 9e535a1ca4 Account for table 'type' field meaning different things in different endpoints 2023-06-15 09:35:22 +01:00
Andrew Kingston 99a8fc7c12 Revert websocket changes and just fetch datasources constantly 2023-06-15 09:27:45 +01:00
Jonny McCullagh 757ca6a166 Merge master develop (#10897)
* Binding drawer fixes

* Added missing headless flag for the bindable combobox

* Fix for QueryEditor width

* Fix svelte transitions in grid new row component breaking routify

* Bump version to 2.7.7

* fix REST connector failure to save

* Bump version to 2.7.8

* Bump version to 2.7.9

* Unexpected token when export data (#10721)

* Tidy ID string for JSON parse

* Display error for composite keys

* Unit test WIP

* directly assign the mock function on the datasource

* Unit tests for exportRows ID handling

---------

Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>

* Return all rows if oneOf value is falsey (#10638)

* Bump version to 2.7.10

* Make sure divider fields are left-most (#10627)

* Make sure divider fields are left most

* Refactor

* Bump version to 2.7.11

* Temporarily remove the focus store update as it triggers a full redraw of the component settings

* Linting

* Removed commented out code

* Bump version to 2.7.12

* Bump version to 2.7.13

* Do not show Business tag for Email action (#10867)

* Bump version to 2.7.14

* new deploy trigger (#10892)

* point the deploys at the new env

* Bump version to 2.7.15

---------

Co-authored-by: Dean <deanhannigan@gmail.com>
Co-authored-by: Andrew Kingston <andrew@kingston.dev>
Co-authored-by: Budibase Staging Release Bot <>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
Co-authored-by: Martin McKeaveney <martin@budibase.com>
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Adria Navarro <adria@budibase.com>
2023-06-14 16:18:09 +01:00
Adria Navarro 672804c150 Merge pull request #10900 from Budibase/budi-7010/export_controller_as_post
BUDI-7010 - Export controller as post
2023-06-14 14:38:01 +01:00
Adria Navarro 222de80e01 Fix creating app without password 2023-06-14 14:26:28 +01:00
Adria Navarro dec35fcafd Simplify notification 2023-06-14 13:48:37 +01:00
Adria Navarro fbf9b69a6b Simplify notification 2023-06-14 13:48:10 +01:00
Adria Navarro 0e8c54af75 Renames 2023-06-14 12:31:03 +01:00
Adria Navarro 450ac715a2 Merge branch 'budi-7010/frontend-encrypt-app-exports' into budi-7010/frontend-encrypt-app-imports 2023-06-14 11:34:09 +01:00
Adria Navarro 2fe83a96f1 Fix frontend 2023-06-14 11:30:05 +01:00
Adria Navarro d507eb487a Remove export 2023-06-14 11:21:47 +01:00
Adria Navarro 9a5f67b7d8 Merge branch 'budi-7010/frontend-encrypt-app-exports' into budi-7010/frontend-encrypt-app-imports 2023-06-14 11:21:19 +01:00
Adria Navarro 8e87e3cfc2 Merge branch 'budi-7010-encrypt-app-exports' into budi-7010/frontend-encrypt-app-exports 2023-06-14 11:20:31 +01:00
Adria Navarro a68dc7c965 Remove excludeRows and appName from the querystrings 2023-06-14 11:06:46 +01:00
Adria Navarro bfd444dbaa Change the download to be a post 2023-06-14 10:47:46 +01:00
Adria Navarro 3d01775b89 Handle errors 2023-06-13 17:08:33 +01:00
Adria Navarro 557e7ad209 Request password on import app 2023-06-13 16:48:59 +01:00
Andrew Kingston 0dbd709438 Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-13 15:15:41 +01:00
Andrew Kingston cfe86194cd Merge pull request #10844 from Budibase/cheeks-lab-day-preview
Preview apps inside builder
2023-06-13 15:15:29 +01:00
Adria Navarro 38cce94f2c Fix type 2023-06-13 14:28:31 +01:00
Adria Navarro 4b7af2e16a Pass password 2023-06-13 12:45:57 +01:00
Adria Navarro 7cfb47c287 Validation observe 2023-06-13 12:42:30 +01:00
Adria Navarro 32dde23728 Add validation 2023-06-13 11:57:56 +01:00
Adria Navarro 383c7c4b2c Add password field 2023-06-13 11:21:54 +01:00
Adria Navarro 1baaab2875 Add steps 2023-06-13 11:15:32 +01:00
Adria Navarro e6455d005b Add encrypt option 2023-06-13 10:00:01 +01:00
mike12345567 fb0e4c2c40 Removing await. 2023-06-12 16:06:08 +01:00
Andrew Kingston c2e5427860 Small refactor to move CSS variables inside fields rather fancy forms 2023-06-12 15:54:08 +01:00
Dean 0dda7afee7 Added the export page 2023-06-12 14:09:11 +01:00
melohagan ab1a3eba81 Do not show Business tag for Email action (#10867) 2023-06-12 11:49:46 +01:00
Dean 7564bcac4b Merge remote-tracking branch 'origin/master' into fix/bindings-fixes 2023-06-12 10:44:38 +01:00
Dean b48083860d Removed commented out code 2023-06-09 18:09:21 +01:00
Dean 2b21b7f4c9 Linting 2023-06-09 17:57:03 +01:00
Dean c73315cc44 Temporarily remove the focus store update as it triggers a full redraw of the component settings 2023-06-09 17:42:41 +01:00
Michael Drury 06eb965564 Updates from PR comments. 2023-06-09 14:35:46 +01:00
Michael Drury deffe9d3d4 Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend 2023-06-09 13:21:30 +01:00
Adria Navarro a875c09979 Display error 2023-06-09 12:23:48 +01:00
Adria Navarro 86fa262649 Fix flash 2023-06-09 12:00:16 +01:00
Dean 9da2a1e8ea Merge remote-tracking branch 'origin/master' into fix/bindings-fixes 2023-06-09 11:57:57 +01:00
Adria Navarro 0bd35be861 Navigate when the modal is closed and the datasource was created 2023-06-09 11:57:17 +01:00
Andrew Kingston 1377ee090a Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-09 11:54:27 +01:00
Andrew Kingston e452c0bcd1 Update command palette preview action to open new preview 2023-06-09 11:40:34 +01:00
Dean d80f53e37a Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-08 21:26:03 +01:00
Andrew Kingston b3e23562f0 Update in builder preview to be a full screen overlay rather than opening in a new tab 2023-06-08 15:12:50 +01:00
melohagan c0578d4cc2 Send meeting invite via automation email smtp (#10787)
* Pass calendar props into sendSmtpEmail

* Add calendar event to message

* Add Checkbox and DatePicker automation field UI

* Add URL prop

* Add url to sendSmtpEmail unit test

* Refactor

* Code review comments

* Make location optional

* Add EmailInvite type

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-06-08 14:25:35 +01:00
Martin McKeaveney a9787ff608 fix REST connector failure to save 2023-06-08 12:00:34 +01:00
Adria Navarro 9021a095b1 Create datasource on the second step 2023-06-08 10:56:21 +01:00
mike12345567 9ee06e8e42 Updating fetch within main datasource UI to mimic that of the onboarding. 2023-06-07 18:34:32 +01:00
Michael Drury 834dff93f7 Merge pull request #10818 from Budibase/budi-6945/no_sheet_selected
Change submit text if sheets not selected
2023-06-07 15:43:14 +01:00
Adria Navarro ae7dbd4088 Rename text 2023-06-07 14:49:44 +01:00
Adria Navarro 23350016e2 Change submit if sheets not selected 2023-06-07 14:34:31 +01:00
Adria Navarro dd58aaf5cb Use fancycheckboxgroup 2023-06-07 11:44:32 +01:00
Adria Navarro b128bdece5 Display sheets 2023-06-07 11:31:10 +01:00
Adria Navarro 39848eef07 Fetch sheets 2023-06-07 11:31:10 +01:00
Adria Navarro 77bd236557 Fetch info when enabled 2023-06-07 11:31:10 +01:00
Adria Navarro e9d4dd51bb Add sheets step 2023-06-07 11:31:10 +01:00
Adria Navarro faf886f446 Change success message 2023-06-07 11:31:10 +01:00
Andrew Kingston 61a143628b Revert tableType flag and derive from table instead 2023-06-07 10:48:08 +01:00
Dean ee1d761103 Fix for QueryEditor width 2023-06-07 09:44:55 +01:00
Dean fd558a46bb Merge remote-tracking branch 'origin/master' into fix/bindings-fixes 2023-06-07 09:35:30 +01:00
Dean 1e3883b213 Added missing headless flag for the bindable combobox 2023-06-07 09:35:07 +01:00
gitstart 0ae378dbec Update other places where download is used
Co-authored-by: v1b3m <vibenjamin6@gmail.com>
2023-06-07 06:43:30 +00:00
Adria Navarro deeba8bae3 Revert "Merge branch 'develop' into master"
This reverts commit 6f29c978e0, reversing
changes made to 1c6ff73c19.
2023-06-06 22:06:34 +01:00
mike12345567 ae1f7ae21a Changing copy around datasource creation modals. 2023-06-06 18:50:50 +01:00
mike12345567 dab1db2271 Updating datasource save API to allow specifying a filter for which tables to fetch and then linking this up with the new frontend. 2023-06-06 18:27:03 +01:00
Dean b2633dc2db Binding drawer fixes 2023-06-06 17:46:40 +01:00
mike12345567 cc60baa3d1 Some fixes for BBUI and updating postgres table name fetching to get uniques. 2023-06-06 17:40:14 +01:00
mike12345567 1760fcb34d Merge branch 'feature/table-fetching-frontend' of github.com:Budibase/budibase into feature/table-fetching-frontend 2023-06-06 16:40:09 +01:00
mike12345567 0602f5f26f Updating fancy form components and building out first version of fancy checkbox group. 2023-06-06 16:32:20 +01:00
gitstart 05851f6b19 Fix CSV encoding issue
Co-authored-by: Benjamin Mayanja <vibenjamin6@gmail.com>
2023-06-06 15:18:15 +00:00
Dean f37c49e8af Initial commit 2023-06-06 16:16:09 +01:00
Adria Navarro 4c200fbca4 Merge branch 'develop' into feature/table-fetching-frontend 2023-06-06 15:08:23 +01:00
Adria Navarro 21e870109c Save datasource 2023-06-06 11:29:50 +01:00
Adria Navarro 25c921e340 Validate url 2023-06-06 11:29:49 +01:00
Adria Navarro 1e238ce693 Validate google sheets url 2023-06-06 11:29:49 +01:00
Adria Navarro d4ba73f331 Open continue 2023-06-06 11:29:49 +01:00
Adria Navarro 3a6a3eb8a5 Store tokens in cache and amend redirect 2023-06-06 11:29:49 +01:00
Adria Navarro c89708cda3 Google wizard on the same page 2023-06-06 11:29:49 +01:00
Adria Navarro 498eedaf19 Remove confirm button while setting up google datasource 2023-06-06 11:29:49 +01:00
mike12345567 b57557760d Updating fancy forms to be usable for data table fetching designs. 2023-06-05 18:36:50 +01:00
mike12345567 96f44c0a86 Reworking implementation to a single modal, that changes content rather than progressing to a new modal. 2023-06-05 17:40:12 +01:00
mike12345567 a330e606bf Removing merge artifact. 2023-06-05 15:17:06 +01:00
mike12345567 805e417553 Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend 2023-06-05 14:21:35 +01:00
Andrew Kingston ffde512307 Update position of floating buttons to be consistent 2023-06-05 08:49:35 +01:00
Andrew Kingston 680b70643c Merge pull request #10775 from Budibase/collaboration-fixes
Collaboration fixes
2023-06-02 18:03:11 +01:00
Andrew Kingston 0582dd40b2 Ensue table schema change made via grids are properly synced with backend stores, given absence of websocket events for own events 2023-06-02 15:28:48 +01:00
Andrew Kingston 2db3012ae0 Fix JSON editor overflow row edit modal 2023-06-02 15:13:57 +01:00
Dean 247896bdf3 Linting 2023-06-02 12:55:16 +01:00
Dean 9f2df319a2 Updated the JS Scripting modal use the new editor 2023-06-02 12:50:22 +01:00
Dean 450be6ec28 Changed the binding font to monospace per feedback 2023-06-02 12:03:25 +01:00
Dean a8836a1531 Removed the monospace font from the Text editor and replaced it with the core font. 2023-06-02 11:46:01 +01:00
Dean 44dd09dfef UI colours updated 2023-06-02 10:56:36 +01:00
Dean a38d9a5fda Fixes to improve binding panel resizing 2023-06-01 16:29:42 +01:00
Dean b4712c1075 Merge commit 2023-06-01 14:41:54 +01:00
Dean d08dd2d491 Minor fixes for bindings v2 2023-06-01 11:47:27 +01:00
deanhannigan 8c144bbe2c Merge pull request #10732 from Budibase/feature/binding-v2-updates
Binding V2 Updates
2023-05-31 19:15:20 +01:00
Andrew Kingston 564a98bedc Increase tooltip max size and fix issue with overflow in app overview 2023-05-31 18:23:20 +01:00
Dean 24d57e8fd2 Merge remote-tracking branch 'origin/develop' into feature/db-query-save-prompt 2023-05-31 11:56:55 +01:00
Dean 4c26beb16e Linting 2023-05-31 11:34:02 +01:00
Dean 985c7eb56e PR Feedback updates 2023-05-31 11:26:03 +01:00
Dean cd95df629e Merge remote-tracking branch 'origin/develop' into feature/binding-v2-updates 2023-05-31 11:07:47 +01:00
Martin McKeaveney 0c5681d3a1 Merge pull request #10635 from GitStartHQ/BUDIOSS-20
Automation panel does not scroll
2023-05-30 22:03:51 +01:00
Dean 6c184bd6d9 PR Feedback filtering by label and section name. Disable default filter highlighting 2023-05-30 15:02:13 +01:00
Dean 1a8470e949 PR updates and fix for mode switch issue 2023-05-30 14:02:18 +01:00
Gerard Burns 23ee9f4af8 Post Sign Up Onboarding Changes (#10701)
* wip

* PR Feedback

* Fixes

* PR Feedback

* PR Feedback

* PR Feedback
2023-05-30 12:54:57 +01:00
Andrew Kingston 1db22d3965 Remove unused code 2023-05-30 11:17:46 +01:00
Dean c71ad13048 Lint fixes 2023-05-30 10:15:10 +01:00
Dean 74958e59d2 Linting 2023-05-30 10:00:56 +01:00
Dean ad7cd39387 Removed console log 2023-05-30 09:46:17 +01:00
Andrew Kingston be40d72f55 Merge pull request #10712 from Budibase/data-section-multidev
Multiple user collaboration for data section
2023-05-30 09:08:14 +01:00
Dean 15e167ea9e Minor fix for ranking 2023-05-29 22:03:29 +01:00
Dean e8c6185add Refactoring and some styling updates 2023-05-29 21:19:44 +01:00
Dean 0730c15b14 Merge remote-tracking branch 'origin/develop' into feature/binding-v2-updates 2023-05-28 22:29:47 +01:00
mike12345567 7ba21d836b Merge branch 'develop' of github.com:Budibase/budibase into feature/sync-automations 2023-05-26 16:42:01 +01:00
Peter Clement 221d03c153 fix reactivity bug with synchronous param 2023-05-26 13:18:08 +01:00
Peter Clement 5a73b02827 update feature array to be an object 2023-05-26 11:02:47 +01:00
Andrew Kingston 852df16448 Lint 2023-05-26 10:29:03 +01:00
Dean 56bac67d49 Merge commit 2023-05-26 10:11:51 +01:00
Adria Navarro 77a619945b Merge pull request #10680 from Budibase/budi-6933-verify-data-source-connection-during
Verify data source connection before saves
2023-05-26 10:47:42 +02:00
Andrew Kingston 520158c8f9 Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-26 09:39:06 +01:00
Peter Clement 70dfd9e8e5 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-26 09:26:51 +01:00
Andrew Kingston cc7df474c9 Standardise usage of user avatars and colours across the entire platform 2023-05-26 09:24:53 +01:00
Michael Drury bb4209cd67 Basic modal put together. 2023-05-26 09:21:34 +01:00
deanhannigan 567ee451dd Merge pull request #10702 from Budibase/fix/data-export-rows
Fixes and updates for export internal rows
2023-05-26 09:08:35 +01:00
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
Dean 146940f6ae Added error handling for export row front end and fixed row export backend behaviour 2023-05-25 17:50:52 +01:00
Andrew Kingston f246a982db Update lock icon and remove logs 2023-05-25 10:45:00 +01:00
Andrew Kingston 183fb3d29b Fix issue with schema mutation in grids. Use displayName to represent grid column labels. Allow deletion of duplicated user columns 2023-05-25 08:51:24 +01:00
Peter Clement d675b25676 unused import 2023-05-24 15:16:04 +01:00
Andrew Kingston 5cf4753853 Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-24 15:14:32 +01:00
Peter Clement 4d5a922684 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-24 15:05:58 +01:00
Peter Clement f91b599b72 fix import 2023-05-24 14:56:37 +01:00
Peter Clement a9bb534cdf set flag in automation orchestrator 2023-05-24 14:41:58 +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
Andrew Kingston cfa07a68ae Handle table, query and datasource events using builder socket 2023-05-22 15:59:44 +01:00
Peter Clement 754b30dd5c add features property to automation defintions 2023-05-22 15:46:42 +01:00
Adria Navarro cff9c26ef2 Lint 2023-05-19 17:46:34 +02:00
Peter Clement d271bbdadb rename syncWebHooks to syncAutomations 2023-05-19 10:07:02 +01:00
gitstart 036e355c9b disable duplicate for webhook triggers automation
Co-authored-by: Moshood Abidemi <olalekanteeblaze@gmail.com>
2023-05-18 14:05:05 +00:00
gitstart b2f3455b19 update fix: automation panel does not scroll
Co-authored-by: jaysoni-ash42 <jsoni775566666@gmail.com>
2023-05-18 11:48:57 +00:00
Peter Clement f680fbd822 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-18 11:35:25 +01:00
Andrew Kingston 3794d8e204 Simplify websocket comms for grid and improve builder socket 2023-05-18 08:57:20 +01:00
Andrew Kingston 0bebacc741 Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-17 16:38:01 +01: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
Peter Clement 67272c28af Improve logic in add action modal for collect step 2023-05-16 16:06:37 +01:00
Andrew Kingston 1e48020001 Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-16 15:23:30 +01:00
mike12345567 14806809e8 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-05-16 14:54:44 +01:00
Peter Clement 16ace6bf27 add plan tag to collect step 2023-05-15 16:40:52 +01:00
Peter Clement 007f5ca8a9 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-15 15:19:44 +01:00
Peter Clement 27e78206c4 remove logs and copy changes 2023-05-15 14:49:05 +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 3e19afd390 Merge fix 2023-05-15 12:10:19 +01:00
Dean 5b2f37e175 Merge remote-tracking branch 'origin/develop' into feature/db-query-save-prompt 2023-05-15 12:09:25 +01:00
Dean 6fa59da628 Merge remote-tracking branch 'origin/develop' into feature/portal-pending-users-section 2023-05-15 11:02:25 +01:00
Dean 086fb05238 Lint 2023-05-15 10:17:55 +01:00
Dean 00d2bc4f6d Altered initialisation flow to ensure base state is correct for checking update status 2023-05-15 09:38:59 +01:00
Dean ea458639b3 Navigation updates 2023-05-15 09:14:18 +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
Dean a1f35be908 Merge remote-tracking branch 'origin/develop' into feature/db-query-save-prompt 2023-05-12 16:30:02 +01:00
Peter Clement c86c2b4096 add synchronous webhook functionality 2023-05-12 15:57:34 +01:00
Peter Clement dcfb65b92d sync / async automations go through one endpoint 2023-05-12 15:56:24 +01:00
Andrew Kingston 5f81584a14 Update top bar when not the primary builder and prevent flashing during loading states 2023-05-12 14:16:10 +01:00
Andrew Kingston 7f96fbf741 Remove single user restriction and notify users if they are the primary builder or not 2023-05-12 13:55:08 +01: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
Peter Clement 1626571081 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-11 11:53:12 +01:00
jvcalderon 58878ac57c Adds account locking if user limit is exceeded 2023-05-11 08:20:52 +02:00
Dean c1802452ff Merge remote-tracking branch 'origin/develop' into feature/db-query-save-prompt 2023-05-10 16:04:17 +01:00
Peter Clement 1539bf234b add ability to trigger synchronous automation from button action 2023-05-09 12:10:20 +01: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
Dean e3dadaa22c Merge commit 2023-05-05 09:10:52 +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 12ce3291eb Merge remote-tracking branch 'origin/develop' into feature/db-query-save-prompt 2023-05-04 16:13:48 +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
Dean 6331299b7b Working commit 2023-05-03 17:26:58 +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
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