Commit Graph

21705 Commits

Author SHA1 Message Date
Dean 276ec8c71b Merge remote-tracking branch 'origin/master' into feature/buttongroup-component 2023-10-20 10:10:57 +01:00
Dean f135af1957 Merge remote-tracking branch 'origin/master' into feature/component-name-setting-ux-update 2023-10-20 09:45:29 +01:00
Dean 3e9104a4d1 Refactored naming logic into common area in the event that there is no title. 2023-10-20 09:44:42 +01:00
Andrew Kingston 8d2530d4c8 Swap let for const 2023-10-20 09:19:05 +01:00
Andrew Kingston 357f495c0d Respect grid visibility and ordering by default when rendering tables 2023-10-20 09:14:15 +01:00
Andrew Kingston 880c509f64 Always use custom table columns if provided to ensure we allow showing hidden columns if requested. Use grid visibility and order metadata by default in tables 2023-10-20 09:13:42 +01:00
Andrew Kingston ff257abab3 Update copy for table column widths to inform user that a unit is required 2023-10-20 09:09:32 +01:00
Andrew Kingston d0b71ada08 Ensure BBUI table component ignores numeric widths that are invalid 2023-10-20 09:08:45 +01:00
Adria Navarro 806685014b
Merge branch 'master' into BUDI-7641/remove-npm-from-apps-worker-docker 2023-10-20 10:07:33 +02:00
Adria Navarro 6b68e52836 Use v2 dockerfiles 2023-10-20 10:02:18 +02:00
Sam Rose a3ad8780de
Implement many-to-many user column migrations. 2023-10-19 17:28:55 +01:00
mike12345567 d1b551c6aa Type fixes. 2023-10-19 16:56:45 +01:00
Adria Navarro a30982177f Update pro 2023-10-19 17:06:26 +02:00
Dean c983d844d3 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-19 12:30:59 +01:00
Dean f59d622291 Moved buttons section below fields 2023-10-19 12:28:28 +01:00
mike12345567 470735cc97 Updating types across old table utilities. 2023-10-19 12:26:29 +01:00
Dean 3b0a9fdfcb Merge remote-tracking branch 'origin/master' into feature/form-block-settings-reflow 2023-10-19 12:11:43 +01:00
mike12345567 f072a77d9f Updating throw. 2023-10-19 12:03:49 +01:00
mike12345567 54d976f750 Fixing PR comments. 2023-10-19 12:02:49 +01:00
Dean b6de1c544b Merge remote-tracking branch 'origin/master' into feature/formblock-styles-tab-reflow 2023-10-19 12:01:00 +01:00
Dean ad54b31667 Moved label align and button size into styles section of form block. Added tagged component settings section to the style section. General settings and sections now have a tag property for filtering. 2023-10-19 12:00:47 +01:00
Andrew Kingston 94654e9888 Allow manifest key to initially collapse settings sections 2023-10-19 11:31:56 +01:00
Andrew Kingston a069b343e9 Allow settings sections to be collapsible 2023-10-19 11:29:37 +01:00
Adria Navarro 35f7aa0955
Merge branch 'master' into BUDI-7641/remove-npm-from-apps-worker-docker 2023-10-19 12:02:45 +02:00
Adria Navarro 63a26ac823 Fix dependencies 2023-10-19 11:16:52 +02:00
Adria Navarro 3851a67915 Unify jsonwebtoken and lodash packages 2023-10-19 11:00:53 +02:00
Sam Rose 77729737bc
First test passes! 2023-10-19 09:47:50 +01:00
mike12345567 9bd67595ec Merge branch 'master' of github.com:Budibase/budibase into refactor/improve-table-sdk 2023-10-18 19:05:23 +01:00
mike12345567 2d5818ae33 Updating datasource controller to use SDK rather than calling through controllers. 2023-10-18 18:58:58 +01:00
mike12345567 25ad78a94e Adding utilities. 2023-10-18 18:58:27 +01:00
mike12345567 8d1163e50d Adding external SDK, updating external controllers. 2023-10-18 18:58:19 +01:00
mike12345567 6bfa9d407b Adding internal SDK, updating internal table controllers. 2023-10-18 18:57:52 +01:00
mike12345567 291a97a078 Moving getters. 2023-10-18 18:57:30 +01:00
mike12345567 35e6452ecb Adding basic structure for the external/internal SDK. 2023-10-18 18:57:19 +01:00
Sam Rose 6517150f32
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-18 18:05:18 +01:00
Sam Rose 1771b5905a
Most of the way to getting my first test passing. 2023-10-18 18:02:10 +01:00
Sam Rose 6ae5451fdf
Create failing test. 2023-10-18 16:56:55 +01:00
Andrew Kingston 9d62affe07 Merge branch 'grid-inline-searching' of github.com:Budibase/budibase into refactor-grid-columns 2023-10-18 16:00:59 +01:00
Andrew Kingston 16a361b366 Merge branch 'grid-all-datasources' of github.com:Budibase/budibase into grid-inline-searching 2023-10-18 16:00:31 +01:00
Andrew Kingston 41e72a28c9
Merge branch 'master' into grid-all-datasources 2023-10-18 15:59:12 +01:00
Andrew Kingston 05133d7e69 Ensure data section grid sort column options are properly filtered down 2023-10-18 15:44:27 +01:00
Andrew Kingston fb69c3a0da Add new shared core util for determining whether columns can be sort columns or not 2023-10-18 15:38:37 +01:00
mike12345567 13dadbcc7d Merge branch 'master' of github.com:Budibase/budibase into fix/internal-db-enrich-perf 2023-10-18 15:22:00 +01:00
Martin McKeaveney 62e902398e
Merge branch 'master' into budi-7640-testimonials-arent-removed-from-forgot-passwordreset 2023-10-18 15:15:49 +01:00
Sam Rose c84abb3e86
Merge branch 'master' of github.com:Budibase/budibase into feature/budi-7607-migrate-user-relationship-columns-to-the-new-user-column 2023-10-18 15:15:06 +01:00
Sam Rose c25de74e17
Action Michael's feedback about the structure of this feature. 2023-10-18 15:14:34 +01:00
Adria Navarro ba053490dc Npm-less images 2023-10-18 16:08:54 +02:00
Andrew Kingston bdc2bcd97d Add support for multiple dependsOn constraints in the manifest and fix issue with nullish dependsOn contraints 2023-10-18 14:41:42 +01:00
Andrew Kingston 93d717d2e9 Fix add new row setting not being enough to edit new rows with also enabling edit rows flag 2023-10-18 14:25:59 +01:00
Andrew Kingston faa70b79b6 Fix on click actions not working when using non DS+ datasources and edit row setting is hidden but enabled 2023-10-18 14:21:09 +01:00
Michael Drury 93464f3fcf
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 13:23:40 +01:00
Michael Drury 30fadf0138
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 13:05:33 +01:00
jvcalderon 362ac27422 Merge branch 'master' into features/per-user-per-creator-realease2 2023-10-18 14:04:24 +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
Dean 0d67f000f0 Initial reflow of the block settings 2023-10-18 12:19:24 +01:00
Sam Rose 5747f30b5f
Precondition checks to make sure the migration is from the right column to the right column. 2023-10-18 12:04:50 +01:00
Michael Drury 1d951a5d79
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 12:04:32 +01:00
Michael Drury b98f313754
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 12:04:22 +01:00
Sam Rose f9bff0846a
Merge branch 'master' into refactor/remove-jsdoc-types-in-ts-files 2023-10-18 11:45:52 +01:00
Michael Drury b697872cf8
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-18 11:44:56 +01:00
Dean 0ce44d8540 Merge remote-tracking branch 'origin/master' into feature/form-block-description 2023-10-18 11:37:51 +01:00
Michael Drury 0c9f483c39
Merge branch 'master' into fix/improve-external-request-typing 2023-10-18 11:31:53 +01:00
Dean a064512224 Added description field to the formblock 2023-10-18 11:14:16 +01:00
Adria Navarro 06ae3fb52c Log warn 2023-10-18 12:07:50 +02:00
mike12345567 68e8630d85 Improving the typing around the ExternalRequest object, which has implications throughout the row API and SDK, cleaning up where possible based on it. 2023-10-18 10:57:04 +01:00
Sam Rose 3634687442
Create endpoint and controller function for user column migration. 2023-10-18 10:31:36 +01:00
Michael Drury 0894353cc9
Merge branch 'master' into chore/remove-sentry-references 2023-10-18 10:25:43 +01:00
mike12345567 a325e39377 Removing un-used statement. 2023-10-18 10:20:32 +01:00
mike12345567 489c67511c PR comments. 2023-10-18 10:04:26 +01:00
Adria Navarro 616792013f Lint 2023-10-18 10:54:37 +02:00
Adria Navarro 3fd2973152 Remove sentry packages 2023-10-18 10:51:09 +02:00
Adria Navarro ea1853c78c Remove sentry from the backend 2023-10-18 10:51:09 +02:00
Adria Navarro 572cac2552 Remove SENTRY_DSN references 2023-10-18 10:51:09 +02:00
Adria Navarro e35f1b79e2 Remove sentry client 2023-10-18 10:51:09 +02:00
Conor Webb 56ecd339a7 Added testimonial check to reset and forgot pages. 2023-10-18 09:20:06 +01:00
Andrew Kingston dadb368279 Lint and add hover styles for deleting prompts 2023-10-18 08:31:29 +01:00
Andrew Kingston c37538d611 Use CSS content-visibility to improve rendering performance by hiding offscreen grid cells 2023-10-18 08:17:18 +01:00
Andrew Kingston 4e703fdfcc Remove concept of rendered columns from grid and instead render all columns 2023-10-18 08:17:03 +01:00
Andrew Kingston 5e8e4add4a Make it less painful to delete columns 2023-10-18 08:16:59 +01:00
Andrew Kingston 71712d422a Fix alert when duplicate auto columns exist 2023-10-18 08:16:56 +01:00
mike12345567 1299917e94 Quick fix for datasource deletion, due to the datasource defaulting to an empty object it appeared like a datasource had been set and the UI would attempt to render with this empty state. When not selected move off of the selected datasource page instead and handle the datasource not being selected. 2023-10-17 17:35:10 +01:00
Michael Drury 65ab26ca97
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-17 17:02:51 +01:00
Sam Rose 767900aec6
Remove type information from JSDoc in .ts files, it's redundant. 2023-10-17 16:46:32 +01:00
mike12345567 cad637a0c1 Merge branch 'grid-all-datasources' of github.com:Budibase/budibase into grid-inline-searching 2023-10-17 15:46:58 +01:00
mike12345567 70c5272ad9 Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-17 15:46:34 +01:00
Michael Drury e1ba96c5d0
Merge branch 'master' into feature/buttongroup-component 2023-10-17 14:08:26 +01:00
Michael Drury b3b323f040
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-17 12:27:27 +01:00
Michael Drury 92dd6cce2d
Merge branch 'master' into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-17 12:17:24 +01:00
Sam Rose 946a7b6d0d
Merge branch 'master' into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-17 11:43:20 +01:00
Andrew Kingston 65a9ea2cc1
Merge branch 'master' into grid-all-datasources 2023-10-17 11:33:49 +01:00
Michael Drury 0f0e3329ee
Merge branch 'master' into fix/12068-autocolumn-data-ui-fixes 2023-10-17 11:04:48 +01:00
Michael Drury b8c1a054f8
Merge branch 'master' into fix/12070-user-column-dnd-freeze 2023-10-17 11:03:30 +01:00
Adria Navarro beb3136312 Fix sentry import 2023-10-17 10:59:46 +02:00
mike12345567 7dcd6767f9 Fixes for adding autocolumns, it was not possible to select auto column type and fixing icon, as well as display of column when editing it - this corrects a few issues in this area as auto columns did not have a correct fieldId and also did not have a valid field definition. 2023-10-16 18:37:56 +01:00
mike12345567 fefd5fa0dc Quick fix for drag and drop behaviour of relationship cells, appears empty cells were causing things to break in the re-render. 2023-10-16 17:41:20 +01:00
Andrew Kingston 74cab11191 Improve grid sorting labels to account for date types and provide better labels 2023-10-16 17:17:14 +01:00
Andrew Kingston a857eb266c Ensure keyboard events while inline searching are not captured by the main grid keyboard manager 2023-10-16 17:12:25 +01:00
Sam Rose 39292e88a8 Correct error message to say sheets when it's a Google sheet. 2023-10-16 17:11:51 +01:00
Andrew Kingston 7f33b28294 Merge branch 'grid-all-datasources' of github.com:Budibase/budibase into grid-inline-searching 2023-10-16 16:49:01 +01:00
Andrew Kingston 1cb0817a0b Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-16 16:47:14 +01:00
Andrew Kingston 5c7bde95ab Update conditional setting rendering to support nested paths and multiple values, and hide grid block CRUD when using non DS+ 2023-10-16 16:46:49 +01:00
Sam Rose b7ff1d60f1 Wire up the frontend to show the new datasource errors. 2023-10-16 16:36:42 +01:00
Sam Rose 37fe91e488 Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-16 16:05:45 +01:00
Adria Navarro 8e64fb9858 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 16:46:14 +02:00
Michael Drury b86bcb7f4b Merge branch 'master' into fix/12046-nav-links-overwrite-app 2023-10-16 15:30:25 +01:00
Andrew Kingston e0b748a7bc Merge branch 'master' of github.com:Budibase/budibase into grid-all-datasources 2023-10-16 15:29:46 +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 8c0ed39652 submodule 2023-10-16 14:53:57 +01:00
Martin McKeaveney 2ef9871fda merge with master 2023-10-16 14:42:50 +01:00
Michael Drury 5e00a0d0dd Merge branch 'master' into fix/internal-db-enrich-perf 2023-10-16 13:54:10 +01:00
Andrew Kingston ddda57fa2a Review comments and simplification 2023-10-16 12:01:07 +01:00
Adria Navarro dc4fc27fc8 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 10:38:09 +02:00
Andrew Kingston 27373a9648 Ensure header cells properly update when reordered while a search value is applied 2023-10-13 19:17:49 +01:00
Andrew Kingston e3d6a68ea1 Refactor inline searching to be a separate concept from normal filters, and optimise API usage across all datasources 2023-10-13 19:06:53 +01:00
mike12345567 cef71ff708 Adding test cases for navbar update. 2023-10-13 18:03:10 +01:00
mike12345567 6a4877159d Quick fix to make sure that the important components of the app metadata are correctly updated - as well as adjusting the import modal to check if the export is encrypted. 2023-10-13 17:43:14 +01:00
Andrew Kingston 73ca87dfb6 Fix issue with sort setting 2023-10-13 17:04:45 +01:00
Andrew Kingston b337bd7435 Fix bug in SortableFieldSelect which results in options being available for sort fields 2023-10-13 17:03:19 +01:00
Dean e75624f519 Lint 2023-10-13 16:55:50 +01:00
Sam Rose 89e64d18a5 Remove TODOs. 2023-10-13 16:11:56 +01:00
Sam Rose 0b8c829ed1 Clean up correctly after Postgres integration tests. 2023-10-13 15:59:07 +01:00
Sam Rose e1af1a5be3 Introduce integration tests for `POST /api/datasources/:datasourceId/schema` 2023-10-13 15:29:59 +01:00
Dean 166c517ff8 Fix Block import locations 2023-10-13 15:02:18 +01:00
Dean 336455d689 Merge remote-tracking branch 'origin/master' into feature/buttongroup-component 2023-10-13 14:59:40 +01:00
Dean b8c87224f7 Add/Remove button behaviour, binding label support and default text behaviour. Refactoring and renaming of EditComponentPopoever component 2023-10-13 14:53:39 +01:00
Sam Rose 2f0e88c17c Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if-2 2023-10-13 13:13:41 +01:00
mike12345567 f64800f9f4 Final PR comment. 2023-10-13 13:05:07 +01:00
mike12345567 c5360e1dcb Don't need to put into options obj, reaction does work. 2023-10-13 12:53:18 +01:00
mike12345567 03371005c1 PR comments - addressing API.searchUser updates. 2023-10-13 12:23:28 +01:00
mike12345567 ccfc98120d Adding check to not re-fetch default value. 2023-10-13 11:44:15 +01:00
mike12345567 d44ad549ef t status
Merge branch 'fix/user-search-api' of github.com:Budibase/budibase into fix/user-search-api
2023-10-13 11:34:55 +01:00
mike12345567 563baa53c3 Fix var usage. 2023-10-13 11:28:23 +01:00
Michael Drury ec213a3c7a Merge branch 'master' into fix/user-search-api 2023-10-13 10:41:08 +01:00
mike12345567 d3366a535b PR comments. 2023-10-13 10:22:29 +01:00
Sam Rose a3cb9d7567 Merge branch 'master' of github.com:Budibase/budibase into fix/budi-7433-google-sheets-validation-wont-let-you-import-any-sheets-if 2023-10-13 10:20:54 +01:00
Sam Rose 18363b7b60 Make sure to stop postgres container after the postgres integration tests have run. 2023-10-13 09:50:45 +01:00
Andrew Kingston 804aab3e43 Refactor to use types for fields and add support for searching bigint columns 2023-10-13 09:36:50 +01:00
Adria Navarro 5ef90a3855 Fix import 2023-10-13 09:08:07 +02:00
mike12345567 2e8e21e5d2 Linting. 2023-10-12 19:20:03 +01:00
mike12345567 bd182d5b3b Test cases for updated API. 2023-10-12 19:19:05 +01:00
mike12345567 162f2cb938 Removing un-used function. 2023-10-12 19:07:22 +01:00
mike12345567 535a6e1a47 Minor cleanup. 2023-10-12 19:07:04 +01: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
Sam Rose 6af05500e9 Fix lint warnings. 2023-10-12 17:59:02 +01:00
Sam Rose f4fa542e86 Remove some unused fields, fix a broken spec. 2023-10-12 17:34:48 +01:00
Sam Rose 16451904c9 Expose an errors object via the buildSchemaFromDb endpoint. 2023-10-12 17:12:49 +01:00
Sam Rose 1faf920c67 DatasourcePlus deals exclusively in ExternalTables, reflect that in the types. 2023-10-12 16:38:15 +01:00
mike12345567 6bbce23910 Updating user fetch functionality to send up lucene syntax for searching to global user endpoint. 2023-10-12 16:31:32 +01:00
Sam Rose 85b3af2971 Refactor DatasourcePlus's buildSchema to return a value, rather than rely on member variables. 2023-10-12 16:27:18 +01:00
Andrew Kingston 6dfe2c22af Fix issue with multiple filters at the same time and remove unused variable 2023-10-12 15:46:18 +01:00
Andrew Kingston c906efb972 Fix text colour for inline searching in grid block 2023-10-12 14:37:13 +01:00
Andrew Kingston 6c3fe00b13 Merge branch 'develop' of github.com:Budibase/budibase into grid-inline-searching 2023-10-12 14:34:03 +01:00
Andrew Kingston cfdaa3564c Improve options inline searching 2023-10-12 14:30:41 +01:00
Andrew Kingston 2ef2d07cab Add inline searching for formula and longform columns, and improve searching operators where possible 2023-10-12 14:28:05 +01:00
Sam Rose 6e1962e6ea Plumb Google Sheets table fetching error through to buildSchemaFromDb endpoint. 2023-10-12 12:07:13 +01:00
Andrew Kingston 789bb528f4 Add basic inline searching and fix create first row popup 2023-10-12 11:58:25 +01:00
mike12345567 44fbda9290 Fixing conflict. 2023-10-12 11:18:03 +01:00
Michael Drury a23f918880 Merge branch 'master' into fix/internal-db-enrich-perf 2023-10-12 11:09:17 +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
Andrew Kingston 99f72ffd28 Merge branch 'grid-all-datasources' of github.com:Budibase/budibase into grid-all-datasources 2023-10-12 09:26:49 +01:00
Andrew Kingston 052ec2a7ed Merge branch 'master' into fix/selected-by-user-obscured-nav-item 2023-10-12 08:34:21 +01:00
Andrew Kingston b51950a43a Undo bump comment change 2023-10-12 08:31:46 +01:00
Andrew Kingston 4ed3767324 Merge branch 'develop' into grid-all-datasources 2023-10-12 08:31:09 +01:00
Conor Webb d6f8662e95 Adding onchange actions to code scanner. (#12029)
* Adding onchange actions to code scanner.
* Removed unused code, set updateOnChange to false.

---------

Co-authored-by: Michael Drury <me@michaeldrury.co.uk>
2023-10-12 08:29:40 +01:00
Andrew Kingston 98cb8afdd4 Merge branch 'master' into fix/selected-by-user-obscured-nav-item 2023-10-12 08:28:32 +01:00
mike12345567 b6d56351b0 Merge branch 'backmerge-20231011' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 18:50:22 +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 7090819752 Updating version of VM2 to ^3.9.19 - due to possible RCE issue with Promises (we do not allow async code, but there still could be a risk). 2023-10-11 18:43:25 +01:00
Adria Navarro 4ae3d56023 Update pro ref 2023-10-11 19:42:58 +02:00
Adria Navarro 6869f892a8 Update pro ref 2023-10-11 19:41:31 +02:00
Adria Navarro 1089136a02 Merge branch 'develop' into backmerge-20231011 2023-10-11 19:28:01 +02:00
Adria Navarro 5908a791f2 Return email and names on bb reference api output 2023-10-11 19:10:58 +02:00
mike12345567 d1b7ccd86f Updating docs and removing old documentation pathway. 2023-10-11 17:49:25 +01:00
Martin McKeaveney 0040db27b2 Merge branch 'master' into fix/selected-by-user-obscured-nav-item 2023-10-11 17:32:40 +01:00
Michael Drury 95423fdabc Merge branch 'master' into fix/create-duplicate-queries 2023-10-11 17:27:01 +01:00
mike12345567 09ce950e64 Merge branch 'master' of github.com:Budibase/budibase into fix/internal-db-enrich-perf 2023-10-11 17:24:08 +01:00
Michael Drury e5eb3c98f2 Merge branch 'develop' into grid-all-datasources 2023-10-11 17:21:54 +01:00
mike12345567 b310d7c5a7 Linting. 2023-10-11 17:12:28 +01:00
Sam Rose c76e110350 Add BulkImportResponse as a type after merging Adri's type changes. 2023-10-11 16:58:24 +01:00
Sam Rose 789b247879 Pull origin, resolve merge conflicts. 2023-10-11 16:53:28 +01:00
Sam Rose 123f96db12 Pull origin, resolve merge conflicts. 2023-10-11 16:49:34 +01:00
Michael Drury 7825a56847 Merge branch 'master' into fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column 2023-10-11 16:48:19 +01:00
Sam Rose a0e9abb95b Responding to PR feedback. 2023-10-11 16:45:02 +01:00
Michael Drury d212837b1b Merge branch 'master' into fix/budi-7552-csv-import-messes-up-auto-generated-auto-id-column 2023-10-11 16:42:01 +01:00
mike12345567 d14a773925 Merge branch 'develop' of github.com:Budibase/budibase into backmerge-20231011 2023-10-11 14:02:48 +01:00
Adria Navarro e6b807cf4a Fix merge conflicts 2023-10-11 14:14:55 +02:00
Adria Navarro 62fd9011f3 Merge branch 'labday/type_schema' into feature/multi-user-type-column 2023-10-11 14:13:55 +02:00
Adria Navarro 1bfde57391 Remove anys on tests 2023-10-11 14:08:22 +02:00
Adria Navarro 0720aa8b98 Remove any 2023-10-11 13:55:35 +02:00
Adria Navarro 8fa71e2e1b Clean 2023-10-11 13:54:51 +02:00
Adria Navarro fcaf657e53 More types 2023-10-11 13:53:14 +02:00
Sam Rose 0d9f257cc2 Remove whitespace-only change. 2023-10-11 12:51:57 +01:00
Adria Navarro 514f2b0cef Types 2023-10-11 13:48:28 +02:00
Adria Navarro a3b3c176d3 More types 2023-10-11 13:37:50 +02:00
Adria Navarro 1e8aa9eb60 More types 2023-10-11 13:36:56 +02:00
Sam Rose 7f2ab8b1ae Make sure table gets saved after bulkImport if it has changed. This fixes auto ID columns having the wrong lastID. 2023-10-11 12:29:43 +01:00
Adria Navarro f3762885c6 Clean types 2023-10-11 13:29:35 +02:00
Adria Navarro d03e0cb1f6 Clean code 2023-10-11 13:27:03 +02:00
Adria Navarro 715db97436 Clean code 2023-10-11 13:21:51 +02:00
Adria Navarro 9391854f46 Types 2023-10-11 13:21:19 +02:00
Adria Navarro 6fa5727166 Clean 2023-10-11 13:19:05 +02:00
Adria Navarro ea1c273de0 Clean 2023-10-11 13:18:04 +02:00
Adria Navarro 164e1f4c18 Clean 2023-10-11 13:15:59 +02:00
Adria Navarro 79ef97387b Subtype on datetime 2023-10-11 13:06:18 +02:00
Adria Navarro 3f6d48da1f Fix autoid numbers 2023-10-11 13:03:05 +02:00
Adria Navarro 248c44ac2a Fix relationship field metadata 2023-10-11 12:55:23 +02:00
Adria Navarro 5edc3d3de6 Change formula to be mandatory on FormulaFieldMetadata 2023-10-11 12:34:58 +02:00
Adria Navarro 0113b5d8e8 Remove unnused StringFieldMetadata 2023-10-11 12:33:01 +02:00
Adria Navarro f57104730e Remove subtype from the base field schema 2023-10-11 12:23:54 +02:00
Sam Rose 4bda97d70f Create a failing test for BUDI-7552 2023-10-11 11:07:46 +01:00
Andrew Kingston aa0dc7dd37 Bump 2023-10-11 10:24:49 +01:00
Dean 059bed1cfa Merge remote-tracking branch 'origin/master' into fix/selected-by-user-obscured-nav-item 2023-10-11 10:13:42 +01:00
Dean b4a8f22b2e Initial commit 2023-10-11 10:09:14 +01:00
Andrew Kingston efa2386fd5 Merge branch 'master' into fix/create-duplicate-queries 2023-10-11 07:57:03 +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 74cba9de27 Lint 2023-10-10 18:54:57 +02:00
Adria Navarro 1b7be0d637 Fix import 2023-10-10 18:54:57 +02:00
Adria Navarro a8c814e714 Fixes fixes 2023-10-10 18:54:57 +02:00
Adria Navarro 1f1ebc82e5 Fix more types 2023-10-10 18:54:57 +02:00
Adria Navarro 6c328109b6 Fixes 2023-10-10 18:54:57 +02:00
Adria Navarro ea86ded912 Fixes 2023-10-10 18:54:57 +02:00
Adria Navarro 7ee63365f7 Fix 2023-10-10 18:54:57 +02:00
Adria Navarro 40226c5c3a Fix more types 2023-10-10 18:54:57 +02:00
Adria Navarro 21e2d7ddbe Fix relationship types 2023-10-10 18:54:57 +02:00
Adria Navarro c8ffa98844 Fixes 2023-10-10 18:54:57 +02:00
Adria Navarro dd373cd5e9 Fix types 2023-10-10 18:54:57 +02:00
Adria Navarro fe6535a65f Type schema fields 2023-10-10 18:54:57 +02:00
Michael Drury 5937f2139a Merge branch 'develop' into feat/relationship-configuration 2023-10-10 16:49:50 +01:00
Adria Navarro 54b94f041c Merge pull request #12020 from Budibase/restrict-display-on-import-table
Restrict display on import table
2023-10-10 17:29:08 +02:00
Andrew Kingston a31186ee56 Improve custom data fetch parsing to better support csv-like strings 2023-10-10 15:42:09 +01:00
Adria Navarro 193b8785ee Reset display field if required 2023-10-10 16:17:03 +02:00
Adria Navarro 6124139295 Don't allow selecting unvalid display columns 2023-10-10 16:13:21 +02:00
Adria Navarro 7ba8001ae4 Merge pull request #12008 from Budibase/feature/import_user_column_type
Import user column type
2023-10-10 16:09:50 +02:00
Adria Navarro 31469cb2d6 Fix rebuilding shared-core 2023-10-10 16:05:41 +02:00
Adria Navarro e0f51fb7db Fixes 2023-10-10 15:53:10 +02:00
Adria Navarro 36909ff7f6 Export bannedDisplayColumnTypes 2023-10-10 15:50:12 +02:00
Adria Navarro 530857a6ff Fix 2023-10-10 15:39:05 +02:00
Adria Navarro c49a16fdac Fix tests 2023-10-10 15:35:00 +02:00
Adria Navarro 21420c59fa Fix order 2023-10-10 14:39:55 +02:00
Adria Navarro 78335be26a Clean 2023-10-10 14:20:26 +02:00
Adria Navarro e473c8b3a8 Fix tests 2023-10-10 14:07:12 +02:00
mike12345567 012d0f4fe9 Removing the option to add a filter to the dataset of a user column picker, as there is no current API for searching this. 2023-10-10 12:54:49 +01:00
Adria Navarro 48afa2aa0d Lint 2023-10-10 13:52:47 +02:00
Adria Navarro bd82dae565 Display user/users fields 2023-10-10 13:52:47 +02:00
Adria Navarro d3e8e1f4f8 Fix importing 2023-10-10 13:52:47 +02:00
Adria Navarro b966ed221d Fix bulk delete 2023-10-10 13:52:47 +02:00
Adria Navarro 71159e4f4a Import internal 2023-10-10 13:52:47 +02:00
Adria Navarro fd414dbe4b Enable importing bbrefs as string csv 2023-10-10 13:52:47 +02:00
Adria Navarro 62c6631bc8 Don't cast on the fe 2023-10-10 13:52:47 +02:00
Adria Navarro 979c2aeb00 Return only id and primary display 2023-10-10 13:52:47 +02:00
Adria Navarro df97b7ad93 Expect BB ref data as csv strings 2023-10-10 13:52:47 +02:00
Adria Navarro adf5e6bcf2 Allow users 2023-10-10 13:52:47 +02:00
Adria Navarro f22467fa53 Validate user column 2023-10-10 13:52:47 +02:00
Adria Navarro a514358e57 Allow selecting user column type 2023-10-10 13:52:47 +02:00
Michael Drury 5783ae3e00 Merge branch 'master' into feature/multi-user-type-column 2023-10-10 12:38:51 +01:00
mike12345567 5099d6c3a5 Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/null-user-column-value 2023-10-10 12:10:56 +01:00
Andrew Kingston 08331c3632 Fix bug that was causing an empty grid when adding a new column 2023-10-10 11:59:24 +01:00
mike12345567 27abfdccc2 Removing onChange handler. 2023-10-10 11:50:45 +01:00
mike12345567 95caee66a7 PR comments. 2023-10-10 11:22:59 +01:00
mike12345567 2ef5cb3894 Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/null-user-column-value 2023-10-09 18:31:13 +01:00
mike12345567 fa5e340e60 Merge branch 'feature/multi-user-type-column' of github.com:Budibase/budibase into fix/external-table-keep-types 2023-10-09 18:30:47 +01:00
mike12345567 635f33f81e Make sure that external tables preserve the BB_REFERNECE type, under the hood it is text/array, but it should continue to be treated correctly as its own indpendent type when updating Budibase tables (fetching). 2023-10-09 18:28:09 +01: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
Andrew Kingston 513aaf1174 Update custom datasource label to 'JSON / CSV' 2023-10-09 16:03:12 +01:00
Andrew Kingston b17ec630c1 Ensure user table editing is still allowed for old apps that are imported 2023-10-09 15:09:11 +01:00
Andrew Kingston 73e208292f Simplify logic to be more readable 2023-10-09 15:05:57 +01:00
Andrew Kingston a4e3cd72cc Add new app feature flag to allow disable user metadata columns in new apps, but allow them in old apps 2023-10-09 15:01:16 +01:00
Adria Navarro 7d6cd53c29 Add comments 2023-10-09 15:37:42 +02:00
Adria Navarro 6f77be622f Simplify 2023-10-09 15:36:17 +02:00
Adria Navarro 0909e0547e Process formulas after processing complex fields 2023-10-09 15:30:07 +02:00
Adria Navarro 065e633742 Don't allow users column as primary display 2023-10-09 15:30:07 +02:00
Adria Navarro d7aa23f740 Testing 2023-10-09 13:21:40 +02:00
Adria Navarro a5477f14d2 Handle users on search input 2023-10-09 13:21:27 +02:00
Andrew Kingston a781860b1c Improve grid handling of non datasource plus and fix focused cell issue with row click actions 2023-10-09 09:36:01 +01:00
Adria Navarro cd5835bfeb Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support 2023-10-09 09:37:44 +02:00
Andrew Kingston c48eca4a0f Update if logic to avoid redundant check 2023-10-09 08:33:28 +01:00
Andrew Kingston e415c516e9 Merge branch 'develop' of github.com:Budibase/budibase into grid-all-datasources 2023-10-09 08:31:50 +01:00
Andrew Kingston 71a8d5695b Merge branch 'develop' of github.com:Budibase/budibase into grid-all-datasources 2023-10-09 08:24:06 +01:00
Andrew Kingston 8ce001cd4a Merge branch 'develop' into grid-mobile-scrolling 2023-10-09 08:23:43 +01:00
Adria Navarro 047936bcbf Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support 2023-10-09 09:22:55 +02:00
melohagan d8f1b7960e Fix form block crash on no data tables (#11995)
* Fix form block crash on no data tables

* Refactor

* Refactor
2023-10-09 08:22:19 +01:00
Andrew Kingston 2171b14f50 Merge branch 'develop' into grid-clipboard 2023-10-09 08:06:18 +01:00
Andrew Kingston 0303027754 Merge branch 'develop' into grid-mobile-scrolling 2023-10-09 08:06:04 +01:00
Andrew Kingston 04271838c3 Merge branch 'develop' of github.com:Budibase/budibase into grid-all-datasources 2023-10-09 08:05:57 +01:00
mike12345567 0dc28122fa Adding test case. 2023-10-06 16:38:36 +01:00
mike12345567 d4335bca73 Quick fix for saving current user._id - make sure it is the correct format of ID. 2023-10-06 16:31:48 +01:00
mike12345567 df29f4c30f Merge branch 'develop' of github.com:Budibase/budibase into backmerge-6-10-23 2023-10-06 15:56:09 +01:00
mike12345567 d8b7f930e9 Merging. 2023-10-06 15:55:10 +01:00
Michael Drury c7c63a7b83 Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support 2023-10-06 15:54:12 +01:00
Michael Drury 7934e984cc Merge branch 'master' into fix/user-column-search-mapping 2023-10-06 14:30:09 +01:00
melohagan 23b7a8de72 Allow relationship to be deleted even if missing (#11991)
* Allow relationship to be deleted even if missing

* Comment
2023-10-06 14:17:36 +01:00
mike12345567 575693d69a Updating pro. 2023-10-06 14:07:12 +01:00
Adria Navarro 434f2a0670 More nx cache 2023-10-06 14:52:32 +02:00
Adria Navarro 13e985813c Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-06 14:44:35 +02:00
Adria Navarro da53f0a366 Cache output files 2023-10-06 14:32:17 +02:00
mike12345567 bc17bc43fa Fixing issue brought up by some unit tests. 2023-10-06 13:32:12 +01:00
mike12345567 7acc164e12 Fix build. 2023-10-06 13:28:27 +01:00
mike12345567 017b522a3f Comment to explain function. 2023-10-06 12:56:55 +01:00
mike12345567 18cca671d4 PR comments. 2023-10-06 12:56:07 +01:00