Adria Navarro
f446bd96dd
Merge branch 'master' into backmerge-master
2023-06-15 10:16:21 +01:00
Andrew Kingston
3cbebaf40d
Restore original comment
2023-06-15 09:29:46 +01:00
Andrew Kingston
99a8fc7c12
Revert websocket changes and just fetch datasources constantly
2023-06-15 09:27:45 +01:00
Andrew Kingston
5e5dc902d1
Broadcast datasource change via websocket when making changes to tables
2023-06-15 09:04:21 +01:00
Martin McKeaveney
0545eda29d
Merge pull request #10905 from Budibase/feature/airgap-assets-support
...
removing need for external internet assets and self hosting our own f…
2023-06-14 17:37:43 +01:00
Adria Navarro
e6ad3a4719
Type pg
2023-06-14 17:17:29 +01:00
Jonny McCullagh
757ca6a166
Merge master develop ( #10897 )
...
* Binding drawer fixes
* Added missing headless flag for the bindable combobox
* Fix for QueryEditor width
* Fix svelte transitions in grid new row component breaking routify
* Bump version to 2.7.7
* fix REST connector failure to save
* Bump version to 2.7.8
* Bump version to 2.7.9
* 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>
* Return all rows if oneOf value is falsey (#10638 )
* Bump version to 2.7.10
* Make sure divider fields are left-most (#10627 )
* Make sure divider fields are left most
* Refactor
* Bump version to 2.7.11
* Temporarily remove the focus store update as it triggers a full redraw of the component settings
* Linting
* Removed commented out code
* Bump version to 2.7.12
* Bump version to 2.7.13
* Do not show Business tag for Email action (#10867 )
* Bump version to 2.7.14
* new deploy trigger (#10892 )
* point the deploys at the new env
* Bump version to 2.7.15
---------
Co-authored-by: Dean <deanhannigan@gmail.com>
Co-authored-by: Andrew Kingston <andrew@kingston.dev>
Co-authored-by: Budibase Staging Release Bot <>
Co-authored-by: Martin McKeaveney <martinmckeaveney@gmail.com>
Co-authored-by: Martin McKeaveney <martin@budibase.com>
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Adria Navarro <adria@budibase.com>
2023-06-14 16:18:09 +01:00
Adria Navarro
f31c615e18
Merge branch 'develop' into backmerge-master
2023-06-14 15:45:47 +01:00
Martin McKeaveney
1ad150827a
fix deps
2023-06-14 15:35:16 +01:00
Martin McKeaveney
307e6dde02
update bblogoimgur to bblogo
2023-06-14 15:21:46 +01:00
Martin McKeaveney
0f02b31ba7
lint
2023-06-14 15:12:39 +01:00
Michael Drury
6776f3d78c
Merge pull request #10881 from Budibase/fix/budi-7026
...
Custom roles breaking app access when not published
2023-06-14 15:10:30 +01:00
Michael Drury
fdad2e6bf3
Merge pull request #10895 from Budibase/fix/budi-7099
...
MySQL cyclic JSON conversion issue with primary display columns
2023-06-14 15:09:17 +01:00
Martin McKeaveney
6fcdcf947e
update budibaseapp url
2023-06-14 15:05:08 +01:00
Martin McKeaveney
cd1675098f
removing need for external internet assets and self hosting our own fonts
2023-06-14 14:54:27 +01:00
Adria Navarro
9832da4067
Merge branch 'develop' into budi-7010-encrypt-app-exports
2023-06-14 14:40:10 +01:00
Adria Navarro
672804c150
Merge pull request #10900 from Budibase/budi-7010/export_controller_as_post
...
BUDI-7010 - Export controller as post
2023-06-14 14:38:01 +01:00
mike12345567
3f63a81c01
PR comments.
2023-06-14 14:34:12 +01:00
Adria Navarro
052ecbb59a
Merge branch 'budi-7010/export_controller_as_post' into budi-7010-encrypt-app-exports
2023-06-14 14:28:26 +01:00
Adria Navarro
fe1a64964a
Fix and improve tests
2023-06-14 14:20:20 +01:00
Adria Navarro
4b065dda8b
Fix exports/imports
2023-06-14 12:32:26 +01:00
Adria Navarro
9a5f67b7d8
Merge branch 'budi-7010/frontend-encrypt-app-exports' into budi-7010/frontend-encrypt-app-imports
2023-06-14 11:21:19 +01:00
Adria Navarro
a4f0b45d5e
Fix merge
2023-06-14 11:17:32 +01:00
Adria Navarro
a9bf6967dc
Merge branch 'budi-7010/export_controller_as_post' into budi-7010-encrypt-app-exports
2023-06-14 11:17:26 +01:00
Adria Navarro
a68dc7c965
Remove excludeRows and appName from the querystrings
2023-06-14 11:06:46 +01:00
Adria Navarro
bfd444dbaa
Change the download to be a post
2023-06-14 10:47:46 +01:00
mike12345567
68082eecf9
Fix for circular issue with primary display fields on SQL tables introduced in most recent update - if somehow the primary display field is set to a relationship field there was a chance of cyclic structure occurring which Koa could not convert to JSON.
2023-06-13 18:21:22 +01:00
Adria Navarro
3d01775b89
Handle errors
2023-06-13 17:08:33 +01:00
Adria Navarro
f3b461a62c
Handle password on creation
2023-06-13 16:50:56 +01:00
mike12345567
60d58034dd
Fixes #6346 - issue with date parsing, adding in some testing around it.
2023-06-13 16:11:22 +01:00
mike12345567
1bdf55e966
Some type updates and fixes for test case.
2023-06-13 14:45:33 +01:00
Adria Navarro
c1e09d0305
Close client on testconnection
2023-06-13 10:49:09 +01:00
Adria Navarro
3aaaad8792
Update mongodb
2023-06-13 10:48:42 +01:00
mike12345567
bedc8e5cce
Fix for custom roles that have not been published causing users to be unable to access an app completely. They should instead be treated as public users as their role isn't valid.
2023-06-12 18:39:30 +01:00
Adria Navarro
81522d0784
Clean defaults
2023-06-12 17:51:21 +01:00
Adria Navarro
551ca404b4
Decrypt file
2023-06-12 16:27:19 +01:00
mike12345567
2486937c43
Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend
2023-06-12 16:16:12 +01:00
Adria Navarro
1f4cdf348f
Encrypt files
2023-06-12 11:49:38 +01:00
Adria Navarro
d7f64fe6a4
Update tar libs
2023-06-12 11:12:22 +01:00
Adria Navarro
978591e2ba
Enable encrypting
2023-06-09 16:26:48 +01:00
Adria Navarro
4acfc623b4
Use import for tar
2023-06-09 14:52:19 +01:00
Michael Drury
deffe9d3d4
Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend
2023-06-09 13:21:30 +01:00
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
Adria Navarro
8492ef18fa
Ignore 409 errors on user syncs
2023-06-09 12:36:09 +01:00
melohagan
c0578d4cc2
Send meeting invite via automation email smtp ( #10787 )
...
* Pass calendar props into sendSmtpEmail
* Add calendar event to message
* Add Checkbox and DatePicker automation field UI
* Add URL prop
* Add url to sendSmtpEmail unit test
* Refactor
* Code review comments
* Make location optional
* Add EmailInvite type
---------
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-06-08 14:25:35 +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
9ee06e8e42
Updating fetch within main datasource UI to mimic that of the onboarding.
2023-06-07 18:34:32 +01:00
mike12345567
dd8f7fdb91
Merge branch 'develop' of github.com:Budibase/budibase into feature/table-fetching-frontend
2023-06-07 18:06:27 +01:00
mike12345567
e07dfab98c
Merge branch 'master' of github.com:Budibase/budibase into develop
2023-06-07 18:05:29 +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
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 4ccc98103c500424c651
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 6f29c978e01c6ff73c19
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
