Commit Graph

21430 Commits

Author SHA1 Message Date
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
Adria Navarro dc4fc27fc8 Merge branch 'master' into BUDI-7573/use_existing_image_cache 2023-10-16 10:38:09 +02: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
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
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
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
Sam Rose 6e1962e6ea Plumb Google Sheets table fetching error through to buildSchemaFromDb endpoint. 2023-10-12 12:07:13 +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
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