Commit Graph

8782 Commits

Author SHA1 Message Date
melohagan 24a00c66bb Unexpected token when export data (#10721)
* Tidy ID string for JSON parse

* Display error for composite keys

* Unit test WIP

* directly assign the mock function on the datasource

* Unit tests for exportRows ID handling

---------

Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
2023-06-09 13:01:55 +01:00
Martin McKeaveney fa64ca3d6b lint 2023-06-08 12:44:41 +01:00
Martin McKeaveney a9787ff608 fix REST connector failure to save 2023-06-08 12:00:34 +01:00
mike12345567 06a7a31847 Hardcoding the top level path for the app service as well. 2023-06-07 16:39:33 +01:00
mike12345567 8d7119a363 Make sure top level path is resolved correctly. 2023-06-07 16:37:42 +01:00
mike12345567 9ebd90a07d Don't resolve anymore given we have an absolute top level path 2023-06-07 16:36:43 +01:00
mike12345567 70e4795349 Fix top level path within the single image to make sure it can find builder assets correctly. 2023-06-07 16:35:36 +01:00
melohagan 91acb1b3eb Set sourceId (#10769) 2023-06-07 14:01:24 +01:00
Adria Navarro d21274ef2b Remove frozen-lockfile from dockerfiles 2023-06-07 09:05:34 +01:00
Adria Navarro deeba8bae3 Revert "Merge branch 'develop' into master"
This reverts commit 6f29c978e0, reversing
changes made to 1c6ff73c19.
2023-06-06 22:06:34 +01:00
Adria Navarro fe9a220717 Add yarn.lock 2023-06-06 14:45:20 +01:00
Adria Navarro 12b69dc37d Remove --configuration=production 2023-06-06 14:45:20 +01:00
Rory Powell ad7f6cf5e2 Merge branch 'develop' into merge-master 2023-06-06 11:49:49 +01:00
Adria Navarro 21e870109c Save datasource 2023-06-06 11:29:50 +01:00
Adria Navarro 25c921e340 Validate url 2023-06-06 11:29:49 +01:00
Adria Navarro 1e238ce693 Validate google sheets url 2023-06-06 11:29:49 +01:00
Andrew Kingston d70e49d74f Add event for tracking user collaboration 2023-06-06 10:11:51 +01:00
Rory Powell abbd8c5c8b Merge branch 'master' into develop 2023-06-05 23:19:43 +01:00
Andrew Kingston 4a0e23a171 Transfer lock to next oldest session when disconnecting from the builder 2023-06-05 13:54:17 +01:00
Andrew Kingston f7e21c3348 Remove log from websocket heartbeat 2023-06-05 11:55:45 +01:00
mike12345567 0506096e72 Fixing filtering plus pagination in googlesheets, the pagination previously was first which broke the filtering. 2023-06-05 10:03:47 +01:00
mike12345567 770f7c1dc6 Merge branch 'develop' of github.com:Budibase/budibase into fix/google-sheets-issues 2023-06-05 09:36:45 +01:00
mike12345567 e7649374d2 Fixing googlesheets filtering by _id - there was an issue with the response API giving _rowNumber rather than the expected primary key of rowNumber, need to update the filters accordingly. 2023-06-02 18:25:35 +01:00
mike12345567 213315e14f Fixing issue with row deletion not returning the _id of the row which was deleted in googlesheets. 2023-06-02 18:03:43 +01:00
Andrew Kingston 6f51843875 Fix TS issue 2023-06-02 16:22:07 +01:00
Michael Drury adbdaf394a Small update to make sure that save/patch calls to the rows API (all DS+) return the squashed relationships, not the whole structure. 2023-06-01 18:18:12 +01:00
Andrew Kingston d8d3d71523 Update websocket logic to ignore events trigger by API requests originating from the same session 2023-06-01 17:14:32 +01:00
Michael Drury 8e4f0e531c Merge pull request #10755 from Budibase/fix/datasource-info-endpoint
Datasource info endpoint update
2023-06-01 12:29:46 +01:00
Michael Drury 67588f1051 Adding a JSON parse incase the input is actually an array in the form of a string (HBS). 2023-06-01 12:14:34 +01:00
Michael Drury cde4dabe42 Fixing some redis type errors. 2023-06-01 11:10:39 +01:00
deanhannigan a782a8b9b1 Merge pull request #10758 from Budibase/fix/reduce-array-row-parse-log-level
Reduced log level of array parsing on row import
2023-06-01 10:41:19 +01:00
Michael Drury fde94a262f Moving ioredis-mock dependency back to dev dependency in backend-core. 2023-06-01 10:13:54 +01:00
Dean 6ee83e2da8 Reduced log level of parse array attempt 2023-06-01 09:05:22 +01:00
Michael Drury 022016366e Adding ioredis-mock as an actual dependency for builds. 2023-06-01 00:19:24 +01:00
Michael Drury a3f9759a47 Reverting ioredis-mock removal for test cases - will come back to this in future as it currently breaks pro tests. 2023-06-01 00:02:55 +01:00
mike12345567 16e929bd81 Removing checks around websockets as redis properly available in testing now. 2023-05-31 18:09:15 +01:00
mike12345567 969ee52c29 Fixing merge conflict. 2023-05-31 18:08:29 +01:00
mike12345567 039e78379f Fixing lint issue. 2023-05-31 17:48:18 +01:00
mike12345567 fba3ec987e Merge branch 'develop' of github.com:Budibase/budibase into fix/datasource-info-endpoint 2023-05-31 17:37:17 +01:00
mike12345567 249625ad1a Updating backend tests to actually utilise the redis container which is spun up as part of the tests, doing away with the somewhat problematic ioredis-mock which was breaking some tests due to the addition of the changes for multi-dev collab. 2023-05-31 17:18:01 +01:00
mike12345567 651d50a064 Updating datasource information endpoint to POST which allows sending up an unfinished/unsaved datasource for fetching information with. Also changing how verification and information endpoints work so that enrichment is used and therefore env vars can also be used. 2023-05-31 17:04:29 +01:00
Andrew Kingston 680e609b52 Remove plural forms of enums and use TS enum rather than JS const 2023-05-31 17:03:14 +01:00
Andrew Kingston 8a2d4b7052 Merge branch 'develop' of github.com:Budibase/budibase into websocket-redis-integration 2023-05-31 16:28:14 +01:00
Andrew Kingston ffbbf04e86 Lint 2023-05-31 16:08:35 +01:00
Andrew Kingston a7c6298d1f Ensure socket pruning due to redis TTL expiry works as expected 2023-05-31 15:37:39 +01:00
Dean bb44c9f07f Added console log 2023-05-31 15:20:25 +01:00
Andrew Kingston 05e34076f7 Fully rewrite websocket redis integration to use individual keys per session, enable TTLs on sesisons, prune sessions when users connect and add a heartbeat to sockets 2023-05-31 15:13:22 +01:00
Peter Clement c6d0da33f4 add import for performance lib 2023-05-31 11:33:52 +01:00
Andrew Kingston d926650232 Add back in functionality to select different redis DB's per client 2023-05-31 10:52:39 +01:00
Peter Clement 162ea5d969 update log formatting 2023-05-31 10:51:54 +01:00