1
0
Fork 0
mirror of synced 2024-09-27 23:01:51 +12:00
Commit graph

4586 commits

Author SHA1 Message Date
Andrew Kingston
fe5d5ce075 Update tracking of collaboration events to only count unique users, and maybe fire in cloud envs 2023-06-30 15:55:28 +01:00
mike12345567
4428678ebd Quick fix for QA-core tests, when encrypt is undefined for MS-SQL, it defaults to true, need to be aware of this so can set trustServerCertificate correctly. Also fixing the naming of a test. 2023-06-30 12:05:18 +01:00
mike12345567
0d1941f264 Fix merge conflict. 2023-06-30 11:36:08 +01:00
mike12345567
6495b55b9d Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-29 17:06:14 +01:00
mike12345567
63d16f1809 Only enable trust server certificate if encryption enabled. 2023-06-29 16:09:25 +01:00
mike12345567
7b6246ee59 Fixes discovered by MS-SQL validator tests in QA-core, fixing custom ports being used (not default) and allowing the use of self signed certificates. Also updating an error message in line with Peters changes. 2023-06-29 16:09:25 +01:00
mike12345567
a66d5bf7be Merge branch 'develop' of github.com:Budibase/budibase into feat/surface-sql-errors 2023-06-28 17:58:56 +01:00
Michael Drury
72e7373073 Merge pull request #11058 from Budibase/feature/budi-7076
Datasource settings tab for SQL databases and SQL schema export functionality
2023-06-28 17:56:03 +01:00
mike12345567
30a9b349d8 Merge branch 'develop' of github.com:Budibase/budibase into feat/surface-sql-errors 2023-06-28 17:31:03 +01:00
mike12345567
81c8bee81e Quick fix to stop custom role names from being updated. 2023-06-28 17:17:24 +01:00
mike12345567
d8fae3a348 Adding SQL export functionality and settings tab for SQL databases. 2023-06-28 16:52:45 +01:00
Adria Navarro
ec3f962d3c Fix typings 2023-06-28 15:16:47 +01:00
Adria Navarro
b6f9ae762d Lint 2023-06-28 14:59:49 +01:00
Adria Navarro
47d6113fee Submit nested 2023-06-28 14:33:52 +01:00
Adria Navarro
a95a5f1cb2 Populate fields 2023-06-28 14:33:52 +01:00
Adria Navarro
758b4f8254 Allow open by default for field groups 2023-06-28 14:33:52 +01:00
Adria Navarro
352ea72c53 Select and conditional fields 2023-06-28 14:33:52 +01:00
Adria Navarro
8a7d610faf Move creation pool on the connect step 2023-06-28 14:33:51 +01:00
Adria Navarro
c9bee9e423 Display errors 2023-06-28 14:33:51 +01:00
Adria Navarro
1e5492b18d Type mssql 2023-06-28 14:33:51 +01:00
mike12345567
25d0f3f518 Adding settings tab for SQL datasources. 2023-06-28 11:59:53 +01:00
Peter Clement
87768fd577 update error messages: 2023-06-28 09:28:40 +01:00
Peter Clement
fed6a83bca remove incorrect psql codes 2023-06-28 09:18:41 +01:00
Andrew Kingston
ee74900abb Update comments 2023-06-27 17:45:24 +01:00
Andrew Kingston
f0c8cb82b2 Remove unused tenantId 2023-06-27 17:43:52 +01:00
Andrew Kingston
801f5655ac Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-27 16:50:51 +01:00
Michael Drury
f7cdf5f2bc Merge pull request #11001 from Budibase/feature/custom-role-readable-ids
Custom roles - readable IDs
2023-06-27 16:17:08 +01:00
Michael Drury
5e8cf41feb Merge pull request #11013 from Budibase/fix/sql-relationship-fixes
Further SQL relationship fixes
2023-06-27 16:16:53 +01:00
Andrew Kingston
8c9d4a9126 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-27 16:09:59 +01:00
Peter Clement
cf0300973a add error mapping system 2023-06-27 15:28:10 +01:00
Peter Clement
46a9142676 propagate errors coreectly for datasource plus 2023-06-27 15:27:56 +01:00
mike12345567
fc537a0aab Further PR comments. 2023-06-27 14:56:24 +01:00
Michael Drury
a3ebcb2896 Merge pull request #11033 from Budibase/fix/BUDI-7188
Don't sync automation logs from prod to dev app
2023-06-27 12:52:07 +01:00
mike12345567
4d2aa2a67b PR comments. 2023-06-27 12:45:00 +01:00
mike12345567
1d5bc39282 PR comments. 2023-06-27 12:24:50 +01:00
Andrew Kingston
cfdd6bafb7 Rewrite how middlewares are ran inside sockets, and fix collaboration 2023-06-27 11:33:23 +01:00
mike12345567
47260f23bf PR comments. 2023-06-27 10:01:06 +01:00
Mel O'Hagan
6f75c5df53 Use any type to fix TypeScript check 2023-06-27 09:59:02 +01:00
Dean
eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
mike12345567
7e79c827a7 Test fixes, as well as issue discovered by test around _id generation and event triggering. 2023-06-26 19:10:04 +01:00
mike12345567
3eff4d85d0 Adding a test case for the removal of automation logs from app sync, as well as adding to the publish/sync filter a check to not carry over automation logs. 2023-06-26 18:52:15 +01:00
Andrew Kingston
b7603f8bf1 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 17:56:11 +01:00
mike12345567
ced1dd95c7 Updating roles tests to make sure ID always valid. 2023-06-26 16:35:16 +01:00
Dean
b6caebe431 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-26 15:51:31 +01:00
melohagan
0ecda93ea9 Fix for $in on ObjectIds (#11014) 2023-06-26 15:07:29 +01:00
mike12345567
1c09913d33 Fix for foreign keys being unsettlable after update, breaking Postgres test. 2023-06-26 15:05:10 +01:00
mike12345567
b94801d10a Merge branch 'develop' of github.com:Budibase/budibase into feature/custom-role-readable-ids 2023-06-26 12:39:41 +01:00
Andrew Kingston
6d38bdcd64 Merge branch 'develop' of github.com:Budibase/budibase into cheeks-fixes 2023-06-26 11:32:54 +01:00
Andrew Kingston
5f407259dc Enable component nesting validation for new apps 2023-06-26 10:39:38 +01:00
Andrew Kingston
aebc3b2bb8 Merge branch 'develop' of github.com:Budibase/budibase into grid-block 2023-06-26 09:05:06 +01:00
mike12345567
e022da5bc8 Adding test case for foreign key autocolumn enrichment. 2023-06-23 18:31:02 +01:00
mike12345567
c2b4dec88f Fix to make foreign keys auto-columns when used in relationships as well as making sure that when fetching tables that they can be removed, using the old fetch mechanism (to be replaced, but needs to work for now). 2023-06-23 18:09:52 +01:00
mike12345567
3d3efadb37 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-23 15:19:49 +01:00
melohagan
3aca0c0ed3 Null safety (#11007) 2023-06-23 14:48:07 +01:00
Dean
fd8400bee5 PR feedback and removed some comments 2023-06-23 11:56:59 +01:00
Andrew Kingston
007b6d605b Merge pull request #10917 from Budibase/fix/datasource-409
Fix datasource conflicts
2023-06-23 11:54:15 +01:00
mike12345567
baecab785d Handling the removal of the role_ prefix where applicable so that new role IDs present in the exact same way as built in roles. 2023-06-22 18:02:35 +01:00
melohagan
0860a5b248 Exclude entities from datasource env processing (#11000) 2023-06-22 17:35:47 +01:00
mike12345567
58d7293798 PR suggestion. 2023-06-22 13:25:37 +01:00
mike12345567
5373b867e1 Fix for #10949 - the relationship types were always locked to be the same, which means that the foreign key wasn't being updated correctly as the backend was not aware of which side was the one-to-many side. 2023-06-22 12:32:39 +01:00
mike12345567
45120c60ba Getting basic regex in place to make sure role names can be IDs. 2023-06-21 17:08:54 +01:00
Michael Drury
e1741937ae Removing logging of error in coercion - this was creating noise in errors channel. 2023-06-21 12:08:39 +01:00
Andrew Kingston
1403ee59ce Use app ID as part of room key for grid websocket to fix issues with dev/prod tables having the same table ID but being different tables 2023-06-21 08:51:43 +01:00
Andrew Kingston
3f20a3a439 Enable collaboration for public users and fix collaboration for non-devs 2023-06-21 08:33:58 +01:00
mike12345567
cbfeea121c Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-20 18:09:23 +01:00
melohagan
9e9cece59e Clone user (#10974) 2023-06-20 17:07:34 +01:00
melohagan
b0debf17ef Table disappears from side bar when changing display name (#10909)
* Pass sourceId on fetch tables

* Use ExternalTable type
2023-06-20 17:07:12 +01:00
Dean
998f1806aa Updated analytics tests to account for the embedded 2023-06-20 16:29:09 +01:00
Michael Drury
958cabee52 Merge pull request #10921 from Budibase/fix/airgap-templates-call
update airgap script and enable support for offline mode
2023-06-20 13:51:10 +01:00
Dean
f04f42546a Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-20 12:33:48 +01:00
Dean
602ea9bc4e General tidying and refactoring. Updated the publish button behaviour to also take into account revert and version update behaviours. 2023-06-20 12:33:18 +01:00
Adria Navarro
cdd15fd75f Merge pull request #10953 from Budibase/budi-7115-sql-schema-export
BUDI-7115 - Sql schema export
2023-06-20 11:57:46 +01:00
Adria Navarro
8ab5913eb9 Change url 2023-06-20 11:33:38 +01:00
Adria Navarro
6ed5894441 Type 2023-06-20 11:14:23 +01:00
Dean
c1248eed12 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-20 10:08:18 +01:00
mike12345567
3955b00bbc Merge branch 'develop' of github.com:Budibase/budibase into fix/airgap-templates-call 2023-06-19 18:57:17 +01:00
Michael Drury
c5270ee323 Merge pull request #10959 from Budibase/fix/integration-tests
Integration test updates and improved logging
2023-06-19 18:52:24 +01:00
mike12345567
289a75fc9a Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. 2023-06-19 18:28:38 +01:00
Adria Navarro
718fe1efc6 Implement mssql and tests 2023-06-19 17:56:12 +01:00
Adria Navarro
c44b10eadf Lint 2023-06-19 17:56:12 +01:00
Adria Navarro
e21dca5582 Implement and test mysql sql dump 2023-06-19 17:56:12 +01:00
Adria Navarro
ab5b8716c0 Get mysql schema 2023-06-19 17:56:12 +01:00
Adria Navarro
d337c52adf Add feature flags 2023-06-19 17:56:11 +01:00
Adria Navarro
7a4eb3113d Add external schema endpoint 2023-06-19 17:56:11 +01:00
Adria Navarro
dbcf7814a8 Support ssl 2023-06-19 17:56:11 +01:00
Adria Navarro
e7026d4aed Get schema function 2023-06-19 17:56:11 +01:00
Adria Navarro
7bd0078210 Clean code 2023-06-19 17:55:47 +01:00
Adria Navarro
a0bfebf53d Merge pull request #10894 from Budibase/budi-7010/frontend-encrypt-app-imports
BUDI-7010 - Frontend decrypt app imports
2023-06-19 11:18:38 +01:00
Dean
2304032423 Added embed state, behaviours and event tracking to client app. UI/UX Refactoring 2023-06-16 12:30:08 +01:00
Rory Powell
5f716a62a4 Revert "Merge branch 'develop' into master"
This reverts commit 67fb9de7f4, reversing
changes made to ebec885b0a.
2023-06-16 10:13:43 +01:00
Michael Drury
58c26d563e Fixing where getCachedLicense is retrieved from. 2023-06-15 23:29:34 +01:00
Michael Drury
a1d8ad047a Quick fix suggested by Rory to make use of the cached license when fetching the app package. 2023-06-15 22:51:33 +01:00
mike12345567
d84051ccfd Merge branch 'master' of github.com:Budibase/budibase into develop 2023-06-15 17:08:08 +01:00
mike12345567
67e2ce86ce Adding a license mechanism to the app package call so that public apps can still return what license the app utilises. This is retrieved based on the tenant of the app - we only attach the license type so as to not expose further information than is necessary. 2023-06-15 16:33:07 +01:00
Martin McKeaveney
dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
Adria Navarro
df3afe2a7c Merge pull request #10918 from Budibase/budi-5262/support_pg_client_cert
Budi 5262 - Support pg client cert
2023-06-15 12:40:16 +01:00
Adria Navarro
b7f0387577 Merge branch 'develop' into budi-5262/support_pg_client_cert 2023-06-15 11:13:52 +01:00
Adria Navarro
4d3ab040bf Support postgres client certificates 2023-06-15 11:06:01 +01:00
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