Commit Graph

2955 Commits

Author SHA1 Message Date
mike12345567 41d99f6a58 Updating app backup exports to not include automation logs as these bloat the backups. 2023-10-30 17:41:08 +00:00
Sam Rose d0fecc1c64
Merge branch 'master' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-30 09:45:21 +00:00
jvcalderon cd283ad0b0 Merge branch 'master' into feature/per-creator-final 2023-10-30 09:02:02 +01:00
mike12345567 330059991e Removing any. 2023-10-27 18:04:28 +01:00
mike12345567 d4929ea3b6 Fixing an issue where unpublished apps with custom roles, when used in groups would cause users to be unable to login. 2023-10-27 18:03:06 +01:00
Sam Rose 45543cbc03
Catch a few more edge cases with column names, add tests for them. 2023-10-27 15:59:31 +01:00
Sam Rose ae356b6a50
Bump version of @budibase/nano to complete the DatabaseQueryOpts type usage. 2023-10-26 15:51:28 +01:00
Sam Rose 536d85d828
WIP: Improving the use of DatabaseQueryOpts. 2023-10-26 15:04:33 +01:00
Michael Drury c6b377c565
Revert "Revert "Client library fetching through server"" 2023-10-24 18:13:36 +01:00
Michael Drury e2e5c9044c
Revert "Client library fetching through server" 2023-10-24 18:12:20 +01:00
Michael Drury 2888335724
Merge branch 'master' into fix/client-lib-fetching 2023-10-24 17:31:44 +01:00
mike12345567 701d30abb4 Don't pass through default tenant ID. 2023-10-24 17:30:57 +01:00
mike12345567 ba5b1d7cfa Adding tenant ID to query string and fixing test cases. 2023-10-24 17:27:58 +01:00
mike12345567 b53158ac08 Moving the client library to be retrieved using the same mechanism as we do in development, through the server instance (same as the builder itself). This should help with the CDN issues that we have been having, although attachments are still currently affected. 2023-10-24 16:25:14 +01:00
jvcalderon cea1c04b73 Creators count functionality 2023-10-24 17:16:44 +02:00
jvcalderon 980a46abb3 Merge branch 'master' into feature/per-creator-migration 2023-10-24 11:03:02 +02:00
jvcalderon f643bc5ee8 Keep only migrations 2023-10-24 10:24:00 +02:00
Adria Navarro 3deb8341d3
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-23 15:57:24 +02:00
Adria Navarro 3c85f1ce9e Fix after renames 2023-10-23 13:55:58 +02:00
jvcalderon a285fb1d40 Missed code in merge 2023-10-23 13:33:27 +02:00
jvcalderon 648410348d [Revert] [Added] Per user per creator changes 2023-10-23 13:27:59 +02:00
Adria Navarro 4ee1fd0f7a Default to package.json 2023-10-23 12:23:44 +02:00
Adria Navarro e83e45e2b6
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-20 17:40:17 +02:00
mike12345567 04a2bbc61a Two fixes here - a quick fix for the builder side panel, making sure it fills up with users correctly (not all, but enough to make it look more pleasant) as well as dropping user search endpoint permissions to allow basic users to access it for user columns. 2023-10-20 15:45:35 +01:00
Adria Navarro 961913b88a Use version from environment 2023-10-20 16:21:35 +02:00
Adria Navarro 3851a67915 Unify jsonwebtoken and lodash packages 2023-10-19 11:00:53 +02:00
jvcalderon 44474b063a Merge branch 'master' into features/per-user-per-creator-realease2 2023-10-18 13:43:11 +02:00
jvcalderon 5b2f55a592 Per user per creator changes 2023-10-18 13:36:34 +02:00
Sam Rose 767900aec6
Remove type information from JSDoc in .ts files, it's redundant. 2023-10-17 16:46:32 +01:00
Adria Navarro 26618794ae Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 16:17:26 +02:00
Martin McKeaveney 2ef9871fda merge with master 2023-10-16 14:42:50 +01:00
Adria Navarro dc4fc27fc8 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 10:38:09 +02:00
mike12345567 d3366a535b PR comments. 2023-10-13 10:22:29 +01:00
Adria Navarro 5ef90a3855 Fix import 2023-10-13 09:08:07 +02:00
mike12345567 16d551542e Frontend component of updating the API and accounting for default value not being in the paginated results of the relationship picker. 2023-10-12 19:00:53 +01:00
mike12345567 7b8e23eb82 Merge branch 'master' of github.com:Budibase/budibase into BUDI-7573/use_existing_image_cache 2023-10-12 11:08:12 +01:00
mike12345567 f1b73058c2 Merge branch 'fix/update-vm2' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 18:49:39 +01:00
mike12345567 ff89a15eea Updating jest types - old version was causing some weird errors in Webstorm. 2023-10-10 18:12:28 +01:00
Adria Navarro f22467fa53 Validate user column 2023-10-10 13:52:47 +02:00
mike12345567 c87a67a37a Converting user IDs where necessary to global user IDs in the frontend, correcting the null entry when using current user IDs, or other user IDs, as a default value for a user column form type. 2023-10-09 18:18:34 +01:00
Adria Navarro 18545b1c79 Fix vulnerabilities 2023-10-03 23:45:39 +02:00
Samuel Martineau 84d30e4f4a Merge branch 'Budibase:develop' into allow-plugins-contribute-datasourceplus 2023-10-02 17:49:34 -04:00
Michael Drury a67f78fead Merge branch 'develop' into fix/BUDI-7236 2023-09-27 17:08:21 +01:00
Martin McKeaveney 65af2ed7c2 backmerge from master 2023-09-27 17:06:57 +01:00
mike12345567 395969e0f0 Fixing build issue,. 2023-09-27 16:24:12 +01:00
mike12345567 4bfda10fbb Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-7236 2023-09-27 15:51:49 +01:00
mike12345567 e916178046 Adding test case for new endpoint and covering public, builder and normal roles. 2023-09-27 15:46:04 +01:00
mike12345567 bb2892cbc2 Getting client library loading in Webstorm debug, as well as adding accessible roles endpoint. 2023-09-27 14:21:25 +01:00
Samuel Martineau 08bbfa09c2 Merge branch 'Budibase:develop' into allow-plugins-contribute-datasourceplus 2023-09-26 21:28:26 -04:00
Samuel-Martineau 2aac1c992a Correct bugs with Datasource+ plugins 2023-09-26 21:26:40 -04:00
Adria Navarro 1fdb822699 Missing dependencies 2023-09-26 13:09:16 +02:00
Adria Navarro a13aef1c16 Fix dependencies from backend-core 2023-09-26 12:53:09 +02:00
Adria Navarro 7feaf58f7f Fix dependencies from backend-core 2023-09-26 12:53:09 +02:00
Adria Navarro 6487d76b1d Merge branch 'develop' into feature/user-column-type 2023-09-25 21:51:43 +02:00
Adria Navarro 79e693c89d Merge branch 'develop' into feature/user-column-type 2023-09-25 19:03:25 +02:00
mike12345567 6b52adc294 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7458 2023-09-25 17:55:06 +01:00
Martin McKeaveney 83f042eeaf update name of platform users view so it rebuilds 2023-09-25 13:57:10 +01:00
Adria Navarro 2530ebda2b Fix tests 2023-09-25 09:48:27 +02:00
Martin McKeaveney 6d4e3082e3 type tidy up and lint 2023-09-24 22:07:40 +01:00
Samuel-Martineau df111f8b44 Allow plugins to contribute DatasourcePlus integrations 2023-09-23 14:05:49 -04:00
Martin McKeaveney b979b29313 e2e secure microsoft auth 2023-09-23 00:10:12 +01:00
mike12345567 fe5cc6878b Adding licensing checks to import/export API. 2023-09-22 17:38:34 +01:00
Adria Navarro 02ab0a134e Update ts to 5.x 2023-09-22 18:17:19 +02:00
Adria Navarro 63ab14865a Typings 2023-09-19 14:32:16 +02:00
Adria Navarro 9cd7ef7827 Typing redis 2023-09-19 14:32:05 +02:00
Adria Navarro e128f1c921 Fix types 2023-09-19 13:28:24 +02:00
Adria Navarro 1d63b219b8 Make use of UserDB 2023-09-19 13:28:24 +02:00
Adria Navarro 9e1ccc35ee Handle missing users 2023-09-19 13:28:24 +02:00
Adria Navarro 7b4585ce68 Tenantid optional 2023-09-19 13:28:24 +02:00
Adria Navarro 6f1d027126 Fix test 2023-09-19 13:28:24 +02:00
Adria Navarro 4311d563d2 Add tests 2023-09-19 13:28:24 +02:00
Adria Navarro d3b04ef4de Add tests 2023-09-19 13:28:24 +02:00
Adria Navarro 3336433de8 User cache, get in bulk 2023-09-19 13:28:24 +02:00
Adria Navarro 6d6b3dd971 Refactor 2023-09-19 13:28:24 +02:00
Martin McKeaveney 722c4e6d48 merge with master 2023-09-11 11:57:18 +01:00
Adria Navarro fd023cf291 Add dist/plugins.js back 2023-09-08 15:56:31 +02:00
Adria Navarro f61abd1f1d Revert "Clean backend-core package" 2023-09-07 21:14:38 +01:00
Adria Navarro 4177008bc2 Merge branch 'develop' into chore/clean_npm_package 2023-09-07 20:38:31 +02:00
Adria Navarro 3b69acc166 Merge branch 'develop' into update-node-types 2023-09-07 19:50:39 +02:00
Mitch-Budibase 64ec4fe9e2 Merge branch 'develop' into account-portal-auth-api-testing-2 2023-09-07 16:39:37 +01:00
Adria Navarro 205d33f172 Clean cypress refs 2023-09-07 15:37:22 +02:00
Adria Navarro f691987e65 Update node types 2023-09-07 11:21:41 +02:00
Adria Navarro aca2d7be5b Remove src and test from the backend-core npm 2023-09-07 09:54:17 +02:00
Mitch-Budibase 27ce59eaa2 Merge branch 'develop' into account-portal-auth-api-testing-2 2023-09-06 16:02:59 +01:00
Adria Navarro 45585d263a Build backend-core/tests via tsc 2023-09-06 13:14:59 +02:00
Adria Navarro 43713e1db5 Publish src code in the npm package 2023-09-06 12:04:04 +02:00
Mitch-Budibase 6fb012dc04 Merge branch 'develop' into account-portal-auth-api-testing-2 2023-09-06 10:19:21 +01:00
Adria Navarro 0f0533ff2b Merge branch 'develop' into fix/backend-core-test-types 2023-09-06 10:08:46 +02:00
Adria Navarro 743fe0e05c Keep types field 2023-09-06 09:28:57 +02:00
Adria Navarro 73d9be4161 Allow silent scripts 2023-09-06 01:45:59 +02:00
Adria Navarro b0dc777af7 Fix role tests 2023-09-06 01:34:39 +02:00
Adria Navarro b3fc110899 Fix versions 2023-09-06 01:10:30 +02:00
Adria Navarro 9651def415 Fix types 2023-09-06 00:58:33 +02:00
Adria Navarro 2427f79229 Merge branch 'develop' into fix/jest_relative_mocks 2023-09-05 16:51:42 +02:00
Adria Navarro 5a4d032b0d Build dist/tests 2023-09-05 16:44:02 +02:00
Adria Navarro 7ff6714ff8 Use esbuild js 2023-09-05 16:19:15 +02:00
Adria Navarro d3f4cde372 Update test entry point 2023-09-05 15:47:15 +02:00
Adria Navarro fa38057fb6 Keep structure building test dist 2023-09-05 15:46:39 +02:00
Mitch-Budibase 720516ed9f Merge branch 'develop' into account-portal-auth-api-testing-2 2023-09-05 13:44:54 +01:00
mike12345567 83875cd2d6 Merge branch 'develop' of github.com:Budibase/budibase into merge-master-develop 2023-09-05 12:29:27 +01:00
mike12345567 d096f359d7 Revert "Revert "Merge branch 'develop' into master""
This reverts commit 3265042025.
2023-09-05 12:28:56 +01:00
Adria Navarro 5ee4f6f6cc Clean code 2023-09-04 17:03:25 +02:00
Adria Navarro 111e999962 Merge branch 'develop' into BUDI-7393/use_permissions_on_middleware 2023-09-04 15:51:45 +02:00
Adria Navarro fc0ee3f462 Types 2023-09-04 13:23:21 +02:00
Adria Navarro a012c0a458 Add back base default legacy views permissions 2023-09-04 12:00:58 +02:00
Rory Powell 64af549341 Revert "Merge pull request #11489 from Budibase/fix/automation-disable"
This reverts commit e6319cce67, reversing
changes made to 7c12280fe3.
2023-09-01 15:12:23 +01:00
Mitch-Budibase 178b807573 Merge branch 'develop' into account-portal-auth-api-testing-2 2023-08-30 15:14:48 +01:00
Martin McKeaveney 3265042025 Revert "Merge branch 'develop' into master"
This reverts commit 99adc2039b, reversing
changes made to fec20e526e.
2023-08-29 14:27:39 +01:00
Adria Navarro 1a88a9078d Merge branch 'develop' into BUDI-7393-view-permissions-behind-feature-flag 2023-08-24 08:39:53 +02:00
mike12345567 3395a5b96b Some other minor changes to fully support the per app builder from groups, making sure middlewares are properly aware. 2023-08-22 19:15:47 +01:00
Adria Navarro 561fe3cbe9 Merge branch 'develop' into BUDI-7393-view-permissions-behind-feature-flag 2023-08-22 11:49:07 +03:00
Adria Navarro 664f257239 Implemment checks 2023-08-22 11:27:06 +03:00
Michael Drury 4ea61140e8 Merge branch 'develop' into fix/test-flakiness 2023-08-18 16:53:44 +01:00
mike12345567 f154e14414 Merge branch 'develop' of github.com:Budibase/budibase into fix/test-flakiness 2023-08-18 14:35:47 +01:00
mike12345567 a5a1c62eb1 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 14:34:08 +01:00
mike12345567 7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
mike12345567 3e2010fb26 Attempting to improve on test flakiness, don't depend on a timeout for docker startup, wait for port to respond. 2023-08-18 14:18:47 +01:00
mike12345567 aef7f28ccb Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 13:30:47 +01:00
mike12345567 621b1fadea Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108 2023-08-18 13:22:34 +01:00
mike12345567 9cfab6fbfd Merge branch 'fix/automation-improvements' of github.com:Budibase/budibase into fix/automation-improvements 2023-08-17 17:45:17 +01:00
mike12345567 ba5e390b3f Quick PR comments. 2023-08-17 17:44:59 +01:00
mike12345567 e174211440 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-08-17 17:34:44 +01:00
melohagan b57a8c1130 Move when filter empty option into filter drawer (#11262)
* Add when filter empty dropdown

* Add unit tests

* "fix" typescript issue

* Add empty filter check for external

* Add unit test

* Hide empty filter option for custom query

* Make onEmptyFilter optional

* Fix unit tests

* Remove onEmptyFilter automation input

* Remove unused var

* Refactor

* Fix path

* Fix type issue

* Fix types
2023-08-17 13:31:52 +01:00
Martin McKeaveney fd099658a0 revert develop into master 2023-08-17 10:28:15 +01:00
mike12345567 a6a70c2d09 Building out the role assignment/unassignment APIs as new components of the public API. 2023-08-15 16:46:21 +01:00
mike12345567 e97c042e95 Adding test cases. 2023-08-15 15:35:52 +01:00
Adria Navarro f6838631b0 Merge branch 'develop' into master-backmerge-20230810 2023-08-10 15:32:00 +03:00
Michael Drury 567d9eeafe Merge branch 'develop' into feature/view-api-merge 2023-08-10 11:04:56 +01:00
Adria Navarro f226d7d093 Update package.json 2023-08-10 10:07:05 +01:00
Michael Drury f7d94e1864 Merge branch 'master' into fix/automation-disable 2023-08-09 17:13:14 +01:00
mike12345567 63006e36d4 Adding the ability to disable an automation, as well making sure that automations have steps before running. 2023-08-09 16:24:57 +01:00
Adria Navarro 9e6bfaa958 Merge branch 'develop' into backmerge-20230809 2023-08-09 17:36:31 +03:00
Adria Navarro 9734776953 Add required nx dependencies 2023-08-09 17:20:36 +03:00
Adria Navarro b441cbe3ec Include all dist 2023-08-09 17:06:05 +03:00
Adria Navarro 4c7dfc978e Whitelist .npmignore from backend-core 2023-08-09 16:41:44 +03:00
mike12345567 f55aed2ee5 Adding NPM ignore files so that doesn't default to the .gitignore when publishing to NPM. 2023-08-09 13:31:30 +01:00
mike12345567 33257db010 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-08-09 11:39:46 +01:00
Adria Navarro 32e09cf131 Lint 2023-08-09 12:13:38 +03:00
Adria Navarro b91677f0ce Fix declarations 2023-08-08 19:33:57 +03:00
Adria Navarro 93654907c3 Bundle bb dependencies in backend-core 2023-08-08 19:08:57 +03:00
Adria Navarro bc5b4297a5 Backend-core via esbuild 2023-08-08 18:56:07 +03:00
mike12345567 a44a92dcc2 Merge branch 'develop' of github.com:Budibase/budibase into feature/view-api-merge 2023-08-08 11:42:04 +01:00
mike12345567 41a9041268 PR fixes. 2023-08-07 16:36:28 +01:00
Adria Navarro 516e2ff09a Merge branch 'develop' into BUDI-6785-update-to-node-18 2023-08-07 12:32:20 +01:00
jvcalderon 989bfe76fb Merge branch 'develop' into account-portal-auth-api-testing-2 2023-08-02 17:44:01 +02:00
Adria Navarro 1ef8d118cb Remove unnecessary package.json/gitHead 2023-08-02 12:04:54 +02:00
Adria Navarro bb861e45a8 Remove unnecessary nx dependencies for build 2023-08-02 10:02:39 +02:00
Adria Navarro 77a22470cb Use path for shared-core in backend-core 2023-08-02 09:59:14 +02:00
Adria Navarro 4b5751003f Revert "Remove composite"
This reverts commit f9115f1554bbadadc3a0ef91d00d170fa05e45b6.
2023-08-01 19:23:48 +02:00
Adria Navarro 250a4e890f Remove composite 2023-08-01 19:23:23 +02:00