Commit Graph

3921 Commits

Author SHA1 Message Date
Sam Rose fea668e6b6
Revert to state from 2.33.4. 2024-10-29 15:55:38 +00:00
mike12345567 f94d8ba870 Fixing merge artifact 2024-10-29 12:18:36 +00:00
Adria Navarro 3f006550d9
Merge branch 'master' into v3-ui 2024-10-29 12:52:13 +01:00
mike12345567 4da185a843 Fixes an issue with public role access, some old roles have a slightly different role ID format which needs to be accounted for in the comparison. Tests will come after, want to get the fix out. 2024-10-29 11:00:45 +00:00
Adria Navarro 5cf0e334c2
Merge branch 'master' into v3-ui 2024-10-28 16:37:17 +01:00
melohagan 7dcdce2480
Gro 738 refactor code that returns the account holder from user (#14872)
* WIP

* WIP

* Remove tests

* Remove TenantInfo

* Remove unused export

* Remove TenantInfo type

* Remove unused export

* Remove unused routes

* Add getAccountHolder front-end endpoint

* Add endpoint to no tenancy list

* Get account holder via appId

* lint

* Update pro ref

* Use account email instead of budibaseUserId (#14876)

* Update account-portal ref

* Update account portal ref

* Correct import order

* Simplify boolean

* type fix

* Rename endpoint to accountholder

* Update account-portal ref

* Refactor

* Refactor to not use appId

* Update type

* appId not needed

* Unused import
2024-10-28 14:46:42 +00:00
Sam Rose c2108ac60d
Merge pull request #14878 from Budibase/allow-bigints-in-calculations 2024-10-28 10:14:16 +00:00
mike12345567 a9279b35d5 Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-25 17:31:16 +01:00
Sam Rose f46a668465
Allow bigints to be used in view calculations, and make sure they're accurate up to 64bit signed int via tests. 2024-10-25 15:55:07 +01:00
Michael Drury 207cf40504
Merge branch 'master' into fix/openapi-security 2024-10-25 11:01:40 +01:00
Sam Rose 7ee72b6c95
Merge master. 2024-10-25 10:58:32 +01:00
mike12345567 5a46e16b8d Adding some tests around the openAPI public APIs to make sure the security works the way we expect, do not redirect API requests. 2024-10-24 16:54:08 +01:00
Adria Navarro f279a1716d Allow overriding the min version where we stop serving the power role 2024-10-24 15:52:52 +02:00
Sam Rose 478160c412
Fix all tests. 2024-10-24 12:28:23 +01:00
Sam Rose 0736812293
Add SQL injection tests. 2024-10-24 11:39:57 +01:00
Sam Rose e14918c105
Fix notContains tests again. 2024-10-24 11:20:31 +01:00
Sam Rose 0695888659
wip 2024-10-24 11:01:35 +01:00
Sam Rose ebcbadfd3a
remove all of the `fnc` variables 2024-10-23 17:21:14 +01:00
Sam Rose a120ce4e14
More refactoring. 2024-10-23 17:07:42 +01:00
Sam Rose aaf4022f25
Finally fix notContains tests. 2024-10-23 16:22:07 +01:00
mike12345567 8f21802e6e Refactor, correct to the BuiltinPermissionID rather than PermissionLevel, these are different. 2024-10-23 15:08:59 +01:00
Sam Rose 26192515b3
Merge branch 'master' of github.com:budibase/budibase into sql-security 2024-10-23 14:45:51 +01:00
Andrew Kingston 45dbfd2e35
Merge pull request #14577 from Budibase/new-rbac-ui
New RBAC UI
2024-10-23 12:19:53 +01:00
Sam Rose 56a68db1d4
Checkpoint EOD: fixed a bunch more raw cases, some test failures to fix tomorrow. 2024-10-22 18:33:44 +01:00
Adria Navarro 23cf44b242
Merge branch 'master' into v3-ui 2024-10-22 18:23:26 +02:00
Michael Drury 9575095da3
Merge pull request #14844 from Budibase/fix/multi-inheritance-preview-role
Preview role - multi-inheritance fixes
2024-10-22 16:48:14 +01:00
Adria Navarro 06670ba549 Add local prerelease to version locally 2024-10-22 17:32:32 +02:00
mike12345567 74870663e2 Addressing PR comments. 2024-10-22 16:02:20 +01:00
mike12345567 f3d54f1b7d Adding test cases. 2024-10-22 13:54:54 +01:00
Sam Rose 4545493cd5
Checkpoint, more raws converted. 2024-10-22 11:48:38 +01:00
Sam Rose 44bd00a0d7
Making progress on converting raw calls to use bindings. 2024-10-21 18:20:52 +01:00
Sam Rose 00bdd6fc00
Merge branch 'master' of github.com:budibase/budibase into sql-security 2024-10-21 16:39:58 +01:00
deanhannigan 2795eca672
Merge branch 'master' into v3-ui 2024-10-21 15:01:02 +01:00
Adria Navarro 630802799e Remove SQS flag 2024-10-21 15:40:10 +02:00
Adria Navarro 42f27bacb2 Cleanup SQS feature usages 2024-10-21 15:19:36 +02:00
mike12345567 f857e2a3e9 Adding BUDIBASE_AI feature flag. 2024-10-21 12:56:59 +01:00
Sam Rose cc2605a9dd
WIP 2024-10-21 10:04:03 +01:00
mike12345567 24dbb0cef9 Merge branch 'master' of github.com:Budibase/budibase into fix/all-feature-flag-enum 2024-10-18 18:24:02 +01:00
mike12345567 b94498e583 Backporting types from v3 to support updating pro submodule. 2024-10-18 17:29:22 +01:00
mike12345567 87bdd68afa Updating to use enum for feature flags across the board. 2024-10-18 17:07:35 +01:00
mike12345567 94789ff03d Adding all feature flags to enum, just so there is a simple reference to see all feature flags that are available. 2024-10-18 16:51:23 +01:00
Andrew Kingston eaa0465539
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-18 11:45:12 +01:00
Andrew Kingston 02a60ba55d
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-18 08:52:47 +01:00
mike12345567 47de88f42f Destroy test case. 2024-10-17 17:47:55 +01:00
Michael Drury aaf5debc52
Merge branch 'master' into feature/role-multi-inheritance 2024-10-17 17:01:27 +01:00
mike12345567 bd10a3d831 Missed comment. 2024-10-17 17:00:40 +01:00
mike12345567 2ae1836b9a PR comments. 2024-10-17 16:58:51 +01:00
mike12345567 3da3bccc01 Some fixes for traverser. 2024-10-17 16:27:47 +01:00
mike12345567 cfc5848d14 Improving how traversal is performed for role inheritance. 2024-10-17 16:10:32 +01:00
mike12345567 2d7afa59c8 Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-17 14:57:25 +01:00
Andrew Kingston b57c8cc50d
Merge branch 'master' of github.com:Budibase/budibase into v3-ui 2024-10-17 14:36:34 +01:00
Adria Navarro 32b9d22ba0
Merge branch 'master' into budi-8755-hide-power-role-for-v3-apps 2024-10-17 12:52:05 +02:00
Adria Navarro c1128ffe2a Fix test 2024-10-17 12:20:17 +02:00
Adria Navarro 7bb69d7ffd Add tests 2024-10-17 12:17:01 +02:00
Adria Navarro 8008d2ced1 Fix all references 2024-10-17 11:53:20 +02:00
Adria Navarro 1155be4530 Fix 2024-10-17 11:52:03 +02:00
Adria Navarro 15bb730c59 Remove power role for apps created at >= 3.0.0 2024-10-17 11:37:41 +02:00
Adria Navarro 8cdc5be38e Store proper version even on local 2024-10-17 11:36:02 +02:00
mike12345567 c40e4a7288 fixing rbac 2024-10-16 21:13:35 +01:00
mike12345567 9c92288f7f Fixing some issues with finding roles. 2024-10-16 21:13:19 +01:00
Adria Navarro b6874f52f6 Fix many-to-one 2024-10-16 16:16:39 +02:00
Adria Navarro 3ea8e240e4 Fix one-to-many 2024-10-16 14:05:48 +02:00
Adria Navarro 960fa33559 Merge branch 'fix/multiple-relationships-same-table' into chore/negated-join-filters 2024-10-16 13:34:19 +02:00
Adria Navarro b01564c934 Fix multiple relations to same table for external 2024-10-16 10:21:17 +02:00
mike12345567 9fceef0fc2 Some more fixes and test case for screen access. 2024-10-15 17:53:48 +01:00
Adria Navarro 8a6dbef249 Fix sqs 2024-10-15 18:50:58 +02:00
mike12345567 ca72dffb1f Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-15 13:34:39 +01:00
Andrew Kingston 9b009f9728
Merge branch 'master' into v3-ui 2024-10-15 11:58:20 +01:00
Adria Navarro 2f2cfb392d
Merge branch 'master' into chore/negated-join-filters 2024-10-15 12:04:30 +02:00
Adria Navarro 57da952f69 Fix "parenthesis" 2024-10-15 11:34:35 +02:00
Adria Navarro 76d0107d4d Handle empty relationships 2024-10-15 10:10:15 +02:00
mike12345567 a56a228042 Fixes based on test case. 2024-10-14 18:57:54 +01:00
Martin McKeaveney 97a7649930 merging with v3-ui branch 2024-10-14 18:47:13 +01:00
Martin McKeaveney 30215ea9be tests, pr comments 2024-10-14 18:38:34 +01:00
mike12345567 676cb3f92e Handling role numbering. 2024-10-14 18:00:41 +01:00
Sam Rose 867ba12f8a
Merge branch 'update-docker-compose-for-sqs' of github.com:budibase/budibase into update-docker-compose-for-sqs 2024-10-14 17:24:44 +01:00
Sam Rose 58b4a37fca
Enable SQS in code instead of in env vars. 2024-10-14 17:20:36 +01:00
Adria Navarro 7ea2c187a7 Simplify 2024-10-14 16:17:24 +02:00
mike12345567 243391d6cb Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-14 12:57:22 +01:00
Adria Navarro cf089eff26 Fix ors 2024-10-14 10:40:08 +02:00
Adria Navarro 2311f8aa50 Don't break or conditions on nested joins 2024-10-14 10:40:08 +02:00
mike12345567 324616be59 Finishing multi-inheritance test case and getting accessibility to be detected correctly. 2024-10-10 18:15:23 +01:00
Sam Rose 964f8222ba
Allow sorting by calculation fields. 2024-10-10 17:10:07 +01:00
mike12345567 f907cccc58 Merge branch 'fix/custom-role-naming' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-10 16:28:06 +01:00
Michael Drury 799ad63568
Merge branch 'master' into fix/custom-role-naming 2024-10-10 16:15:14 +01:00
mike12345567 5f4694d4d8 Fix for an issue found with custom role naming. 2024-10-10 16:13:32 +01:00
Sam Rose 4c4429b88a
Fix tests. 2024-10-10 15:49:00 +01:00
mike12345567 3a2b22d446 Merge branch 'master' of github.com:Budibase/budibase into feature/role-multi-inheritance 2024-10-10 11:47:19 +01:00
Adria Navarro 3e0408d3b9 Add new flag 2024-10-10 10:34:35 +02:00
mike12345567 6a25f66f3c Merge branch 'fix/budi-8715-sql-relationships-many-side' of github.com:Budibase/budibase into fix/budi-8715-sql-relationships-many-side 2024-10-09 17:04:46 +01:00
mike12345567 00048a2d3e Addressing PR comments. 2024-10-09 17:04:27 +01:00
Michael Drury 01e458b568
Merge branch 'master' into fix/budi-8715-sql-relationships-many-side 2024-10-09 17:00:48 +01:00
Adria Navarro 85ef2f1d2c Fix build issue 2024-10-09 17:08:45 +02:00
Adria Navarro b3efea95bf Undo base permissions 2024-10-09 17:08:45 +02:00
Adria Navarro 577ab5b6ce Fix tests 2024-10-09 17:08:45 +02:00
Adria Navarro ebd762cdb6 Fixes 2024-10-09 17:08:35 +02:00
Adria Navarro 56459b2736 Type 2024-10-09 16:55:59 +02:00
Sam Rose 9d70b123e5
Remove IP tag. 2024-10-09 15:22:38 +01:00
mike12345567 d62d5b7043 Fixing an issue with removing relationships from the many side of a table in SQL, this was not correctly updating the other table. 2024-10-09 15:09:38 +01:00
Sam Rose 26f2deb234
Set proxy setting on Koa application. 2024-10-09 13:34:43 +01:00