Commit Graph

13528 Commits

Author SHA1 Message Date
Nikhil Nandagopal
125fb9c162 Merge branch 'fix/bugs' into 'release'
Fix/bugs

See merge request theappsmith/internal-tools-client!696
2020-06-10 12:19:55 +00:00
Hetu Nandu
b87fde64b1 Merge branch 'fix/action-evaluated-value' into 'release'
Action creator evaluated value fixes

See merge request theappsmith/internal-tools-client!699
2020-06-10 12:16:50 +00:00
Hetu Nandu
cb2867069f Action creator evaluated value fixes 2020-06-10 12:16:50 +00:00
Nikhil Nandagopal
bc9ec2a2eb Merge branch 'release' into fix/bugs 2020-06-10 17:11:23 +05:30
Arpit Mohan
58e75ee603 Merge branch 'hotfix/sorry-cypress-parallel' into 'release'
Adding sorry-cypress integration to ensure Cypress parallelization without the Cypress dashboard

Using the open source project sorry-cypress, we get the benefits of test parallelization without having to pay Cypress for the test recordings. This server is hosted on Heroku at this moment.

See merge request theappsmith/internal-tools-client!703
2020-06-10 11:14:58 +00:00
Arpit Mohan
7af301566c Adding sorry-cypress integration to ensure Cypress parallelization without the Cypress dashboard 2020-06-10 11:14:58 +00:00
Arpit Mohan
a2a4cbb2d7 Merge branch 'hotfix/plugin-fat-jar' into 'release'
Creating a fat jar for plugins

The plugins should be completely independent of the appsmith-server. Earlier, the plugins were picking their dependencies from the main appsmith-server maven module. 

Now using the maven-shade-plugin, they are an independent entity and completely self sufficient. The only exception is restapi-plugin & rapidapi-plugin because they inherit from spring-boot-starter which is not compatible with the maven-shade-plugin.

See merge request theappsmith/internal-tools-server!377
2020-06-10 11:11:23 +00:00
Arpit Mohan
01737b9599 Experimenting with maven-shade-plugin to create a fat-jar of the postgres dependency.
Will have to do this for all plugins. Currently, it's not registering the plugin with the SpringPluginManager
2020-06-10 11:11:23 +00:00
vicky_primathon.in
a5986ed8a8 merge conflicts resolved 2020-06-10 16:34:11 +05:30
Trisha Anand
f00c9c23c8 Merge branch 'bug/mark-2xx-as-success-restapi-plugin' into 'release'
Mark any 2xx status code in REST API plugin as successful execution.

See merge request theappsmith/internal-tools-server!372
2020-06-10 10:51:07 +00:00
Shrikant Kandula
1ce336257c Mark any 2xx status code in REST API plugin as successful execution. 2020-06-10 10:51:07 +00:00
Trisha Anand
e3b6129d77 Merge branch 'bug/acl-app-viewer-org' into 'feature/acl-spring-object'
App viewer user in an organization should have read:organizations permission.

See merge request theappsmith/internal-tools-server!376
2020-06-10 10:34:26 +00:00
Trisha Anand
7a658ce5ea App viewer user in an organization should have read:organizations permission. 2020-06-10 15:55:29 +05:30
Nikhil Nandagopal
ed37c27c67 added pagination info 2020-06-10 15:51:16 +05:30
vicky_primathon.in
e930a3963c Merge branch 'feature/widget-actions-menu' of gitlab.com:theappsmith/internal-tools-client into fix/lightning-menu 2020-06-10 15:41:12 +05:30
Trisha Anand
84b74813a5 Merge branch 'bug/acl-create-query' into 'feature/acl-spring-object'
In case of global datasource, no need to check for organizationId during action create.

See merge request theappsmith/internal-tools-server!375
2020-06-10 09:08:01 +00:00
Trisha Anand
491afc3599 In case of global datasource, no need to check for organizationId during action create. 2020-06-10 09:08:01 +00:00
Nikhil Nandagopal
a26e8ea51c Merge branch 'release' into fix/bugs
# Conflicts:
#	cypress/integration/Smoke_TestSuite/FormWidgets/DatePicker_spec.js
2020-06-10 14:22:04 +05:30
Trisha Anand
8b9bc4b42d Merge branch 'fix/acl-bugs' into 'feature/acl'
Fix acl-bugs

See merge request theappsmith/internal-tools-client!701
2020-06-10 08:29:21 +00:00
Tejaaswini Narendra
4f34b2c502 fix: Send organizationId for embedded datasources
- show organization title in invite form
- show form when clicking on share in dropdown
- show org name in org settings page
- remove the deleted application from the UI when delete is successful
- fix role update in user list table
2020-06-10 08:29:21 +00:00
Hetu Nandu
9e087de059 Merge branch 'fix/query-pane-evaluated-value' into 'release'
Query pane evaluated value

- Use `body` field of query action configuration
- Show evaluated value of a query field
- Update failing test

See merge request theappsmith/internal-tools-client!697
2020-06-10 07:49:27 +00:00
Hetu Nandu
e2eb590a86 Query pane evaluated value 2020-06-10 07:49:27 +00:00
Nikhil Nandagopal
32d934604f fixed tests 2020-06-10 12:04:46 +05:30
Trisha Anand
ee1889da14 Merge branch 'bug/acl-app-datasource-permissions' into 'feature/acl-spring-object'
Fixes bugs : 1. read:datasource permission should not be applied to application; 2. A user shouldn't be added to an organization if the user already exists in the organization. 3. Save action was failing .

