Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
6,477 Commits 1 Branch 0 Tags 507 MiB
855acc4e37
Commit Graph

1327 Commits

Author SHA1 Message Date
Nayan
e52680fb1f
Feature/implement comment thread subscriber (#5261) 
* -send email to users who are subscribed to a thread only

* -fixed null pointer exception while set subscriber in create thread

* -updated as per PR comments and review
 2021-06-23 17:24:57 +06:00
Abhijeet
7fc04f043f
Error message when updating duplicate application name modified to give more contextual information (#5341) 2021-06-23 13:08:12 +05:30
Anagh Hegde
a1defb9544
Remove the unnecessary comments 2021-06-23 11:16:15 +05:30
Anagh Hegde
0d57f3c132
Merge branch 'release' into feature/page-order-api 2021-06-23 10:54:17 +05:30
Anagh Hegde
fa9a1bc488 Set the order to published pages 2021-06-23 10:51:25 +05:30
Sumit Kumar
7787a0ddac
Bug Fix: Fix dynamic binding substitution failure with Firestore where condition input boxes. (#5280) 
Modify dynamic binding substitution method to handle list and map types containing generic type values.
 2021-06-21 19:36:06 +05:30
Trisha Anand
a89990e157
Mongo For Update Migrations (#5291) 
* Commenting out migration for quick fix to bring up release

* Added null checks for the incomplete configured update single and update many queries
 2021-06-21 18:37:33 +05:30
Abhijeet
598a48cea7
Migration for createdAt and updatedAt field for userCollection if not present (#5249) 2021-06-19 18:03:23 +05:30
Anagh Hegde
32ecffbf8f Merge remote-tracking branch 'origin/feature/page-order-api' into feature/page-order-api 2021-06-18 22:40:43 +05:30
Anagh Hegde
9ad742e97e Change the test method name to more meaningful,.equals for boolean comparision, fix indentation 2021-06-18 22:40:16 +05:30
abhishek nayak
37708a4128
Merge pull request #5231 from appsmithorg/snyk-fix-45d4107a9d315a1ce1ee74338cb35c92 
[Snyk] Fix for 26 vulnerabilities
 2021-06-18 20:42:01 +05:30
Anagh Hegde
82a1289f45
Merge branch 'release' into feature/page-order-api 2021-06-18 15:15:48 +05:30
Anagh Hegde
e02e572df7 Change the logic to have check for the order of all the pages 2021-06-18 14:53:33 +05:30
Shrikant Sharat Kandula
040d3b0cc4 Fix publish application event not being sent 2021-06-18 13:27:31 +05:30
Trisha Anand
ee4429b973
Commenting out migration for quick fix to bring up release (#5248) 2021-06-18 12:10:15 +05:30
Nidhi
57adbd7777
Schema info in templates query (#5244) 2021-06-18 11:31:17 +05:30
Shrikant Sharat Kandula
7d08187677
Merge pull request #5233 from appsmithorg/fix/send-publish-event-only-on-client-publish 
Fix app publish event sent at wrong times
 2021-06-18 11:19:36 +05:30
Trisha Anand
388418cec5
Merge the two update commands into a single update command in Mongo Form (#5171) 
* Update commands have been merged into a single update command for both single and multi updates

* Added migrations to migrate any update one mongo form command to new update command

* Incorporated review comments
 2021-06-18 11:04:39 +05:30
Snyk bot
5c17d962a0
[Snyk] Security upgrade net.minidev:json-smart from 2.3 to 2.4.7 (#5225) 
* fix: app/server/appsmith-interfaces/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-NETMINIDEV-1078499
- https://snyk.io/vuln/SNYK-JAVA-NETMINIDEV-1298655

* Updating the json-smart dependency to the latest one

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
 2021-06-18 10:54:34 +05:30
Shrikant Sharat Kandula
6c67c20576 Another typo 🤦🏻‍♂️ 2021-06-18 10:48:58 +05:30
Shrikant Sharat Kandula
45b062b83b Typo 2021-06-18 10:43:10 +05:30
Anagh Hegde
bd3369dd03 Remove * import statements 2021-06-18 10:25:36 +05:30
Abhijeet
b87825523e
Support for orphan API without any datasource added for import-export functionality (#5232) 2021-06-18 07:20:28 +05:30
Shrikant Sharat Kandula
11218c2b19 Fix app publish event sent at wrong times 2021-06-17 19:28:50 +05:30
snyk-bot
e8d731a21a
fix: app/server/appsmith-interfaces/pom.xml & app/server/appsmith-server/pom.xml to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1052449
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1052450
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1054588
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056414
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056416
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056417
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056418
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056419
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056420
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056421
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056424
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056425
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056426
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-1056427
- https://snyk.io/vuln/SNYK-JAVA-COMMONSBEANUTILS-460111
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-1020439
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-1070799
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-1082238
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-1083991
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-1089809
- https://snyk.io/vuln/SNYK-JAVA-IOPROJECTREACTORNETTY-559154
- https://snyk.io/vuln/SNYK-JAVA-IOPROJECTREACTORNETTY-559155
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-1009832
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-1296829
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-1290497
- https://snyk.io/vuln/SNYK-JAVA-ORGYAML-537645
 2021-06-17 13:27:03 +00:00
Nidhi
884636f33f
Snowflake integration (#5176) 
* POC for snowflake integration with Appsmith

This is just a rough version to see if the functionality works. Needs to be cleaned up & enhanced for production usage.

* Plugin with connection, monos, ds testing, validation, templates, structure and forms

* Better comments

* Default schema to public

* Changed logging destination, populated request in result and used thread group for datasource creation

Co-authored-by: Arpit Mohan <arpit@appsmith.com>
 2021-06-17 15:03:18 +05:30
Rishabh Saxena
9c99f36bd6
Comments feature fixes (view mode) (#5081) 2021-06-17 13:07:27 +05:30
Sumit Kumar
26cd46ea53
Fix: parse json/jsonb data type values as json for postgres plugin (#5135) 
* parse json/jsonb data type values as json
* add support for json (non binary, earlier support for jsonb was added)
 2021-06-17 11:31:34 +05:30
Nayan
a1a4f0ef3f
Fature/add pagination in notifications (#5096) 
* -added pagination to notifications API

* -add unit tests for notification pagination

* -added unread count in get notifications API

* -moved notification creations to notification service from comment service

* -add repository method to mark a notification as read

* -added repository to update isRead by for username

* -add API to mark notification as read

* -addd application id and application name in notification

* -save application id and name in notification when creating notification for comment and comment threads

* -added page id, from user information in notifications

* -fixed failing unit test due to dependency error

* -removed unused imports

* -extended base controller in notification controller

* - introduced pagination based on before created data instead of offset based pagination

* -moved application id, name and page id inside comment from notification

* -moved author information from notification to comment thread

* -return data from notification service instead of the response object in the mark read or unread API
 2021-06-16 23:24:03 +06:00
Rishabh Saxena
10b3f7e790
Feature/signup success url (#5124) 2021-06-16 21:21:18 +05:30
Anagh Hegde
e119bd716c Ignore the order of the page while checking the published and edited pages test 2021-06-16 21:12:18 +05:30
Anagh Hegde
8296f416cc Merge remote-tracking branch 'origin/feature/page-order-api' into feature/page-order-api 2021-06-16 14:29:37 +05:30
Anagh Hegde
2ccc1ef1f2 Change the test scenario 2021-06-16 14:29:03 +05:30
Anagh Hegde
e748623e57
Merge branch 'release' into feature/page-order-api 2021-06-16 13:56:52 +05:30
Anagh Hegde
1b36f79a4e Fix merge conficts 2021-06-16 13:44:46 +05:30
Trisha Anand
77e965523c
[Feature] Smart Substitution for JSON fields in Mongo Form (#5136) 
* Reduced verbosity of the command names for Insert, Find and Delete

* WIP : Smart substitution untested changes for mongo form

* Tested code for smart substitution working for mongo form fields

* Added test case for assert for smart substitution
 2021-06-16 13:31:00 +05:30
Anagh Hegde
5a8ac3fd33 1. Fix failing unit tests for the page reorder 2021-06-16 11:21:19 +05:30
Anagh Hegde
3e1702b4f9 1. Add migration logic 
2. Add order while creating pages
 2021-06-16 09:12:53 +05:30
Abhijeet
7c430303aa
Allow only organization admins to export application (#5085) 
* Added permission export:applications for admin role

* Only admins are allowed to export applications

Co-authored-by: Pranav Kanade <pranav@appsmith.com>
 2021-06-15 18:18:21 +05:30
Sumit Kumar
64408df8fa
Fix: Use connection pool for Redis (#5093) 
* Replace single connection instance with a connection pool. This will ensure that simultaneous actions don't fail / break the connection.
 2021-06-15 10:59:49 +05:30
Anagh Hegde
9932f918f9 Use assertThat type of assertions and move the order initialization logic to migration 2021-06-15 10:03:39 +05:30
Anagh Hegde
1ca7a0cb20 Add test for page reorder and add order to the response 2021-06-14 15:34:07 +05:30
Anagh Hegde
ccd04b14d9 1. Added logic to handle pageDown scenario 
2. Added comments
 2021-06-14 10:19:02 +05:30
Anagh Hegde
fea54e2fa0 Moved constructor to the top. 2021-06-10 17:12:29 +05:30
Shrikant Sharat Kandula
8db64e6355
Merge pull request #4980 from appsmithorg/feature/send-email-on-comment 
Feature/send email on comment
 2021-06-10 15:20:34 +05:30
Trisha Anand
06cafb6066
Getting Prepared Statement for Postgres, MySQL, and MS-SQL and Smart Substitution for Rest API plugins out of beta (#5019) 
* Correcting text for Mongo Form Insert command

* Getting Prepared Statement for Postgres, MySQL, and MS-SQL and Smart Substitution for Rest API plugins out of beta

* Fixed failing test case

* Fixed Ms-sql plugin test failure
 2021-06-10 13:55:56 +05:30
Nayan
87ab6ff926 -removed commented code as per PR review 2021-06-10 13:09:36 +06:00
Anagh Hegde
bcd5f0600d Add page re-order API 2021-06-10 12:23:47 +05:30
Anagh Hegde
7acba5e1df Add page re-order API 2021-06-10 12:12:48 +05:30
Abhijeet
0246563bd2
Bugfix for applications with MongoDB datasources authenticated with SRV string (#4944) 
* Avoid updating authenticationDTO for mongo-plugin with SRV if the authentication object is already present
 2021-06-10 10:52:23 +05:30
Rishabh Saxena
07a292328a
Comments feature fixes (#4738) 2021-06-09 16:05:10 +05:30
Shrikant Sharat Kandula
4787b74958 Add API for setting page order in an application 2021-06-09 15:17:31 +05:30
Trisha Anand
1bb54b0c7c
[Bug Fix] : Mongo Form Find - Projection field is parsed correctly (#4976) 
* Parsing the field projection in Mongo Form

* Added test case to assert Projection field working.
 2021-06-08 19:27:55 +05:30
Anagh Hegde
1a44df90e1
Merge pull request #4921 from appsmithorg/bug/tests-failing-on-silicon 
Fix - tests don't run on an M1 Silicon Mac
 2021-06-08 16:52:10 +05:30
Nayan
b3bde4eb95 -organized imports 2021-06-08 15:52:25 +06:00
Nayan
ba4ea3a61b -fixed issue in unit test 2021-06-08 15:34:10 +06:00
Nayan
280155ac89 -added test for the email event handler 2021-06-08 14:43:21 +06:00
Nayan
5550c9310f -moved email sender to background task 2021-06-08 14:43:20 +06:00
Nayan
f9493a4bd2 -add unit test for utils 2021-06-08 14:43:19 +06:00
Nayan
db7363fac6 -Issue #4706 - send email when new comment added or comment thread resolved 2021-06-08 14:43:18 +06:00
Sumit Kumar
d2a74b5ac9
Feature: firestore plugin support for multiple where conditions (#3740) 
* allow users to add multiple where conditions to firestore's get documents query.
 2021-06-07 10:43:16 +05:30
Anagh Hegde
4268e4caaa Replace the repoTag from latest to fixed version 2021-06-04 13:49:20 +05:30
Anagh Hegde
b73f5c8ed1 Replace the repoTag from latest to fixed version 2021-06-04 12:37:16 +05:30
Anagh Hegde
b7ccb1da01 Fix - tests don't run on an M1 Silicon Mac 2021-06-04 11:15:44 +05:30
dependabot[bot]
98d5a0ff50
Bump httpclient from 4.5.10 to 4.5.13 in /app/server/appsmith-server (#4917) 
Bumps httpclient from 4.5.10 to 4.5.13.

---
updated-dependencies:
- dependency-name: org.apache.httpcomponents:httpclient
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-06-04 10:19:06 +05:30
Sumit Kumar
8199db669a
- remove DB Auth type check. (#4896) 
* remove DB Auth type check, since the type is not getting set and the check does not seem to be required in any way.
 2021-06-03 23:31:37 +05:30
Shrikant Sharat Kandula
80b6d6578c Fix migration NPE 2021-06-03 10:58:26 +05:30
Nidhi
226c0720bd
Default state for mongo actions that were already configured (#4873) 
* Default state for mongo actions that were already configured

* Clean up
 2021-06-03 09:20:47 +05:30
Abhijeet
8fea689b4d
Actions are updated to page level resource, application name included in json file name (#4879) 2021-06-03 08:59:27 +05:30
Nayan
77940c0cfa
[Issue #3785][Bug] User names in organization management page are stale (#4702) 
* [Issue #3785][Bug] User names in organization management page are stale

* -update name in userroles in background when there is a change in user
 2021-06-02 15:56:52 +06:00
Nayan
78915301e3
[Issue #4572]-Allow users to leave an organization (#4634) 
* [Issue #4572]-Added API to leave organisation by any user

[Issue #4572]-Add option for organization admins to leave an organization

* -add option to leave organization in frontend for non-admin users

* -updated the leave org endpoint path and HTTP method as per PR review

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserOrganizationServiceImpl.java

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* -add cypress test and some minor changes as per PR comment

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
 2021-06-02 15:56:22 +06:00
Abhijeet
51addbc963
Feature/import-export-application (#4553) 
* Decryption for dbauth, basic and OAuth datasources added in exported file

* All authentications for datasources included while exporting as deserialization is done through json file otherwise cast is throwing error

* Content-Disposition header implemented 

* MongoEscapedWidget names segregated for published and unpublished layout, to prevent overwrite while exporting

* Published pages and actions explicitly handled in cases where unpublished resources are deleted
 2021-06-01 17:38:26 +05:30
Nidhi
f9a4b0e0dc
Fixes failure due to extra spaces in authorization url in OAuth2 datasource (#4818) 
* Trimmed authorization url

* Using validation instead

* Update app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DatasourceValidator.java

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* Update app/server/appsmith-plugins/restApiPlugin/src/main/java/com/external/helpers/DatasourceValidator.java

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
 2021-06-01 13:45:04 +05:30
Sumit Kumar
e2f4fd5e94
Fix: Fix redis plugin socket error (#4791) 
* fix socket error
* fix default port
* remove invalid check for missing port, since default port would be supplied if user leaves the port field empty.
 2021-05-31 11:55:47 +05:30
Nidhi
5ddd58cdfd
Added optional audience and resource fields for oauth2 datasources (#4678) 
* Added optional audience and resource fields for oauth2

* Review changes

* Don't show audience and resource fields by default
 2021-05-27 21:53:59 +05:30
Shrikant Sharat Kandula
3c4f0ace72 Fix API error when marking threads as read 2021-05-26 17:18:26 +05:30
Nayan
caf7f3678c
[Issue #2689][Bug] Duplicate Accounts with Same Email - Field is Case… (#4529) 
* [Issue #2689][Bug] Duplicate Accounts with Same Email - Field is Case Sensitive

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

Co-authored-by: Nayan <83352306+nayan-appsmith@users.noreply.github.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
 2021-05-26 15:25:48 +06:00
Nidhi
2bf1fbff04
Removed check for encryption since this is not handled manually anymore (#4673) 
* Removed check for encryption since this is not handled manually anymore

* Removed migration for isEncrypted
 2021-05-25 20:29:57 +05:30
Nidhi
49c489dac0
Assume tokens with expiry have always expired (#4644) 2021-05-24 16:35:32 +05:30
Abhijeet
578c1d8506
Fork application event added (#4620) 2021-05-21 17:10:19 +05:30
Abhijeet
1845de739e
Added pluginName in execute_ACTION_TRIGGERED analytics event (#4610) 2021-05-21 15:50:48 +05:30
Sumit Kumar
c156560313
[Bug] fix NPE (#4613) 
* fix NPE
* add ip check for localhost
 2021-05-21 13:47:51 +05:30
Rishabh Saxena
8964aea9df
[Feature] Comments feature updates (#4579) 2021-05-20 17:33:08 +05:30
Shrikant Sharat Kandula
94d4302bcb
Merge pull request #4571 from appsmithorg/feature/notifications-api 
Basics and infrastructure for a Notifications system
 2021-05-20 13:49:56 +05:30
Confidence Okoghenun
639cba9095
Improve server setup experience documentation (#4441) 
* fix: Updates appsmith server docker-compose

* fix: Updates server docker-compose

* fix: Removes exposed ports

* docs: Adds updates for server docker-compose

* docs: Adds updates for server docker-compose

* docs: Updates app/server/README.md

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>

* chore: Removes deprecated env vars

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
 2021-05-19 19:29:08 +05:30
Shrikant Sharat Kandula
de4c66bf4e
Merge pull request #4570 from appsmithorg/feature/signup-query-param 
Add a isFromSignup query param to /applications after signing up
 2021-05-19 14:23:49 +05:30
Shrikant Sharat Kandula
efca2d0e47 Remove unused socketio dependency 2021-05-19 12:14:58 +05:30
Trisha Anand
d5e5be5d6a
[Feature] Mongo Form (#4378) 2021-05-19 11:05:24 +05:30
Arpit Mohan
b1d7258dcb
Adding support for multipart form data (#4547) 
* Handling multipart form data in the CURL import flow

* Adding Cypress test for curl import with multipart/form-data

* Also fixing minor bug where the form values need not always be double-quoted
 2021-05-19 10:48:51 +05:30
Shrikant Sharat Kandula
b1c523eef4 Fix flaky UserData test 2021-05-18 17:48:40 +05:30
Shrikant Sharat Kandula
28cab61e5b Separate notifications for comment threads 2021-05-18 17:16:09 +05:30
Shrikant Sharat Kandula
5f770b963f Merge branch 'release' into feature/notifications-api 2021-05-18 14:21:20 +05:30
Sumit Kumar
7df8581a5f
change java version to 11.0.10 to allow TLSv1 for mysql (#4528) 
* Change docker image java version to 11.0.10 to allow TLSv1 for mysql.
 2021-05-17 18:42:54 +05:30
Shrikant Sharat Kandula
ea02205259 Merge branch 'release' into feature/notifications-api 
# Conflicts:
#	app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Comment.java
#	app/server/appsmith-server/src/main/java/com/appsmith/server/services/CommentServiceImpl.java
 2021-05-17 14:55:34 +05:30
Shrikant Sharat Kandula
95a385dad7
Update names in comments when user name is changed (#4466) 
* Update names in comments when changed

* Move database operation to repository class
 2021-05-17 12:01:09 +05:30
Sumit Kumar
21948ab254
Fix: postgres plugin: add support for jsonb type (#4519) 
* add support for jsonb type
 2021-05-17 11:19:19 +05:30
Sumit Kumar
247e5d7ea4
Feature: return prepared stmt / smart substitution params under request params section for debugging (#4421) 
- return prepared stmt / smart substitution params under request params section for debugging
 2021-05-17 08:59:17 +05:30
Nayan
51dd6587cf
[Issue #2093]-show last used organizations first in home page (#4461) 
* [Issue #2093]-show last used organizations first in home page

* -updated as per the comments in PR
 2021-05-16 09:42:10 +06:00
Shrikant Sharat Kandula
2c2da7327d Add a isFromSignup to /applications 2021-05-14 12:39:58 +05:30
Trisha Anand
3e016296e6 Merge branch 'master' into release 
# Conflicts:
#	app/client/src/workers/DataTreeEvaluator.ts
 2021-05-13 14:43:00 +05:30