Commit Graph

8891 Commits

Author SHA1 Message Date
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
Adria Navarro 4eac5f93ca Fix test 2023-06-07 14:10:02 +01:00
Adria Navarro d8fc37a760 Revert "Merge pull request #10808 from Budibase/undo_wrong_merge_from_develop"
This reverts commit 4ccc98103c, reversing
changes made to 500424c651.
2023-06-07 14:08:47 +01:00
Adria Navarro fdd4492830 Merge branch 'develop' into master-backmerge 2023-06-07 14:07:16 +01:00
melohagan 91acb1b3eb Set sourceId (#10769) 2023-06-07 14:01:24 +01:00
Adria Navarro a14b29efac Improve fetch performance 2023-06-07 12:29:36 +01:00
Adria Navarro dd58aaf5cb Use fancycheckboxgroup 2023-06-07 11:44:32 +01:00
Adria Navarro bb901d94d2 Clean code 2023-06-07 11:32:42 +01:00
Adria Navarro 5135ac36b7 Fix fetching tables 2023-06-07 11:31:10 +01:00
Adria Navarro 95c66edb65 Clean code 2023-06-07 11:31:10 +01:00
Adria Navarro c47656d423 Save datasource 2023-06-07 11:31:10 +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
mike12345567 dab1db2271 Updating datasource save API to allow specifying a filter for which tables to fetch and then linking this up with the new frontend. 2023-06-06 18:27:03 +01:00
mike12345567 cc60baa3d1 Some fixes for BBUI and updating postgres table name fetching to get uniques. 2023-06-06 17:40:14 +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
Adria Navarro 1f428bd5c2 Fix test 2023-06-06 12:17:56 +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
Andrew Kingston d3fdb52bf5 Store all socket users in redis to allow all server instances to be aware of all users 2023-05-31 10:21:50 +01:00
Peter Clement 702c908ae8 remove logging 2023-05-31 09:42:44 +01:00
Michael Drury 1547280514 Merge pull request #10739 from Budibase/fix/multi-dev-conflicts
Multidev lock and conflict management
2023-05-30 22:57:00 +01:00
Rory Powell a1dbd67535 Remove debug log 2023-05-30 19:23:19 +01:00
Rory Powell b0783d373a Lint 2023-05-30 19:16:36 +01:00
mike12345567 7c7bd4d5cb Fix for debugging with webstorm the old way (if desired), updating the builder middleware to be more multi-dev capable, ignoring 409s when attempting to update the last updated at for apps (if multiple devs hit at same time, only use one) also updating writethrough cache to retry once, with the extended TTL on locks, plus the multi-dev collab it can take a minute to update usage quota doc when a lot of updates occur at once. 2023-05-30 17:41:20 +01:00
Peter Clement ef9fc94728 Merge branch 'fix/looping-performance-bug' of github.com:Budibase/budibase into fix/looping-performance-bug 2023-05-30 16:52:34 +01:00
Peter Clement ed6cd8144b lint 2023-05-30 16:52:22 +01:00
Rory Powell 207512396a Merge pull request #10738 from Budibase/automation-investigation
Automation investigation logging + max doc size fix for automation log
2023-05-30 16:45:27 +01:00
Rory Powell df5654a7e7 Merge branch 'develop' into fix/looping-performance-bug 2023-05-30 16:41:11 +01:00
Rory Powell 6230e62b9b Automation investigation logging + max doc size fix for automation log 2023-05-30 16:37:39 +01:00
Peter Clement 3119ba5a8d remove log 2023-05-30 14:41:04 +01:00
Peter Clement 0a91e5bed1 update let to const 2023-05-30 14:26:49 +01:00
Peter Clement 5a7f0ba586 Fix performance issue with looping and context 2023-05-30 14:25:28 +01:00
Gerard Burns 23ee9f4af8 Post Sign Up Onboarding Changes (#10701)
* wip

* PR Feedback

* Fixes

* PR Feedback

* PR Feedback

* PR Feedback
2023-05-30 12:54:57 +01:00
Andrew Kingston be40d72f55 Merge pull request #10712 from Budibase/data-section-multidev
Multiple user collaboration for data section
2023-05-30 09:08:14 +01:00
Adria Navarro e3ce16d0c9 Update local versions to 0.0.0 2023-05-29 10:54:10 +02:00
Peter Clement 55e56e2c1f Merge branch 'feature/sync-automations' of github.com:Budibase/budibase into feature/sync-automations 2023-05-26 16:58:12 +01:00
Peter Clement 2ae960e2ee fix broken test 2023-05-26 16:58:00 +01:00
mike12345567 7ba21d836b Merge branch 'develop' of github.com:Budibase/budibase into feature/sync-automations 2023-05-26 16:42:01 +01:00
Peter Clement 66e1f57a3d one more feature check for safety on the trigger 2023-05-26 16:06:16 +01:00
Adria Navarro 489ca561b7 Check types 2023-05-26 13:54:10 +02:00
deanhannigan bd50f32f0d Merge pull request #10713 from Budibase/fix/internal-view-eval-fn
Fix for fetching Internal DB Views in QA cloud
2023-05-26 11:51:07 +01:00
Peter Clement 5a73b02827 update feature array to be an object 2023-05-26 11:02:47 +01:00
Dean e1a87f2072 Reverted eval call to direct. Indirect appears to cause issues in cloud 2023-05-26 10:22:28 +01:00
Adria Navarro e563c70163 Merge pull request #10710 from Budibase/chore/esbuild_pro
Chore - "esbuild"ing pro
2023-05-26 10:55:20 +02:00
Adria Navarro 77a619945b Merge pull request #10680 from Budibase/budi-6933-verify-data-source-connection-during
Verify data source connection before saves
2023-05-26 10:47:42 +02:00
Andrew Kingston 520158c8f9 Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-26 09:39:06 +01:00
Peter Clement 70dfd9e8e5 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-26 09:26:51 +01:00
Andrew Kingston cc7df474c9 Standardise usage of user avatars and colours across the entire platform 2023-05-26 09:24:53 +01:00
Adria Navarro 35d5df7ef0 Use local refs 2023-05-26 10:10:55 +02:00
deanhannigan 567ee451dd Merge pull request #10702 from Budibase/fix/data-export-rows
Fixes and updates for export internal rows
2023-05-26 09:08:35 +01:00
melohagan b5c98871ad Update table data via CSV import (#10313)
* Add identifierFields select for import

* Update rows on import (Internal DB)

* Only allow internal DB to upsert import CSV

* Clear identifierFields when turning off update

* Passing table instead of tableId

* Pass table

* Pass tableType
2023-05-25 18:05:07 +01:00
Dean 146940f6ae Added error handling for export row front end and fixed row export backend behaviour 2023-05-25 17:50:52 +01:00
Martin McKeaveney 8061c700c6 Merge pull request #10425 from Budibase/feature/chatgpt-automationblock
Feature/chatgpt automationblock
2023-05-25 13:39:57 +01:00
Adria Navarro 014a4cd467 Undo types 2023-05-25 12:22:53 +02:00
Adria Navarro 429dc8f6d2 Tidy up tsconfigs 2023-05-25 11:49:18 +02:00
Peter Clement b0a32f03b4 remove log 2023-05-25 09:14:09 +01:00
Andrew Kingston 5e480a1527 Use socker.io redis adapter to broadcast events to all server instances 2023-05-25 08:48:56 +01:00
Andrew Kingston 01ffa34dea Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-25 08:47:39 +01:00
Martin McKeaveney 77c2e309dd merge 2023-05-24 17:35:04 +01:00
Martin McKeaveney f86d321e2e restrict openai just to self host 2023-05-24 17:17:23 +01:00
mike12345567 733e724eb3 PR comments. 2023-05-24 16:38:24 +01:00
mike12345567 90ffa338c3 Fixes the single image build, as well as fixing the nodemon process for the server. 2023-05-24 16:23:34 +01:00
Budibase Release Bot cbe76ee65b Update pro version to 2.6.23 2023-05-24 14:27:59 +00:00
Martin McKeaveney db5d051755 GPT4 support 2023-05-24 15:26:27 +01:00
Budibase Release Bot df8e76b153 v2.6.23 2023-05-24 14:26:12 +00:00
Andrew Thompson b8d0c06296 Merge pull request #10668 from Budibase/budi-7038-allow-role-selection-for-snowflake-datasource-queries
add role field to snowflake datasource connection
2023-05-24 15:17:46 +01:00
Andrew Kingston 5cf4753853 Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-24 15:14:32 +01:00
Peter Clement 4d5a922684 Merge remote-tracking branch 'origin/develop' into feature/sync-automations 2023-05-24 15:05:58 +01:00
Peter Clement a9bb534cdf set flag in automation orchestrator 2023-05-24 14:41:58 +01:00
Adria Navarro b264708af6 Merge remote-tracking branch 'origin/develop' into chore/esbuild 2023-05-24 14:17:32 +02:00
Martin McKeaveney bbab2a9adc merge 2023-05-24 11:25:49 +01:00
Adria Navarro 237cda064c Simplify integration features 2023-05-24 10:50:51 +02:00
Budibase Release Bot bac252364b Update pro version to 2.6.22 2023-05-24 07:54:03 +00:00
Budibase Release Bot 99b4370a75 v2.6.22 2023-05-24 07:52:24 +00:00
Adria Navarro c3301e393e Optimise nx dependencies 2023-05-23 23:11:26 +02:00
Peter Clement 6818e4debb check collection actually exists 2023-05-23 16:12:20 +01:00
mike12345567 5039e63bfb PR comments. 2023-05-23 16:07:45 +01:00
Peter Clement 8d3a5307ed sync automation webhooks tests 2023-05-23 15:55:52 +01:00
Peter Clement 986348f511 sync automation tests 2023-05-23 15:55:25 +01:00
Adria Navarro c3036af072 Merge pull request #10659 from Budibase/feature/table-fetching
Datasource+ table fetching API
2023-05-23 15:39:18 +02:00
andz-bb 7b9d56ac25 add role field to snowflake datasource connection 2023-05-23 12:38:50 +01:00
mike12345567 590844c8a9 PR comments. 2023-05-23 12:22:22 +01:00
Adria Navarro 375a8076b1 Rename command 2023-05-23 12:54:15 +02:00
Adria Navarro 1be822398f Undo run in band 2023-05-23 12:46:24 +02:00
Adria Navarro d1ce04736e Addressing PR comments 2023-05-23 11:54:10 +02:00
Adria Navarro 8b912dc8ed Build all 2023-05-23 11:46:20 +02:00
Adria Navarro 931458094b Rename 2023-05-23 11:43:57 +02:00
Adria Navarro aa58a24a6d Change query for retrieving postgres primary keys 2023-05-23 11:20:18 +02:00
Adria Navarro e838a90d3e Add small unit test 2023-05-23 10:22:26 +02:00
Adria Navarro 023373bb25 Remove unnecessary load info 2023-05-23 10:18:37 +02:00
Adria Navarro b7b604ca00 Improve test 2023-05-23 10:17:42 +02:00
Adria Navarro 5ea19986b1 Add basic test 2023-05-23 10:14:06 +02:00
Adria Navarro 74ea851fa3 Fetch google sheets 2023-05-23 09:55:46 +02:00
mike12345567 76eef8d3d4 Fixing some test issues. 2023-05-22 16:25:50 +01:00
Adria Navarro 1805d4d1ae Remove unnecessary yarn.lock 2023-05-22 17:22:41 +02:00
Adria Navarro 9f9c2d66e0 Remove runinband for actions 2023-05-22 17:02:44 +02:00
Andrew Kingston 9ab5c8792a Merge branch 'develop' of github.com:Budibase/budibase into data-section-multidev 2023-05-22 16:01:50 +01:00
Andrew Kingston cfa07a68ae Handle table, query and datasource events using builder socket 2023-05-22 15:59:44 +01:00
Peter Clement a8e40d711b uneeded input value 2023-05-22 15:53:20 +01:00
Peter Clement 754b30dd5c add features property to automation defintions 2023-05-22 15:46:42 +01:00
mike12345567 83ddb9c8dd Adding feature to denote fetch table names function. 2023-05-22 14:28:18 +01:00
mike12345567 d6c07f47b6 Adding base implementation for googlesheets integration. 2023-05-22 13:57:56 +01:00
Adria Navarro babd0d79a0 Remove wrong config 2023-05-22 14:37:45 +02:00
Adria Navarro a22f73037c Fix test 2023-05-22 14:33:38 +02:00
Adria Navarro 03c33cec54 Fix dependencies on checks 2023-05-22 14:27:06 +02:00
Budibase Release Bot eb899cecac Update pro version to 2.6.21 2023-05-22 12:22:19 +00:00
Budibase Release Bot eb2984180f v2.6.21 2023-05-22 12:20:50 +00:00
Andrew Kingston 15ff635c6e Merge pull request #10591 from Budibase/fix/automation-filtering
Fix automation filtering on number fields
2023-05-22 13:12:35 +01:00
mike12345567 ad358fe1ca Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching 2023-05-22 12:56:10 +01:00