Commit Graph

552 Commits

Author SHA1 Message Date
Arpit Mohan
46879fae2b Committing the plugin.properties to let us run the code from IntelliJ 2020-04-17 13:35:07 +05:30
Arpit Mohan
b7b7328c3f Merge branch 'release' into feature/acl-spring-object 2020-04-02 13:53:31 +05:30
Arpit Mohan
f165f0b772 Setting the active profile as environment in Rollbar configuration
This will help us segment errors from different environments more easily in the Rollbar UI
2020-04-02 13:49:53 +05:30
Arpit Mohan
01c4a2cc8b Updating the redis credentials for staging because Heroku keeps changing it 2020-04-02 13:22:11 +05:30
Arpit Mohan
1b18c4d6b3 Writing the initial test and implementation for the application user invite flow.
The permissions are being translated to the application domain. Need to also be translated to the page & action domain.
2020-04-02 13:21:01 +05:30
Trisha Anand
ab7327e603 Merge branch 'feature/marketplace-webclient' into 'release'
marketplace webclient : First draft of the marketplace client which interacts with the marketplace on a different URL. 1. Get the Providers and Templates given certain parameters. 2. Update the statistics when adding a template to page. 3. Subscribe to th

See merge request theappsmith/internal-tools-server!235
2020-04-01 18:53:40 +00:00
Trisha Anand
f882ffcdf3 Fetching the providers from the Marketplace using webclient. Introduced a temporary end point to support the new source for Providers 2020-04-01 18:53:39 +00:00
Trisha Anand
f51751aba8 Merge branch 'bug/rest-api-post-body' into 'release'
Fixing the double escaping to a single escape.

See merge request theappsmith/internal-tools-server!249
2020-04-01 11:54:16 +00:00
Trisha Anand
8ef59460af Fixing the double escaping to a single escape. 2020-04-01 17:20:07 +05:30
Arpit Mohan
6bb9e3481a Merge branch 'feature/datasource-create-api' into 'release'
Datasource CRUD APIs

APIs for creating, updating, deleting and reading Datasource objects. This MR creates full data structure for Datasource as needed for DB sources.

Includes tests for creating and updating.

See merge request theappsmith/internal-tools-server!248
2020-04-01 08:50:36 +00:00
Shrikant Kandula
1f524827b9 Datasource CRUD APIs 2020-04-01 08:50:36 +00:00
Arpit Mohan
4927e7b8d8 Adding a custom SecurityContextFactory to instantiate Mock anonymous user in the test cases.
Now we have a lot of flexibility around the SecurityContext during testing. We can instantiate any type of mock users bearing different roles & permissions.
2020-04-01 10:20:04 +05:30
Arpit Mohan
995bfd0bbd * Adding CustomRepository interfaces and implementations to all the domain objects in the classpath
* Adding generic get(Multivalue<String, String> params) implementation to the BaseService. Now all the domain obejcts can simply leverage this base implementation for get queries out of the box for all the fields.

* IMP: For some reason, the query by example has stopped working across the board. Even the super implementation in SimpleReactiveMongoRepository doesn't work. No idea why this is happening. For the time being, have moved to Criteria queries for the get request.
2020-04-01 10:00:18 +05:30
Trisha Anand
b92557c480 Merge branch 'bug/handle-newline-mustache-replacement' into 'release'
Json serialisation fix : Double escape java to conserve \n

See merge request theappsmith/internal-tools-server!246
2020-03-30 09:45:39 +00:00
Trisha Anand
e4ab1635cc Double escaping java to support "\n" to be conserved through the proxy. 2020-03-30 15:11:25 +05:30
Arpit Mohan
9f9098268b Fixing the user service test cases 2020-03-29 17:06:20 +05:30
Arpit Mohan
036bd3a392 Fixing the test cases and SeedMongoData
Only userServiceTest is failing now.
2020-03-28 23:07:31 +05:30
Arpit Mohan
381f2f6b4f Resolving merge conflicts from release branch 2020-03-28 21:52:35 +05:30
Arpit Mohan
189ef1d16c Merge branch 'hotfix/json-serialization' into 'release'
JSON serialization fix for dynamic binding

