Conor Webb
9a375d6716
Add the option to change the confirm and cancel button texts within the confirmation modals ( #13966 )
...
* Add button parameters to actions
* Add button states to confirmation store
* Set text of buttons if values are exist
* Pass stored values through to the modal
* Add missing duplicate text map
* Fix lint issues
---------
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
2024-06-21 10:57:46 +00:00
Michael Drury
f42d302f48
Merge pull request #13993 from Budibase/fix/disallow-prohibited-columns
...
Disallow prohibited columns
2024-06-21 11:43:41 +01:00
mike12345567
b4910043c6
Addressing PR comments.
2024-06-21 11:27:47 +01:00
mike12345567
fead1f436a
test case is only for internal.
2024-06-20 18:53:01 +01:00
mike12345567
ae68c561f4
Test case.
2024-06-20 18:51:04 +01:00
mike12345567
def3b0260e
Disallowing prohibited columns consistently, no matter the case, and backend validation for this as well.
2024-06-20 18:48:22 +01:00
Martin McKeaveney
96be6e85e3
update account portal sha
2024-06-20 18:05:48 +01:00
Martin McKeaveney
4e2960468d
Merge branch 'master' of github.com:Budibase/budibase
2024-06-20 17:57:29 +01:00
Martin McKeaveney
524cf6100b
bumping account portal prod tag
2024-06-20 17:57:15 +01:00
Michael Drury
443289c66e
Merge pull request #13969 from Budibase/feature/count-rows-to-return
...
Counting total rows in query (Datasource+)
2024-06-20 17:53:04 +01:00
Michael Drury
20f90b2a08
Merge branch 'master' into feature/count-rows-to-return
2024-06-20 17:44:21 +01:00
mike12345567
86bae92ada
Refactoring search test to make it easier to find promises which aren't handled.
2024-06-20 17:13:42 +01:00
Martin McKeaveney
4ac74b1e9a
bump account portal
2024-06-20 17:08:03 +01:00
mike12345567
df56371ab6
Reverting change to promises.
2024-06-20 16:36:18 +01:00
mike12345567
295961edb1
Attempting without promise.all in external.
2024-06-20 16:18:32 +01:00
mike12345567
66ef0cb79a
Adding back SQS - wasn't causing a problem.
2024-06-20 16:05:03 +01:00
mike12345567
b6b05e08b1
Removing SQS from view test to check.
2024-06-20 15:52:56 +01:00
Michael Drury
398a4da2ae
Merge branch 'master' into feature/count-rows-to-return
2024-06-20 15:27:21 +01:00
Martin McKeaveney
180dc1c355
Merge pull request #13988 from Budibase/accpdeployment
...
updating account portal SHA
2024-06-20 15:19:11 +01:00
Martin McKeaveney
84ff4e97ed
Merge branch 'master' into accpdeployment
2024-06-20 14:59:13 +01:00
Martin McKeaveney
093b06ed7d
updating account portal SHA
2024-06-20 14:51:25 +01:00
mike12345567
3345364675
Updating test case - not exactly sure what it was testing before, but now it definitely confirms paginated results are stable.
2024-06-20 14:36:08 +01:00
Michael Drury
763c04048c
Merge branch 'master' into feature/count-rows-to-return
2024-06-20 11:26:00 +01:00
mike12345567
580e36f301
Updating test case.
2024-06-20 10:46:52 +01:00
Michael Drury
8e8bf753d9
Merge pull request #13980 from Budibase/dependabot/npm_and_yarn/packages/server/socket.io-4.6.2
...
Bump socket.io from 4.6.1 to 4.6.2 in /packages/server
2024-06-20 10:22:26 +01:00
Michael Drury
8dcc3e977b
Merge branch 'master' into dependabot/npm_and_yarn/packages/server/socket.io-4.6.2
2024-06-20 10:13:22 +01:00
Budibase Staging Release Bot
0f4d43a32b
Bump version to 2.29.0
2024-06-20 09:06:56 +00:00
mike12345567
86d9de5a2d
Fixing view test cases, adding SQS to it and correcting the default sort order.
2024-06-19 18:57:37 +01:00
dependabot[bot]
7ef46092d0
Bump socket.io from 4.6.1 to 4.6.2 in /packages/server
...
Bumps [socket.io](https://github.com/socketio/socket.io ) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/socketio/socket.io/releases )
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md )
- [Commits](https://github.com/socketio/socket.io/compare/4.6.1...4.6.2 )
---
updated-dependencies:
- dependency-name: socket.io
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-06-19 17:52:38 +00:00
mike12345567
67c00c9e4c
Addressing PR comments.
2024-06-19 18:46:48 +01:00
Sam Rose
4c8abee122
Merge branch 'master' of github.com:budibase/budibase into budi-8220-support-updating-existing-rows-for-external-databases-using-2
2024-06-19 17:53:00 +01:00
Sam Rose
602faf1c67
Add test for composite primary keys for external datasource imports.
2024-06-19 17:52:48 +01:00
mike12345567
58ec7a50b0
Implementing row counting for in-memory, also updating the in memory search function.
2024-06-19 17:51:11 +01:00
mike12345567
d121633d8e
Updating queries to be a bit more flexible to updates in the SQL layers.
2024-06-19 17:29:33 +01:00
mike12345567
2aa911b217
re-jigging things to get counting working properly again.
2024-06-19 17:10:15 +01:00
mike12345567
a97b24658f
Fixing test case, it didn't provide a primary field.
2024-06-19 15:08:22 +01:00
mike12345567
2d74927177
updating how counting disables sorting.
2024-06-19 15:08:12 +01:00
mike12345567
1056efdbf6
Changing how counting occurs in SQL layer.
2024-06-19 14:56:06 +01:00
mike12345567
aab100b130
Changing how counting is processed.
2024-06-19 14:28:22 +01:00
Michael Drury
223df424fc
Merge branch 'master' into feature/count-rows-to-return
2024-06-19 14:20:31 +01:00
mike12345567
bdbb4c0a66
Commenting on a bug in knex
2024-06-19 13:59:03 +01:00
mike12345567
bc80841554
Promise.all for both counts (SQS and SQL).
2024-06-19 13:39:00 +01:00
mike12345567
0e5de7f16d
Test updates.
2024-06-19 13:36:34 +01:00
mike12345567
abfab054d7
Addressing comment about datasource being optional.
2024-06-19 12:03:20 +01:00
mike12345567
c973562398
Merge branch 'feature/count-rows-to-return' of github.com:Budibase/budibase into feature/count-rows-to-return
2024-06-19 11:53:11 +01:00
mike12345567
0de94d3535
Addressing some PR comments.
2024-06-19 11:52:50 +01:00
Sam Rose
f9d46de7e1
Merge pull request #13968 from Budibase/budi-8220-support-updating-existing-rows-for-external-databases-using
...
Support external datasources in the bulkImport endpoint.
2024-06-19 10:59:32 +01:00
Sam Rose
e7ff0f683b
Merge branch 'budi-8220-support-updating-existing-rows-for-external-databases-using' of github.com:budibase/budibase into budi-8220-support-updating-existing-rows-for-external-databases-using
2024-06-19 10:49:48 +01:00
Sam Rose
9866aabd39
Add bulk upsert to row operations list.
2024-06-19 10:49:39 +01:00
Sam Rose
c26617d165
Merge branch 'master' into budi-8220-support-updating-existing-rows-for-external-databases-using
2024-06-19 10:42:52 +01:00