Commit Graph

644 Commits

Author SHA1 Message Date
Trisha Anand
2fa879fbd4 Minor code cleanup 2020-04-24 15:15:39 +05:30
Trisha Anand
a8f32d8b2a Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-server/src/main/java/com/appsmith/server/services/MarketplaceService.java
2020-04-23 14:45:40 +05:30
Nikhil Nandagopal
18acf373f5 Update form.json 2020-04-23 06:08:25 +00:00
Trisha Anand
dacc6a5c9e The header key should be matched to all possible variations : Content-Type, content-type, etc. This fixes that. 2020-04-22 18:13:31 +05:30
Trisha Anand
0c76b8f394 Minor comments 2020-04-22 17:27:55 +05:30
Trisha Anand
11cb6f6c56 Refactored some code which was being repeated. 2020-04-22 16:59:01 +05:30
Shrikant Kandula
1a19a9b698 Merge branch 'bug/mongodb-multiple-endpoints' into 'release'
Support SSL connections with self-signed from MongoPlugin.

See merge request theappsmith/internal-tools-server!297
2020-04-21 13:34:18 +00:00
Shrikant Kandula
3ad98a4367 Support SSL connections with self-signed from MongoPlugin. 2020-04-21 18:53:30 +05:30
Trisha Anand
54115d7e54 Merge branch 'feature/search-provider-wire-up' into 'release'
Marketplace : Search endpoint is now implemented with mock response deleted. It currently does exact name searches in providers by hitting the marketplace service.

See merge request theappsmith/internal-tools-server!296
2020-04-21 12:42:11 +00:00
Trisha Anand
3148dec921 Search endpoint is now implemented with mock response deleted. It currently does exact name searches in providers by hitting the marketplace service. 2020-04-21 12:42:11 +00:00
Shrikant Kandula
3dfc62034f Merge branch 'feature/datasource-form-config-apis' into 'release'
Add form config JSONs for individual plugins and an API for GETting them.

See merge request theappsmith/internal-tools-server!295
2020-04-21 12:23:23 +00:00
Shrikant Kandula
58c0f94508 Add form config JSONs for individual plugins and an API for GETting them. 2020-04-21 17:42:14 +05:30
Shrikant Kandula
9f2427f1df Merge branch 'bug/mongo-plugin-test-on-unavailable-host' into 'release'
Fix MongoPlugin test returning success even when host is unavailable.

See merge request theappsmith/internal-tools-server!294
2020-04-21 10:22:50 +00:00
Shrikant Kandula
d94a231934 Fix MongoPlugin test returning success even when host is unavailable. 2020-04-21 15:39:44 +05:30
Shrikant Kandula
5c703d765e Merge branch 'bug/invalid-port-in-restapi-test-gives-500' into 'release'
Fix 500 on invalid port sent for restapi plugin test request.

See merge request theappsmith/internal-tools-server!292
2020-04-21 08:23:03 +00:00
Trisha Anand
23729d61da Merge branch 'bug/provider-credential-step' into 'release'
Provider credential steps is not a write only property. It must be readable.

See merge request theappsmith/internal-tools-server!293
2020-04-21 08:22:51 +00:00
Trisha Anand
4cde1413fc Provider credential steps is not a write only property. It must be readable. 2020-04-21 13:45:28 +05:30
Trisha Anand
504a165411 Added a few comments to ease understanding 2020-04-21 13:44:19 +05:30
Shrikant Kandula
a49ef95d5b Fix 500 on invalid port sent for restapi plugin test request. 2020-04-21 13:40:12 +05:30
Trisha Anand
d7d31a43da Fixed compile time error. 2020-04-20 18:30:47 +05:30
Trisha Anand
373c9ac738 Code formatting corrected. 2020-04-20 18:17:25 +05:30
Trisha Anand
6be0b7ae23 Merge branch 'release' into feature/acl-spring-object
# Conflicts:
#	appsmith-server/pom.xml
#	appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
#	appsmith-server/src/main/java/com/appsmith/server/repositories/BaseRepositoryImpl.java
#	appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java
#	appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java
2020-04-20 18:13:55 +05:30
Shrikant Kandula
02a384698b Merge branch 'bug/missing-response-meta-in-test-api' into 'release'
Fix missing `responseMeta` in response for /datasources/test endpoint.

See merge request theappsmith/internal-tools-server!291
2020-04-20 12:40:42 +00:00
Shrikant Kandula
94b166b3cb Fix missing responseMeta in response for /datasources/test endpoint. 2020-04-20 17:40:42 +05:30
Trisha Anand
3b10a444f0 Merge branch 'bug/NPE-empty-children-DSL' into 'release'
NPE : In case the children tag exists in the DSL but is empty, we shouldnt try to extract widget names

See merge request theappsmith/internal-tools-server!290
2020-04-20 09:22:51 +00:00
Trisha Anand
1e000c295f In case the children tag exists in the DSL but is empty, we shouldnt try to extract widget names in that scenario. 2020-04-20 13:58:25 +05:30
Shrikant Kandula
654f1fa61e Merge branch 'bug/missing-auth-type-throws-500' into 'release'
Fix 500 error when authentication.type is not provided in request body.