In the action execution, we now escape all the parameter values received in the dynamic binding. This is because Java unescapes values when it receives the HTTP request. Hence, ActionServiceImpl.execute() will escape the bindings again to ensure that the request to the backend API system still works.

See merge request theappsmith/internal-tools-server!245
2020-03-28 13:48:41 +00:00
Arpit Mohan
9ce82bdcb6 Fixing json serialization issue for new line and JSON bodies.
Now we escape all the bindings once on the server to ensure that the unescaping that Spring did is reversed.
2020-03-28 13:48:41 +00:00
Arpit Mohan
f1eb890c62 Merge branch 'bug/mongobee-indexes' into 'release'
Fix fields orders in compound indexes and duplicate slugs.

In the migration for creating slugs for existing organizations, we need to set unique slugs using the same logic as would be used when the organizations are created in the first place. For this, this MR updates the `addOrgSlugs` migration accordingly.

In the migration for **ensuring** (not necessarily **creating**) initial indexes, this MR changes the order of the fields in a couple of compound indexes. Unfortunately, if an compound index named `abc` exists with the field order `"f1", "f2"` and we try to **ensure** an index named `abc` with the field order `"f2", "f1"`, the ensuring fails with obscure errors. Although some resources online suggest that the field order in index does not matter, here, it does.

See merge request theappsmith/internal-tools-server!244
2020-03-28 11:15:50 +00:00
Shrikant Kandula
35a2722305 Fix add-slug migration messing up existing slugs, if any.
Migrations should be more resilient in regards to existing data.
2020-03-28 11:15:50 +00:00
Arpit Mohan
e6830ed6a4 Merge branch 'bug/mongobee-indexes' into 'release'
Use mongock for migrations.

Mongock is a fork of Mongobee with a better integration with
Spring. It also does not suffer from trying to access the
`system.indexes` collection.
See https://github.com/mongobee/mongobee/pull/87.

See merge request theappsmith/internal-tools-server!243
2020-03-28 05:19:56 +00:00
Shrikant Kandula
31fa5a66f1 Use mongock for migrations.
Mongock is a fork of Mongobee with a better integration with
Spring. It also does not suffer from trying to access the
`system.indexes` collection.
See https://github.com/mongobee/mongobee/pull/87.
2020-03-28 10:08:11 +05:30
Shrikant Kandula
bfa0453a27 Merge branch 'feature/mongodb-migrations' into 'release'
MongoDB Migrations and Organization Slug

See merge request theappsmith/internal-tools-server!241
2020-03-27 14:52:25 +00:00
Shrikant Kandula
0947ddcd0f Remove findByName method for Organization domain.
Organization names are no longer unique, so this method
doesn't make as much sense. The `findBySlug` should serve
in it's place.
2020-03-27 14:52:25 +00:00
Arpit Mohan
a46efda121 Merge branch 'bug/refactor-widget-name' into 'release'
Refactor of names shouldn't be allowed if there is no DSL present in the layout

See merge request theappsmith/internal-tools-server!242
2020-03-25 12:54:23 +00:00
Trisha Anand
89215fab43 In case of the erroneous state of no DSL, don't allow refactor names. 2020-03-25 18:19:27 +05:30
Trisha Anand
acb7437c6b Merge branch 'bug/add-to-page-transient-fields' into 'release'
Transient fields being set before returning the created action in case of rapid api template

After adding a rapid api template, the action created was being returned. This has been extended so that the transient fields required for UI are also set before returning the created action.

See merge request theappsmith/internal-tools-server!240
2020-03-24 19:15:02 +00:00
Trisha Anand
a7cceaf0f1 After adding a rapid api template, the action created was being returned. This has been extended so that the transient fields required for UI are also set before returning the created action. 2020-03-24 19:15:02 +00:00
Trisha Anand
3b6c043637 Merge branch 'feature/add-pluginid-action' into 'release'
Added transient field plugin id to set in action everytime its read.

