Commit Graph

21640 Commits

Author SHA1 Message Date
mike12345567 d0f989597a Updating tests to be more consistent in how they pick to create an internal or external table. 2023-10-26 17:27:54 +01:00
mike12345567 fd29b8d949 PR comments. 2023-10-26 17:27:40 +01:00
mike12345567 115a67cfd6 Fixing test case. 2023-10-26 17:03:05 +01:00
mike12345567 19eaafd946 Fixing some test cases. 2023-10-26 16:32:34 +01:00
melohagan 9616e8e551
Custom role navigation links (#12056)
* Refactor routing unit tests

* Filter out higher level roles in preview

* unit test

* Refactor

---------

Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
2023-10-26 15:28:12 +00:00
Dean 6d9ca77d99 Merge remote-tracking branch 'origin/master' into fix/row-id-delete-parsing 2023-10-26 16:24:37 +01:00
Dean 5266d80afe Fix to ensure single integer ids are parsed correctly 2023-10-26 16:09:01 +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
Adria Navarro 62cab7e25e
Merge branch 'master' into chore/single-release-pipeline 2023-10-26 14:44:16 +02:00
mike12345567 ed0670a008 Major update to make the table.type always 'table' and then adding a new sourceType which states what source the table came from, external or internal. Don't want to keep using a type that should be static as two different things. 2023-10-26 13:19:09 +01:00
Gerard Burns 44f9c64ed7
Prevent the key user being used in rest queries (#12072)
* Add warning about unusable user binding

* linting

* remove unnecessary safe nav operators

* change regex to capture property access of user binding
2023-10-26 13:06:25 +01:00
Adria Navarro 3b3586d2bd
Merge branch 'master' into feature/change-global-admin-to-creator 2023-10-26 12:58:35 +02:00
Adria Navarro 8db0ff79a6 Increase yarn timeouts 2023-10-26 12:44:52 +02:00
Gerard Burns 5909b4a7c7
Add template for grid blocks (#12086)
* wip

* linting

---------

Co-authored-by: Mihail Hadzhiev <102024164+MihailHadzhiev2022@users.noreply.github.com>
2023-10-26 11:24:43 +01:00
Mihail Hadzhiev 3473aa61ff
Merge branch 'master' into feature/change-global-admin-to-creator 2023-10-26 12:58:52 +03:00
Mihail Hadzhiev e5ff023881
Merge branch 'master' into feature/buttongroup-component 2023-10-26 12:50:47 +03:00
Dean 6032216e2f Added fix for scenario where componentdefinition was queried befor it existed. Fix to ensure an empty general settings block is not shown 2023-10-26 10:13:22 +01:00
Sam Rose 26100ffd8b
Merge branch 'feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column' into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-4 2023-10-26 09:57:11 +01:00
Sam Rose b3c08f0e7a
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-26 09:56:56 +01:00
Dean 3b7ed3a7f2 Merge remote-tracking branch 'origin/master' into feature/formblock-styles-tab-reflow 2023-10-26 09:56:17 +01:00
Andrew Kingston a74f78f31b
Merge branch 'master' into feature/buttongroup-component 2023-10-26 09:14:40 +01:00
Andrew Kingston 0d9e9caff6
Merge branch 'master' into refactor-grid-columns 2023-10-26 08:53:17 +01:00
mike12345567 fd0d8f17f2 Making sure single table get also includes sourceId. 2023-10-25 19:07:51 +01:00
mike12345567 455b26bac9 Making sure the source ID is always set when creating a table - the frontend expects this to be set for every table so making the type represent this correctly. 2023-10-25 19:00:25 +01:00
Sam Rose 6c3b535863
Simplify try-catch in the migrate function. 2023-10-25 16:49:29 +01:00
Sam Rose 4a00649f7f
Simplify the function signature of processInternalTables 2023-10-25 16:46:14 +01:00
Sam Rose e03b1be9d1
Make sure new column name cannot be the same as an existing column name. 2023-10-25 16:41:37 +01:00
Sam Rose c5097487e2
Use FieldType constant instead of raw string. 2023-10-25 16:38:55 +01:00
Sam Rose ef84e96f98
Use RelationshipType enum instead of raw string. 2023-10-25 16:38:14 +01:00
Sam Rose 2c5dd99da2
Use FieldSubtype enum instead of raw strings. 2023-10-25 16:37:15 +01:00
Sam Rose 7acce7b7c0
Remove unused dispatch import. 2023-10-25 16:01:08 +01:00
Sam Rose c9e3b7a348
Remove the previous attempt at syncing grid state, it is no longer needed. 2023-10-25 16:00:14 +01:00
Sam Rose 0ac6b17ff0
Remove stray console.log 2023-10-25 15:33:53 +01:00
Sam Rose 402a53cacb
User constant for user table ID. 2023-10-25 15:33:12 +01:00
Sam Rose 5779e97e6e
Add column name input validation. 2023-10-25 15:29:56 +01:00
Sam Rose fbf60ece4f
Merge base branch. 2023-10-25 14:58:37 +01:00
Sam Rose e3a702c214
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-25 14:54:39 +01:00
Sam Rose 007e919d0e
Spring cleaning before review. 2023-10-25 14:53:51 +01:00
Andrew Kingston a3226bc905
Merge branch 'master' into enable-collapsing-settings-sections 2023-10-25 14:43:05 +01:00
Sam Rose 70f39b6b6b
Fix missing sourceId on Table sent to the websocket. 2023-10-25 14:41:23 +01:00
Dean 8db0b300fd Merge remote-tracking branch 'origin/master' into feature/buttongroup-component 2023-10-25 14:26:58 +01:00
Andrew Kingston 62f4c3e85b
Merge branch 'master' into refactor-grid-columns 2023-10-25 13:57:22 +01:00
Andrew Kingston 2bb8ba45d1
Merge branch 'master' into grid-inline-searching 2023-10-25 13:50:55 +01:00
Dean 536a27541f Merge remote-tracking branch 'origin/master' into feature/change-global-admin-to-creator 2023-10-25 13:27:54 +01:00
Dean d4ff67b999 Merge remote-tracking branch 'origin/master' into feature/component-name-setting-ux-update 2023-10-25 12:34:13 +01:00
Andrew Kingston d3fe9775f3
Merge branch 'master' into grid-inline-searching 2023-10-25 12:32:04 +01:00
Dean 9200366f79 Merge remote-tracking branch 'origin/master' into fix/view1-sortable-column-config 2023-10-25 12:09:59 +01:00
Dean b952892c42 Generalised the fix as not all calculations will have a groupby per PR feedback 2023-10-25 12:08:56 +01:00
Sam Rose 52f97fbd1f
Attempt to emit events that include the originator. 2023-10-25 11:38:31 +01:00
Sam Rose 78afba63de
Emit table updates to the builder socket, and some minor refactoring. 2023-10-25 11:03:35 +01:00
Dean 66fda3db09 Merge remote-tracking branch 'origin/master' into fix/view1-sortable-column-config 2023-10-25 09:15:37 +01:00
José Vte. Calderón bc1999fe30
Merge branch 'master' into feature/sync-quotas-2 2023-10-25 10:02:09 +02:00
Andrew Kingston 4fb18baf17 Merge branch 'grid-inline-searching' of github.com:Budibase/budibase into refactor-grid-columns 2023-10-25 08:48:21 +01:00
Andrew Kingston b88be9b1df
Merge branch 'master' into feature/form-block-description 2023-10-25 08:45:34 +01:00
jvcalderon 65111c81ef Reactivate sync quotas migration 2023-10-25 08:44:59 +02:00
Michael Drury 9983d67163 Adding mimetype for client library response (correcting from octet-stream). 2023-10-24 22:13:56 +01:00
Michael Drury 5fabe32434 Making sure client endpoint available in prod. 2023-10-24 20:35:25 +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
Sam Rose 0f5c2cff00
Handle a couple more edge cases more gracefully. 2023-10-24 18:06:25 +01:00
Sam Rose fb998502bb
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-24 17:34:41 +01:00
Sam Rose a8ae16852c
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column-4 2023-10-24 17:34:19 +01:00
Sam Rose f4c6ab7f48
Make sure the user cannot enter the same column name as the old column for the migrated column. 2023-10-24 17:33:49 +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
Sam Rose d3670ddf21
Add an input to allow the user to choose the new column name. 2023-10-24 17:22:49 +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 102a082484 Update pro submodule 2023-10-24 17:18:13 +02:00
jvcalderon cea1c04b73 Creators count functionality 2023-10-24 17:16:44 +02:00
Sam Rose 2f0a40e9bb
Introduce modal to show warning to users, and toast to show success. 2023-10-24 15:18:46 +01:00
Andrew Kingston ea7b3381c2 Merge branch 'master' of github.com:Budibase/budibase into grid-inline-searching 2023-10-24 13:37:44 +01:00
Adria Navarro 969ab79a61
Merge branch 'master' into feature/buttongroup-component 2023-10-24 14:30:09 +02:00
Andrew Kingston 7e3d59a582
Merge branch 'master' into grid-inline-searching 2023-10-24 13:30:07 +01:00
Andrew Kingston 7c19e9ed96
Merge branch 'master' into fix-table-metadata 2023-10-24 11:34:52 +01:00
jvcalderon 5c1710b5da Update pro submodule 2023-10-24 12:15:28 +02:00
jvcalderon dbc903f3e6 Remove console.log 2023-10-24 12:03:07 +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
Andrew Kingston d82aec9f31
Merge branch 'master' into feature/form-block-description 2023-10-24 08:56:14 +01:00
Andrew Kingston 76edd1421a
Merge branch 'master' into feature/formblock-styles-tab-reflow 2023-10-24 08:55:51 +01:00
Andrew Kingston 654e6539bb
Merge branch 'master' into fix-table-metadata 2023-10-24 08:55:23 +01:00
Andrew Kingston b6a8e6c0cf
Merge branch 'master' into enable-collapsing-settings-sections 2023-10-24 08:54:54 +01:00
Adria Navarro 52b86b44cb
Merge branch 'master' into feature/change-global-admin-to-creator 2023-10-24 09:54:19 +02:00
Andrew Kingston c5537dd58c Prettier 2023-10-24 08:46:55 +01:00
Andrew Kingston f355933bf3 Add grid support for old views with groupBy specified, and any other datasource that has a custom means of determining a datasource schema 2023-10-24 08:26:57 +01:00
Sam Rose a701933f48
Frontend changes for the user column migration work. 2023-10-23 17:57:25 +01:00
Dean 08a22f1525 Show 'Creator' instead of 'Admin' for the global user role picker 2023-10-23 16:47:05 +01:00
Sam Rose 42e31d19fb
Merge master. 2023-10-23 16:18:51 +01:00
Adria Navarro 3deb8341d3
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-23 15:57:24 +02:00
jvcalderon bc4dd8e1c9 Update pro submodule 2023-10-23 15:43:44 +02:00
Adria Navarro 453c0744be Fix tests 2023-10-23 15:20:44 +02:00
Adria Navarro e3b342da57 Fix after renames 2023-10-23 13:57:23 +02:00
Adria Navarro 3c85f1ce9e Fix after renames 2023-10-23 13:55:58 +02:00
Adria Navarro 3c16e82035 Comment docker 2023-10-23 13:55:23 +02:00
Adria Navarro 0cc7cc67a3 Renames 2023-10-23 13:53:18 +02:00
Andrew Kingston 73f3b76c01 Update default column visibility check 2023-10-23 12:40:29 +01:00
Dean cf8a634a72 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-23 12:34:31 +01:00
jvcalderon a22aea63a3 Update pro submodule 2023-10-23 13:33:56 +02:00