See merge request theappsmith/internal-tools-server!288
2020-04-20 04:58:57 +00:00
Shrikant Kandula
b71a3254d9 Merge branch 'bug/mustache-replacement-with-double-quotes' into 'release'
Fix mustache parsing fail when keys have double-quotes or backslashes.

See merge request theappsmith/internal-tools-server!289
2020-04-17 14:07:23 +00:00
Shrikant Kandula
e0add48bd6 Fix mustache parsing fail when keys have double-quotes or backslashes. 2020-04-17 19:26:42 +05:30
Shrikant Kandula
ee556b729c Fix 500 error when authentication.type is not provided in request body. 2020-04-17 14:35:53 +05:30
Arpit Mohan
46879fae2b Committing the plugin.properties to let us run the code from IntelliJ 2020-04-17 13:35:07 +05:30
Shrikant Kandula
d82a27fd20 Merge branch 'bug/npe-in-datasource-valid-check' into 'release'
Fix NPE when `invalids` in Datasource is not initialized yet.

See merge request theappsmith/internal-tools-server!287
2020-04-17 07:51:07 +00:00
Shrikant Kandula
65d4c0e3e5 Fix NPE when invalids in Datasource is not initialized yet. 2020-04-17 13:17:05 +05:30
Shrikant Kandula
8b7bf97679 Merge branch 'feature/datasource-api-cleanup' into 'release'
Datasource API cleanup and better error reporting

See merge request theappsmith/internal-tools-server!284
2020-04-17 07:27:56 +00:00
Shrikant Kandula
08b7f51d5d Datasource API cleanup and better error reporting 2020-04-17 07:27:56 +00:00
Trisha Anand
210b566eab Merge branch 'bug/setOrganizationIdForAllDatasources' into 'release'
Setting the organization id in case of missing plugin. This was being skipped over earlier.

See merge request theappsmith/internal-tools-server!286
2020-04-17 05:50:38 +00:00
Trisha Anand
133eaa7475 Setting the organization id in case of missing plugin. This was being skipped over earlier. 2020-04-16 22:19:35 +05:30
Trisha Anand
801cd59c14 Merge branch 'bug/marketplce-fixes' into 'release'
Updated Rapid API key. Also, now URL Encoding the route parameters as well.

See merge request theappsmith/internal-tools-server!285
2020-04-16 15:59:56 +00:00
Trisha Anand
8aaff70ef0 Updated Rapid API key. Also, now URL Encoding the route parameters as well. 2020-04-16 21:13:37 +05:30
Shrikant Kandula
9ab3332933 Merge branch 'feature/mongo-plugin-test-api' into 'release'
Rich datasource support for MongoPlugin

See merge request theappsmith/internal-tools-server!283
2020-04-16 08:21:40 +00:00
Shrikant Kandula
822afdc064 Rich datasource support for MongoPlugin 2020-04-16 08:21:40 +00:00
Shrikant Kandula
face0eff45 Merge branch 'bug/mustache-parser-on-json' into 'release'
Fix mustache key parsing failing due to escaping in JSON serialization.

See merge request theappsmith/internal-tools-server!281
2020-04-15 10:24:12 +00:00
Shrikant Kandula
6d5a1b9dd1 Fix mustache key parsing failing due to escaping in JSON serialization. 2020-04-15 10:24:12 +00:00
Shrikant Kandula
978363c1ab Merge branch 'feature/test-api-for-datasource' into 'release'
Test API for data sources

See merge request theappsmith/internal-tools-server!273
2020-04-15 10:02:09 +00:00
Shrikant Kandula
2dbf9d1c6b Test API for data sources 2020-04-15 10:02:09 +00:00
Trisha Anand
72540715e3 Merge branch 'bug/api-pane-not-loading' into 'release'
API Pane not loading if application contains actions imported from marketplace before the migration

See merge request theappsmith/internal-tools-server!280
2020-04-14 08:53:03 +00:00
Trisha Anand
684edfe406 Because of db migrations, the older provider ids saved in actions are no longer available. This leads to api pane not loading. Removing the error to return an empty provider so that the api pane can be loaded. 2020-04-14 14:18:04 +05:30
Trisha Anand
d955dfd8bf Merge branch 'bug/marketplace-integration-add-to-page' into 'release'
After migrating the database to marketplace, add new template to page stopped working. Fixing that by fetching the provider from marketplace service.

See merge request theappsmith/internal-tools-server!279
2020-04-13 17:44:08 +00:00
Trisha Anand
03b8de3300 If an action is being created from 3P template, since the marketplace service has been migrated, hit the marketplace server to fetch provider instead of local ProviderService. 2020-04-13 23:08:12 +05:30
Trisha Anand
1a9b5c3679 Merge branch 'bug/jsonPathKeysUpdateInPage' into 'release'
Update Action should also update the page layout actions

See merge request theappsmith/internal-tools-server!276
2020-04-13 08:57:57 +00:00