See merge request theappsmith/internal-tools-server!239
2020-03-24 11:47:17 +00:00
Trisha Anand
c12cb88265 Added transient field plugin id to set in action everytime its read. 2020-03-24 17:13:30 +05:30
Arpit Mohan
f91e393172 Merge branch 'bug/email-from-name' into 'release'
Show Appsmith as the From name in sent emails.

See merge request theappsmith/internal-tools-server!236
2020-03-20 08:24:28 +00:00
Shrikant Kandula
60e9a1f18e Show Appsmith as the From name in sent emails. 2020-03-19 18:29:13 +05:30
Arpit Mohan
d7ec1f3c52 Merge branch 'release' into feature/acl-spring-object 2020-03-19 13:06:20 +05:30
Trisha Anand
d009e91e9d Merge branch 'feature/property-pane-jsonobject' into 'release'
Moving the propertyPane config to generic JSONObject

See merge request theappsmith/internal-tools-server!234
2020-03-19 07:08:09 +00:00
Arpit Mohan
135280abaa Moving the propertyPane config to generic JSONObject
This ensures that the client can change the config at will without depending on the platform team to add the field to the POJO.

Also deleting redundant classes and controllers for propertyPane and Widget. These are no longer required and can be removed from the codebase.
2020-03-19 12:34:24 +05:30
Arpit Mohan
4725421cba Merge branch 'release' into feature/acl-spring-object 2020-03-19 11:54:36 +05:30
Arpit Mohan
d384dac7ec Minor code clean up 2020-03-19 00:54:04 +05:30
Arpit Mohan
7316a77f42 Moving ActionRepository to the new custom repository format 2020-03-19 00:40:19 +05:30
Arpit Mohan
c5ac557961 Fixing the test cases for pageService and LayoutService
Also adding a helper query function in BaseAppsmithRepository that will make the code much cleaner for custom repository functions.
2020-03-19 00:24:30 +05:30
Arpit Mohan
9bf7bab85b Moving organization repository functions to the custom class.
Also fixing the SeedMongoData file with the seed data to correspond to the changes made in the OrganizationRepository. We will default to using the mongoTemplate in the SeedMongoData file in the future so that we don't have to deal with ACL when we are simply populating the DB.
2020-03-18 22:56:32 +05:30
Trisha Anand
aaf2f12b29 Merge branch 'feature/url-encode-restapi' into 'release'
Rest API and Rapid api plugin url encode the query parameters.

See merge request theappsmith/internal-tools-server!232
2020-03-18 15:09:35 +00:00
Trisha Anand
44d5dccbbb Rest API and Rapid api plugin url encode the query parameters. The Providers returned are sorted by sortOrder in ascending order 2020-03-18 20:35:50 +05:30
Arpit Mohan
fc6f225935 Adding user policy to manage organization and fixing the organization create flow to ensure the right permissions are set
Also adding test case for get applications. Now we will fetch all applications that the user has read permissions to by default. It's not dependent on the organization that they are a part of.
2020-03-18 16:09:47 +05:30
Arpit Mohan
c06e16db83 Making changes to get the page tests to pass. Also minor improvements to LayoutServiceTest 2020-03-18 14:47:00 +05:30
Trisha Anand
4961f6ef23 Merge branch 'feature/remove-cred-steps-from-GET-providers' into 'release'
Credential steps should only be written but not read for Providers to reduce the size of response

See merge request theappsmith/internal-tools-server!230
2020-03-18 09:13:54 +00:00
Trisha Anand
0b7b4716db Credential steps should only be written but not read. 2020-03-18 14:40:02 +05:30
Trisha Anand
e73b64dd3f Merge branch 'feature/provider-update-data-cleanup' into 'release'
Updated Provider to include fields to help with display and sort order

See merge request theappsmith/internal-tools-server!229
2020-03-18 09:03:21 +00:00
Trisha Anand
fad606a156 Updated Provider to include fields to help with display and sort order 2020-03-18 14:21:38 +05:30