See merge request theappsmith/internal-tools-server!374
2020-06-10 06:22:16 +00:00
Trisha Anand
a89355a5ec Fixes bugs : 1. read:datasource permission should not be applied to application; 2. A user shouldn't be added to an organization if the user already exists in the organization. 2020-06-10 06:22:16 +00:00
Tejaaswini
4196f11af9 Merge branch 'release' into feature/acl 2020-06-10 11:50:54 +05:30
Arpit Mohan
3cf8ff008f Hacky fix for the postgres plugin to work. Including the dependency in the appsmith-server/pom.xml file instead of the plugin 2020-06-10 10:46:09 +05:30
Trisha Anand
27fcb2dff8 Merge branch 'feature/acl-datasource-crud-policies' into 'feature/acl-spring-object'
Bug Fix : 1. user permissions during create/update of actions and datasources would now be set. 2. During update, policies are set to null in the update object to ensure that the policies are not overwritten to empty set.

See merge request theappsmith/internal-tools-server!373
2020-06-09 15:01:59 +00:00
Trisha Anand
ac06cc9668 1. user permissions during create/update of actions and datasources would now be set.
2. During update, policies are set to null in the update object to ensure that the policies are not overwritten to empty set.
2020-06-09 20:25:13 +05:30
Nikhil Nandagopal
2df86b79e9 fixed type def
resolved mr comments
2020-06-09 18:40:42 +05:30
Nikhil Nandagopal
7da961bcc9 fixed clearing date picker 2020-06-09 18:34:47 +05:30
Arpit Mohan
f74e8a45be Merge branch 'feature/query-action-configuration' into 'release'
Remove the query field in ActionConfiguration and use body instead

The client code is getting complicated because of the difference in SQL and non-SQL handling of the query field in actionConfiguration. If we expect the request to be sent in the `body` field, the plugin can parse the String body however it feels like.

See merge request theappsmith/internal-tools-server!340
2020-06-09 12:12:27 +00:00
Arpit Mohan
bbd33c2968 Removing the query field in ActionConfiguration and using String body as the field to store the query
This is to simplify the query pane on the frontend client. The client doesn't need to have separate interfaces for sql and non-sql plugins. All queries will be sent to the server in the form of a String that is parsed in different formats based on the plugin.

Also adding test cases for PostgresPlugin. Used TestContainers to simulate the postgres db in Docker inside the Java test itself. Very useful.
2020-06-09 12:12:27 +00:00
Trisha Anand
450a65929a Merge branch 'fix/update-modal' into 'feature/acl'
Update modal

- Manage users redirect to manage user page
- Invite button display loader on load
- Invite form reset on success
- Invite form display success message when form submission is successful

See merge request theappsmith/internal-tools-client!698
2020-06-09 12:10:55 +00:00
Tejaaswini Narendra
91efefee09 fix: Minor change
- remove return
2020-06-09 12:10:55 +00:00
Nikhil Nandagopal
9becaa9a9f made form data visible at the top level 2020-06-09 17:34:38 +05:30
Nikhil Nandagopal
97d78ba379 commented datepicker required field test 2020-06-09 16:34:04 +05:30
Hetu Nandu
6b54eb8f9e Update displayWidgetDsl.json 2020-06-09 09:44:57 +00:00
Nikhil Nandagopal
a567622e0d minor fix 2020-06-09 14:29:08 +05:30
Nikhil Nandagopal
8501ebe670 added date format to date picker 2020-06-09 14:14:13 +05:30
Nikhil Nandagopal
563c74f1a9 fixed tests failing 2020-06-09 11:55:11 +05:30
rashmipn
e2ce5f929c Merge branch 'release' of gitlab.com:theappsmith/internal-tools-client into update/Dsl 2020-06-09 11:49:10 +05:30
Rashmi P
d9639266f1 Removed Required toggle fun DatePicker_spec.js 2020-06-09 06:16:53 +00:00
Trisha Anand
8ff7c56e64 Merge branch 'feature/rest-form-data' into 'release'
Handling form data via the field bodyFormData in ActionConfiguration

This is because the client sends us the data for form-data in the form of a list of Property fields with keys and values. This is consistent with how the client stores & renders headers & query parameters as well.
For MediaType application/x-www-form-urlencoded we will use the bodyFormData field.

See merge request theappsmith/internal-tools-server!370
2020-06-09 05:48:16 +00:00
Arpit Mohan
99e7519550 Handling form data via the field bodyFormData in ActionConfiguration
This is because the client sends us the data for form-data in the form of a list of Property fields with keys and values. This is consistent with how the client stores & renders headers & query parameters as well.
For MediaType application/x-www-form-urlencoded we will use the bodyFormData field.
2020-06-09 05:48:16 +00:00
Trisha Anand
7d83cfdae9 Merge branch 'bug/acl-empty-role-name' into 'feature/acl-spring-object'
Bug : When the user tries to invite without selecting the role user, this leads to null pointer exception. Fix : A user CAN NOT be invited to an organization without specifying the role.

See merge request theappsmith/internal-tools-server!369
2020-06-08 14:56:12 +00:00
Trisha Anand
061577d2c9 Bug : When the user tries to invite without selecting the role user, this leads to null pointer exception.
Fix : A user CAN NOT be invited to an organization without specifying the role.
2020-06-08 14:56:12 +00:00
Nikhil Nandagopal
79c62d4863 fixed data tree path 2020-06-08 17:56:07 +05:30
Trisha Anand
a3af1384d1 Merge branch 'bug/acl-get-all-actions' into 'feature/acl-spring-object'
Bug Fix : Get all actions by application ID returning empty result : Changed the get all actions function to fix the bug where find by Example is not working. Instead the same has now been implemented using criteria.

See merge request theappsmith/internal-tools-server!368
2020-06-08 12:05:49 +00:00
Trisha Anand
a888d54059 Changed the get all actions function to fix the bug where find by Example is not working. Instead the same has now been implemented using criteria. 2020-06-08 12:05:49 +00:00