Commit Graph

1816 Commits

Author SHA1 Message Date
Nidhi
dfccd5a058
chore: Upgrade to Spring Boot 3.0.1 (#19044)
This upgrade takes care of our move to JDK 17, Spring Boot 3.0.1 and a
few other security upgrades along the way.

Fixes #18993 

TODO:

- [x] Check CI changes for Java 17
- [x] Check vulnerability report
- [x] Mongock needs an upgrade
- [x] Add JVM args at all possible places for exposing java.time module
- [x] Add type adapters everywhere / use the same config for type
adapters everywhere
2023-01-02 19:40:59 +07:00
Hetu Nandu
c4f2a4d4f9
chore: Add Multi Pane Layout feature flag for specific emails (#19301)
Add features flag for Multi Pane Layouts for only a specific email ids
2022-12-30 10:52:42 +05:30
Nilansh Bansal
6e4805d5bd
feat: Adding Navigation Settings Functionality (#19272)
## Description
 
> This PR implements backend model and APIs for Part 1 of Improved App
Viewer Navigation Project i.e implementing the navigation configuration
settings
> [Notion
Doc](https://www.notion.so/appsmith/Improved-app-viewer-navigation-6126afa2a3694cad84382874a3f1bd9d#9d20423e53a54ec898083ab41f388af2)
> [Figma
Design](https://www.figma.com/proto/EkPT7FdqmArkk9L7mySA5S/NAV---Designs?page-id=748%3A313757&node-id=935%3A478734&viewport=303%2C-336%2C0.04&scaling=min-zoom&starting-point-node-id=935%3A478734)


Implements #19163 

## Implementation

It reuses the following existing APIs to implement storing and fetching
navigation settings:

/api/v1/applications/{applicationId} (PUT)
/api/v1/pages?applicationId=\<applicationId>(GET)

Additional fields `unpublishedNavigationSetting` and
`publishedNavigationSetting` have been added to the `application`
collection.


## Type of change
- New feature (non-breaking change which adds functionality)


## How Has This Been Tested?
- Manual

## Testing Results
> Postman testing results attached below

**Update publishedNavigationSetting API**

- API Route: /api/v1/applications/{applicationId}
- API Method: PUT
- API JSON Response:
[http://jsonblob.com/1057577523797573632](http://jsonblob.com/1057577523797573632)

<img width="818" alt="image"
src="https://user-images.githubusercontent.com/25542733/209783302-284cc505-fd78-43c7-8cd1-10b3d7295914.png">

**Update unpublishedNavigationSetting API**

- API Route: /api/v1/applications/{applicationId}
- API Method: PUT
- API JSON Response:
[http://jsonblob.com/1057578112661078016](http://jsonblob.com/1057578112661078016)

<img width="702" alt="image"
src="https://user-images.githubusercontent.com/25542733/209783640-97189e85-04a9-490b-b766-8f8fca908633.png">

**Database Record**

<img width="566" alt="image"
src="https://user-images.githubusercontent.com/25542733/209784012-58556a22-90a1-4d79-b99a-cc652415f5a6.png">

**GET Published and Unpublished Navigation Settings API**

- API Route: /api/v1/pages?applicationId=\<applicationId>
- API Method: GET
- API JSON Response:
[http://jsonblob.com/1057580262598393856](http://jsonblob.com/1057580262598393856)

<img width="732" alt="image"
src="https://user-images.githubusercontent.com/25542733/209784732-27340689-6616-404a-8cf7-dfb60737dc5c.png">






## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [x] PR is being merged under a feature flag


### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
2022-12-29 12:39:12 +00:00
Trisha Anand
6bd1b08bc3
chore: Adding projection back to BaseAppsmithRepository (#19271)
Projection support added as part of
https://github.com/appsmithorg/appsmith/pull/18904 was undone during
another refactor for the git rbac changes. Adding projection back for
appsmith repository functions.
2022-12-29 16:40:39 +05:30
Nidhi Nair
b6bbd5f0e2 Merge branch 'master' of github.com:appsmithorg/appsmith into release 2022-12-29 11:34:23 +05:30
Nidhi
828cdcd3b6
Revert "chore: Back merge v1.8.15 (#19288)" (#19294)
This reverts commit 23652a185b.
2022-12-29 11:28:48 +05:30
Nidhi
23652a185b
chore: Back merge v1.8.15 (#19288)
Should only contain what is already in master branch.

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Anand Srinivasan <66776129+eco-monk@users.noreply.github.com>
Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com>
Co-authored-by: Goutham Pratapa <pratapagoutham@gmail.com>
Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in>
Co-authored-by: Arsalan Yaldram <arsalanyaldram0211@outlook.com>
Co-authored-by: Ashit Rath <ashit@appsmith.com>
Co-authored-by: balajisoundar <balaji@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Rishabh Rathod <rishabh.rathod@appsmith.com>
Co-authored-by: Manish Kumar <107841575+sondermanish@users.noreply.github.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
Co-authored-by: keyurparalkar <keyur@appsmith.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Jacob Gillespie <jacobwgillespie@gmail.com>
Co-authored-by: yatinappsmith <84702014+yatinappsmith@users.noreply.github.com>
Co-authored-by: Vishnu Gp <vishnu@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
Co-authored-by: Pawan Kumar <pawan.stardust@gmail.com>
Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com>
Co-authored-by: subratadeypappu <subrata@appsmith.com>
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com>
Co-authored-by: Anand Srinivasan <anand.a.srinivasan@outlook.com>
Co-authored-by: Albin <albin@appsmith.com>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Tolulope Adetula <31691737+Tooluloope@users.noreply.github.com>
Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com>
Co-authored-by: “sneha122” <“sneha@appsmith.com”>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
Co-authored-by: sidhantgoel <sidhant@appsmith.com>
Co-authored-by: Rimil Dey <rimildeyjsr@gmail.com>
2022-12-29 11:24:59 +05:30
Nidhi
d946f43966
fix: Added projection for PageDTO during pages call (#19291)
Performance improvement on the /pages GET call
2022-12-28 22:58:04 +05:30
Nidhi
51f18af87f
fix: Added projection for page call that only needs application id details (#19273)
The NewPage document contains DSL details for a page as well. When we
don't need this information, we can use a projection that disables this
field. User was facing a problem with this call taking 12 seconds to
complete with those details. (document is 1 MB in size for them)
2022-12-28 16:24:32 +05:30
Trisha Anand
788cfe995b
fix: invite user should not update existing member's role (#19254)
Fixes #19244 
Fixes #17606

If an existing member is invited again from the Share modal with a
different role, the user gets assigned the other role as well. This
breaks the framework that a member of the workspace can only have a
SINGLE role. This breaks other flows like update role/delete member etc
because they all run with the assumption that the member can not have
more than one role in the workspace. This PR fixes this by throwing an
error if a user is being invited again to the workspace.
2022-12-28 07:03:54 +00:00
Trisha Anand
65970599bc
fix: Give datasource execute for public application without permission (#19243)
Test cases added at :
https://github.com/appsmithorg/appsmith-ee/pull/912
Fixes https://github.com/appsmithorg/appsmith/issues/19077
2022-12-27 14:39:24 +05:30
Trisha Anand
54fb76d2d6
fix: Adding user permissions in the response of move JS object between pages (#19212)
Fixes https://github.com/appsmithorg/appsmith/issues/19129
2022-12-26 18:32:23 +05:30
Anagh Hegde
ed05814abf
fix: Issue with permission in application publish and importExport flow for git connected app (#19190) 2022-12-26 17:59:12 +05:30
Shrikant Sharat Kandula
e58cdf40bb
fix: Logout user, if session deserialization fails (#19188)
We handle this in the global error handler, looking for the error
message that indicates this cause, and include a cookie deletion header,
so the user can recover by logging in again.

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-12-25 11:31:51 +05:30
Shrikant Sharat Kandula
0df42ed702
chore: Upgrade test MongoDB to v5 (#18807)
This should upgrade the MongoDB we use for running server tests to v5.
2022-12-23 11:17:42 +05:30
ChandanBalajiBP
cee50a4d3d
test: Cypress tests for AST-based entity refactor(WIP) (#18988) 2022-12-23 09:35:54 +05:30
Nidhi
81b257673f
chore: Upgraded Spring Boot and Spring to intermediate ver (#18844)
* chore: Upgraded Spring Boot and Spring to intermediate ver

* Introducing encryption version

* Added exit path on start up

* Fixed a few failures with release data

* Modified from property to init migration

* Removed prop

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/InstanceConfig.java

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

* Added comment on prop

* Minor stuff

* Test fixes

* Removed test dir

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-12-22 15:59:20 +05:30
sidhantgoel
dbb72c4778
feat: Support for Import/Export without ACL (#18997)
For EE RBAC compatibility, import/export for git sync does not use ACL
2022-12-21 23:35:11 +05:30
Nilesh Sarupriya
33077063ab
ci: flaky test validCloneApplicationWhenCancelledMidWay (#19091) 2022-12-21 14:13:54 +05:30
Shrikant Sharat Kandula
467a1f65eb
chore: Fix inconsistency in behaviour when re-marking public (#19031)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-12-19 15:29:58 +05:30
Trisha Anand
760738a430
chore: [GAC] Using correct permissions to fetch the application object using view mode (#19007) 2022-12-17 16:48:31 +05:30
Sumit Kumar
803043c12e
feat: add endpoints for custom JS library add / remove / get (#18904) 2022-12-16 18:00:50 +05:30
Anagh Hegde
82489a3ecd
fix: Add error message for protected branch (#18737)
* Add error message for protected branch

* Added Junit Test cases

* Add error message for protected branch

* Added Junit Test cases

* chore: push failed warning

* Add reset command

* Fix test failures

Co-authored-by: Anubhav <anubhav@appsmith.com>
2022-12-16 12:07:40 +05:30
Trisha Anand
27b579fa68
chore: Refactor sign up flow to support create workspace to be permission driven (#18981) 2022-12-15 23:47:36 +05:30
Trisha Anand
69bc3c06dc
fix: [GAC] editing js objects should use read permission for creating actions (#18977)
* chore: For Js action, only using read permission while creation. For non Js actions, using create page permission to fetch the page

* fixing ci test case failure
2022-12-15 23:45:02 +05:30
Anagh Hegde
9ae76f1c1f fix: App deleted when the user creates branch in few scenarios (#18964)
## Description

> Continuing from the PR - https://github.com/appsmithorg/appsmith/pull/18034. The app getting deleted bug was introduced when creating branch was introduced in the linked PR. 
Current PR adds a check to ensure that none of the git flow is affected. 

Fixes - https://app.frontapp.com/inboxes/teams/folders/15585868/unassigned/66043703436

## Type of change

- Bug fix (non-breaking change which fixes an issue)


## How Has This Been Tested?

- Manual

## Checklist:
### Dev activity
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or manual QA
- [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
2022-12-15 14:53:09 +05:30
sidhantgoel
912246232d chore: Splitted import export service code for V2 (#18927) 2022-12-15 14:53:02 +05:30
Manish Kumar
2445a3c625
chore: method signature changed for getCachedDatasourceForActtionExecution (#18950)
## Description

> To accommodate for datasource context adaption for environments, Some datasourceService methods needs to be aware of `environment name` in order to evaluate the `datasource configuration` for the given environment
> TL; DR : This Pr changes method signature for fetching  datasource by actionId

Fixes #18760  
Ref #18762 

## Type of change
 > Chore

## How Has This Been Tested?
- Manual
- Jest



## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
2022-12-15 14:47:03 +05:30
Anagh Hegde
051444f221
fix: App deleted when the user creates branch in few scenarios (#18964)
## Description

> Continuing from the PR - https://github.com/appsmithorg/appsmith/pull/18034. The app getting deleted bug was introduced when creating branch was introduced in the linked PR. 
Current PR adds a check to ensure that none of the git flow is affected. 

Fixes - https://app.frontapp.com/inboxes/teams/folders/15585868/unassigned/66043703436

## Type of change

- Bug fix (non-breaking change which fixes an issue)


## How Has This Been Tested?

- Manual

## Checklist:
### Dev activity
- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or manual QA
- [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
2022-12-15 14:44:16 +05:30
sidhantgoel
f2d7f54c29
chore: Splitted import export service code for V2 (#18927) 2022-12-15 11:23:25 +05:30
Trisha Anand
94e21d58df
chore: Adding variable to track admin settings visibility in user profile (#18956) 2022-12-14 18:28:20 +05:30
Manish Kumar
654f94a94c
chore: decomposing action execution flow methods into smaller methods (#18762) 2022-12-14 15:43:14 +05:30
Trisha Anand
122b5388ac
chore: use read permission to fetch pages in edit mode (#18944) 2022-12-14 13:02:17 +05:30
Shrikant Sharat Kandula
e4476e2893
chore: Fix more potential race condition in sending emails (#18884)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-12-12 16:12:39 +05:30
Shrikant Sharat Kandula
1bf842b525
chore: Fix potential race condition in sending email (#18882)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-12-12 15:34:46 +05:30
Nidhi
5329010415
fix: Refactor entities based on AST parsing logic (#18517)
* feat: Refactor entities based on AST parsing logic

* Deleted jmh file

* rts updates for the edge cases

* adding jest test cases

* update review comments

* Fixed issue with references outside of bindings and some other stuff

* Added tests for DSLUtils

* bug fix 18699

* Test fixes

* Test fixes

* Review comments

* Changed type to boxed

Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com>
2022-12-12 08:12:21 +03:00
sidhantgoel
4501434ede
chore: Synchronize Page,Action and ActionCollection object from original corresponding object (#18846)
Synchronize Page,Action and ActionCollection object from original corresponding object
2022-12-11 12:23:45 +05:30
Shrikant Sharat Kandula
e12b865bf2
Fix logos in email templates (#18835)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-12-10 08:02:37 +05:30
Pawan Kumar
d7e2c491e0
feat: Branding (#18717)
* add branding for ce

* add ce changes

* update colorpicker ux

* remove unsued flag

* Add new email templates

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* add local appsmith logo

* code review feedback fixes + qa fixes

* remove forward slash in url of favicon

* fix message

* Fix tests

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* update messages

* Fix tests (again)

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

* update messages

* fix cypress tests

* skipping app layout test cases

* fix cypress tests

* remove it.only

* try moving test

* use stable DS version

* remove __diff

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-12-09 20:13:47 +05:30
Nirmal Sarswat
9f0b9ee94b
fix: Filtering out empty value env variables from /admin/env API response in backend (#18430)
* Filtering out empty value env variables from /admin/env API response in backend

* adding UT for getAllNonEmpty;
2022-12-09 17:17:26 +05:30
Shrikant Sharat Kandula
cf81c14ec2
chore: Add multipart payload support for admin settings (#18434) 2022-12-09 13:46:14 +05:30
Vishnu Gp
a1702d9b2e
fix: Corrected action execution analytics event (#18783) 2022-12-08 21:05:34 +05:30
Ankita Kinger
10bdbed0e3
refactor: Updating upgrade flows to start using upgrade hook for better code reusability (#18735)
* updated upgrade flow for authentication page to start using upgrade hook

* using the upgrade hook on upgrade pages as well

* adding RBAC feature flag
2022-12-08 10:48:03 +05:30
Nilansh Bansal
669120b3a6
fix: fork template tracking (#18727)
fix: fork_APPLICATIONTEMPLATE event tracking added to merge template api (#18416)
2022-12-08 02:32:23 +00:00
Trisha Anand
0cbb0e20c6
chore: Fetch pages in editor with READ permissions (#18722) 2022-12-06 21:06:04 +05:30
Shrikant Sharat Kandula
e7b2e2392b
Fix NPE on reset password, and message formats (#18108)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-12-06 08:37:41 +05:30
Nidhi
166414b6d6
chore: Improved metadata on logs when reading DSL fails (#18692)
* chore: Improved metadata on logs when reading DSL fails

* Fixed test

* Test fix

* Review comment
2022-12-05 22:35:44 +03:00
Nilansh Bansal
ebadab572b
feat: Adding Embedding Apps Functionality in the API (#18566) 2022-12-05 15:49:37 +05:30
Anagh Hegde
f70ad56fae
chore: Remove debugging logs for analytics (#18662) 2022-12-05 11:29:25 +05:30
akash-codemonk
3eab587368
feat: [Context Switching] Maintain datasource collapse state (#17616) 2022-12-05 11:28:17 +05:30
Ankita Kinger
b7d00d2498
feat: Adding an upgrade page for Access control (#18554)
* updated content for access control upgrade page

* added feature flag and moved content to message constants

* adding feature flag for RBAC

* updated some styles

* added a missing comma

* removed width on trigger details container

* updated some styles
2022-12-04 20:12:35 +05:30
Trisha Anand
74dddd4701
fix: Add user permission in the response for update datasource api (#18629) 2022-12-02 13:40:57 +05:30
Trisha Anand
4345e29dc5
fix: If the user has delete permission on the workspace, allow the user to delete the workspace and also delete the default roles (without permission) (#18615) 2022-12-02 13:39:04 +05:30
Hetu Nandu
bf07e141f4
chore: Update NavigateTo tests to verify params (#18581) 2022-12-02 11:57:03 +05:30
Nilesh Sarupriya
68bb871fa8
chore: add events related to roles and groups (#18611) 2022-12-01 20:53:30 +05:30
Nidhi
83cbc3aed1
fix: Added view mode param to returned application object (#18522)
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-11-30 08:34:02 +03:00
Nidhi
9b45afbffb
chore: Fixed a failing assertion in page clone test (#18526) 2022-11-30 08:33:49 +03:00
Trisha Anand
effbcd1d25
chore: Minor code refactor to support changes around permissions and test cases in EE (#18563) 2022-11-29 21:28:43 +05:30
Nilesh Sarupriya
c27fbac04a
feat: segregate entity permissions (#18384) 2022-11-29 00:27:28 +05:30
sneha122
03eaab7c58
fix: gsheet save and authorize redirect issue fixed (#18389)
* gsheet save and authorize redirect issue fixed

* cypress test code review issue fixed

Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2022-11-28 10:42:27 +05:30
Anagh Hegde
a00dedb625
chore: Fix analytics NPE for checkout remote branch flow (#18466) 2022-11-26 17:37:07 +05:30
Anagh Hegde
f8580477ad
chore: Reduce size of payload to data sent to Segment (#18467) 2022-11-26 17:04:59 +05:30
Anagh Hegde
5530f3e26c
chore: Added size limit check for the message before sending the data to segment (#18453) 2022-11-25 16:04:40 +05:30
Nidhi
0447496e7f
chore: Switched to sequential checks instead of a parallel one for RTS check (#18440)
fix: Switched to sequential checks instead of a parallel one
2022-11-25 12:48:14 +03:00
Anagh Hegde
a7cb2ce39d
fix: App card is created even when app import fails and no action can be performed on this app card (#18034)
* Add loigc to delete the app created when the corrupted file is uploaded

* Update error message to fix test failures
2022-11-25 11:39:41 +05:30
subratadeypappu
c6a7786911
Add binding parameters' count to analytics data on execute action event (#18418) 2022-11-25 08:46:10 +05:30
Anagh Hegde
32eebcbd43
chore: Add logs from segment error retry handler (#18432) 2022-11-24 20:27:14 +05:30
akash-codemonk
cdcb6a0019
chore: add back feature flag for context switching (#18417)
## Description

Add back feature flag for context switching
2022-11-24 12:36:37 +05:30
Anagh Hegde
bae241461c
chore: Add data points for debugging event log (#18404) 2022-11-23 23:06:37 +05:30
Nilesh Sarupriya
287311ee98
feat: set user permissions for js object (#18077) 2022-11-21 17:22:04 +05:30
Nilansh Bansal
a5ec8600b9
fix: Fixed error message mentioning the wrong resource type (#18308) 2022-11-21 15:55:30 +05:30
Shrikant Sharat Kandula
d96019cbb1
fix: Fix NPE if email in admin emails doesn't have a user (#18222)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-11-21 14:14:42 +05:30
subratadeypappu
4e20b4c496
Fix JS object duplicate name issue (#18198) 2022-11-19 09:19:36 +05:30
Vishnu Gp
9c1f9e4af8
fix: Corrected usage of old soft deleted filter in BaseAppsmithRepository (#18238) 2022-11-18 09:33:00 +00:00
Vishnu Gp
4402b35247
fix: Error deleting application when soft-deleted entities are present in the application (#18185)
* fix: Error deleting application when soft-deleted entities are present in the application

* Review changes
2022-11-16 20:15:38 +05:30
subratadeypappu
993eae833e
fix: JS Objects save failures due to AST changes (#18018) 2022-11-16 05:40:29 +05:30
Hetu Nandu
b4adfcf8e2
feat: [Context Switching]: Change focus target and fix cursor position (#17794)
Co-authored-by: 
rahulramesha <rahul@appsmith.com>
2022-11-15 11:50:18 +05:30
Trisha Anand
5f8f8f9b70
chore: Re-adding the read permission group AclPermission (#18132) 2022-11-08 08:03:08 +05:30
Nilesh Sarupriya
39c4ae7f54
chore: add EE Pojo for UpdatePermissionGroup (#17902) 2022-11-02 21:46:44 +05:30
Anagh Hegde
518909f781
chore: Remove feature flags for GIT (#17170)
Remove feature flags for GIT

Co-authored-by: Anubhav <anubhav@appsmith.com>
2022-11-02 11:07:25 +05:30
Trisha Anand
42e790dc14
chore: Add missing relationships for RBAC (#17958) 2022-11-01 12:28:33 +05:30
Trisha Anand
9ec18c927a
chore: Remove example workspace creation in migration since its no longer used (#17995) 2022-11-01 06:58:16 +00:00
akash-codemonk
0cc0209eda
chore: remove feature flag for templates phase 2 (#17937) 2022-10-31 12:19:12 +05:30
Bhuvaneswari Pathsamatla
cc2c3eae69
chore: Refactor DB changelog to install plugins in workspace with single query (#17395)
*  refactor DB changelog to install plugins in workspace in much fewer iterations (in large size batches)
2022-10-30 17:10:50 +05:30
Trisha Anand
8f5e23b346
chore: Minor refactor to move the test case of CacheableRepositoryHelper to common code for CE and EE (#17950) 2022-10-29 16:08:14 +05:30
Trisha Anand
cbc0ad911a
chore: Delete default permission groups when workspace is deleted (#17941) 2022-10-28 17:37:41 +05:30
Nidhi
77a5c50157
chore: Removing AST connection acquisition pool limit (#17939)
* chore: Added logging for webclient provider

* Remove limit on connection acquisition pool

* Added timeout to acquisition

* Revert app props

* Formatting problem

* Increased acquisition timeout to 5 secs
2022-10-28 16:56:55 +05:30
Nilesh Sarupriya
3ee6572f77
chore: refactor workspace members api (#17891) 2022-10-27 11:56:08 +05:30
Arpit Mohan
f86453b230
chore: Deleting the permissions array from PermissionGroup collection (#17892) 2022-10-26 21:08:32 +05:30
Nidhi
204a187bc2
fix: Refactor entities with specific rules (#17523)
* Refactor changes for DSL

* Spaces

* Action and collection refactor logic

* Changes to some logic for DSL

* Fixed tests, added dynamic trigger path list logic as well

* Added test for dynamicTriggerList condition

* added analytics data to response in ast

* Fix for peer closed connection on AST

* Added comments for clarity

* Added logs for time taken by AST call

* handle export default and update success param accordingly

* updates for review comments

Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
2022-10-26 20:23:06 +05:30
Nilesh Sarupriya
e572a24f87
feat: set user permissions to objects when creating (#17871)
* set user permissions to objects when creating

* add/edit test cases

* add action collection test case

* update failing test cases
2022-10-26 14:43:21 +05:30
Anagh Hegde
e6d31115ee
fix: After merging the template the deployed version of the App was failing to load (#17753)
* WIP

* Do not update published pages while merging template for the existing App

* Add test case
2022-10-25 10:57:51 +05:30
Trisha Anand
9f1488a623
chore: Code split and refactor for inviteUser flow (#17807) 2022-10-23 15:30:19 +05:30
Vishnu Gp
31b03e8939
chore: Changes in layout and theme analytics events (#17827) 2022-10-22 21:50:32 +05:30
Arpit Mohan
82bf01fce9
chore: Update READ_PERMISSION_GROUP to PERMISSION_GROUP_MEMBERS (#17826) 2022-10-22 17:40:21 +05:30
Arpit Mohan
86c21b3af9
chore: Fixing flaky behaviour in SeedMongoData (#17812) 2022-10-22 12:47:51 +05:30
Anagh Hegde
23e6cf3bbf
chore: NPE for action execution tests (#17778) 2022-10-20 19:46:05 +05:30
Anagh Hegde
bd95ae4ef0
chore: Add action execution params to analytics (#17562) 2022-10-20 13:37:48 +05:30
Arpit Mohan
4e71432d74
chore: Adding base repository function to add user permissions to generic domain object (#17733)
## Description

Adding base function to set the user permissions for a user in any domain object. 

As part of this, we also add default permission group to the `SeedMongoData`. Without this fix, the JUnit tests go into an infinite loop. Also fixing the `ExampleWorkspaceClonerTest` file.

## Type of change

- Bug fix (non-breaking change which fixes an issue)

## How Has This Been Tested?

- JUnit

## Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
2022-10-20 03:00:30 +05:30
Vishnu Gp
b470cb29c8
chore: Added workspace details to user invite analytic event (#17644)
## Description

This PR adds the workspace details to user invite analytics event

## Type of change

- New feature (non-breaking change which adds functionality)

## How Has This Been Tested?

- Manually on local

## Checklist:

- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
2022-10-19 15:32:41 +05:30
Shrikant Sharat Kandula
8bc97b086e
chore: Add recommended indexes (#17704)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-10-19 14:20:30 +05:30
Shrikant Sharat Kandula
973997c606
Fix typo in cloud-hosting check and NPE from Segment (#17692)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-10-19 11:08:36 +05:30
Vishnu Gp
7a6d2ad314
chore: Corrected analytics event for instance setting events (#17622) 2022-10-19 01:11:05 +05:30
Nidhi
dcaa7af450
chore: Added feature flag for datasource environments (#17657)
chore: Added Feature flag for datasource environments
2022-10-18 15:51:31 +05:30
subratadeypappu
19e2e5785e
Fix/16994 refactor common datatype handling (#17429)
* fix:Add array datatype to execute request

* feat: Consume and store type of array elements in Param class (#16994)

* Append param instead of clientDataType in varargs (#16994)

* Refactor common data type handling w.r.t newer structure (#16994)

This commit takes care of the following items:
- It minimizes the number of usage to the older stringToKnownDataTypeConverter method
- Modifies the existing test cases to conform to the newer structure
- Marks stringToKnownDataTypeConverter method as deprecated to discourage further use

* Remove comma delimited numbers from valid test cases (#16994)

* Fix extracting clientDataType from varargs in MySQL (#16994)

* Pass param as a dedicated parameter in json smart replacement (#16994)

* Remove varargs from json smart replacement method (#16994)

* Move BsonType to mongoplugin module (#16994)

* Introduce NullArrayType and refactor BsonType test cases (#16994)

* Add new test cases on numeric string with leading zero (#16994)

* Refactor test case name (#16994)

* Add comment on the ordering of Json and Bson types (#16994)

* Add comment on the ordering of Json and Bson types (#16994)

* Add NullArrayType in Postgres and introduce postgres-specific types (#16994)

* Add data type test cases for Postgres and change as per review comments (#16994)

Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
2022-10-18 11:02:37 +05:30
Anagh Hegde
06f1b23625
chore: Add properties to analytics event (#17621) 2022-10-17 22:21:07 +05:30
Nilesh Sarupriya
019072b4de
fix: update regex and test case for organisation website (#17612) 2022-10-17 21:43:07 +05:30
Hetu Nandu
3aff53187c
feat: Maintain Focus and Context Phase 1 (#16317) 2022-10-17 20:46:38 +05:30
Arpit Mohan
70f79ae69a
chore: Updating the tenant API to return the complete object instead of just the configuration (#17615) 2022-10-17 14:21:28 +05:30
Trisha Anand
ad57c3533d
chore: BaseAppsmithRepo code split (#17614) 2022-10-17 14:14:52 +05:30
Nidhi
2af4fd136b
fix: Fixed check for duplicate JSObject names in an application page (#17536)
* fix: Fixed check for duplicate JSObject names in an application page

* Fixed merge conflicts

* Reverted file with unchanged tests

* Fixed test name
2022-10-17 10:31:42 +05:30
Nidhi
c3e935ef40
fix: Remove datasource connection from cache when datasource is deleted (#17364)
* Changes to testDatasource interface method and archive flow

* Tests for plugin level testDatasource implementations

* Added test for refreshing cache on deleting datasource

* Modified warnings to errors in logs

* Fixed test

* Fixed test
2022-10-17 10:31:26 +05:30
Arpit Mohan
6e2ebbe2fd
chore: Fixing the API to fetch current tenant configuration (#17581)
Fixing the /api/v1/tenants/current API
Also fixing the ObjectMapper configuration to serialize empty beans in the entire product
2022-10-15 16:27:42 +05:30
Arpit Mohan
1d176ec086
feat: Add configuration API to save some configurations in tenantConfiguration (#17407) 2022-10-15 10:04:21 +05:30
Manish Kumar
c3e807d246
chore: changed the datasource-update event tag for analytics (#17326)
* Flipped the user/server invoked datasource update, Now the key is isDataosourceUpdateUserInvoked

* overridden update method from basecontroller in datsourcecontroller

* made tag final

* migrated tag key to FieldName.java
2022-10-14 11:33:18 +05:30
Dhruvik Neharia
c0318b6451
feat: Change Modern/Default Theme Background to #F8FAFC (#17345)
* feat: Change Modern/Default Theme Background to #F8FAFC

* feat: Update modern/default theme bg in system themes

* fix: Update basic spec theming test with new modern theme background color

* fix visual tests

* fix: Update WidgetsLayout_spec.js snapshots

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Pawan Kumar <pawan.stardust@gmail.com>
2022-10-14 11:10:50 +05:30
Shrikant Sharat Kandula
bbe4b7453e
fix: Use JSON to serialize sessions for OAuth (#16632) 2022-10-14 10:59:23 +05:30
Dhruvik Neharia
7b7ca712fd
feat: Add Text Truncate Button Color to System Themes (#17299)
* feat: Add text truncate button color to system themes

* updated colour used

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Nandan <nandan@thinkify.io>
2022-10-14 10:07:34 +05:30
Anagh Hegde
b60c504f7d
fix: Post forking an application without the first page the application ends up having pages with page name as the page id (#17474)
* Remove pages from the application object as well while merging the selected pages

* Add tests for selected pages with merge template flow

* Add test case for all the pages selected
2022-10-14 08:06:53 +05:30
Nilesh Sarupriya
725abae97a
chore: add transient user permissions to action collection DTO (#17485)
* Add transient user permissions to Action Collection DTO

* Add test for Transient Fields.
2022-10-14 01:23:05 +05:30
Anagh Hegde
31d7077da2
fix: App Version issue where the app was getting reset to old url after the template was merged to existing application (#17517)
Fix the App Version issue where the app was getting reset to old url format
2022-10-13 20:25:08 +05:30
Vishnu Gp
0f73e43cd7
feat: Added analytics events for admin settings updates (#17491)
* feat: Added analytics events for admin settings updates

* Review changes - Variable name change
2022-10-13 12:13:29 +00:00
Nidhi
55ccae03c6
fix: Added null check for action dependency edge (#17495)
* fix: Added null check for action dependency edge

* Revert other change
2022-10-11 23:24:26 +05:30
Nidhi
b9aff18c62
chore: Refactoring refactor flows (#17442)
* chore: Refactoring refactor flows

* Merged fron release
2022-10-11 15:24:04 +05:30
Anagh Hegde
177a6e1425
chore: Fix NPE in git service analytics (#17451) 2022-10-11 11:13:49 +05:30
Nidhi
74c3dbbc1a
fix: Modified on page load actions calculation using AST (#17074)
* Changes to on page load logic and consumption for update layout

* Slight clean up, tests and stuff

* - Added evaluationVersion logic based on application configuration
- Added configuration for slim and fat container rts availability
- Added backup logic of string comparison for slim containers
- Added tests for both paths

* Changes to on page load logic and consumption for update layout

* Slight clean up, tests and stuff

* Cleaned up comments all over

* Why isn't there even a setting to disable auto re-formats

* update rts logic to use updated shared AST logic

* Make changes to naming conventions

* Some temp stuff to check if update layout API changes will work out

* Added health check endpoint in RTS

* Added types for AST request

* update: type for save page request object

* update: return type for getEditorConfigs func

- Added applicationId to the type.
- Fetching from the redux store -> applications -> currentApplication -> id

* update: url generation func for update page API

- added applicationId as query param for the call

* Fixed test failures

* Fixed merge from release with on page load failure messages

* Fixed tests failing after merge

* Review comments, more tests, and fix for array index ref directly after .data path

* Test fix

* Addressed review comments

* Updated comment

* Fixed rts temporarily, added handling for data as function name, left with tests

* fix: failing rts server

* Tests for all types of actions and references

* Changes to test

* Modified type to set

* Test fixes

* Trying to make a test pass

* Added app id in cypress test update dsl

* Added app id in cypress test update dsl

* Added app id in cypress test update dsl

* Removed dep tree temp file

* Resolving compile issues after merging from release

* updated tests for applicationId

* corrected a typo

* fixed some more tests

* updated test

* Updated test

* DSL load AppId fix

* appId removal

* AgHelper LocalStorageCache()

* AgHelper LocalStorageCache() - commit 2

* AgHelper LocalStorageCache() - commit 3

* AgHelper LocalStorageCache() - commit 4

* AllWidgets_Reset_spec - Dsl fix

* Json_spec fix

* S3_2 spec fix

* fixes

* LocalStorageCache fixes

* fixes

* fixes

* fix

* OnLoadActions spec fix

* Promises spec fix

* S3_2 spec fix

* 16702 spec update

* OnLoadActions spec trial fix

* RTS fix

Co-authored-by: Nidhi Nair <cataclysm@Nidhis-MacBook-Pro.local>
Co-authored-by: Ayangade Adeoluwa <adeoluayangade@yahoo.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Apple <nandan@thinkify.io>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-10-11 11:02:44 +05:30
akash-codemonk
b47f04206f
chore: fix templates feature flag param name (#17391) 2022-10-10 19:57:54 +05:30
Vishnu Gp
9b3858e3e8
fix: Fixed wrong event data on page view event (#17390) 2022-10-07 23:37:06 +05:30
Anagh Hegde
1a7820517c
fix: forking template to a child branch of git connected app is throwing Page not found error (#17292)
* Use the branched application for git connected apps

* Add error handling and comment

* Changes per review

* Add check before updating the action collections with the defaultPageId from the default page for git apps

* Fix git sync id not set in ImportExport flow

* Remove error handling

* Add tests for template merge flow
2022-10-07 17:11:01 +05:30
Vishnu Gp
b6436793f1
chore: Moved page delete to happen only after other resources are deleted (#17300)
* chore: Moved page deleted to happen only after other resources are deleted

* Corrected the resource deletion flow on application delete operation

* fix: Fixed race condition error

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-10-07 15:39:13 +05:30
Nilesh Sarupriya
f6365671d9
fix: workspace email website validation (#16912)
* Add validation checks for Email and Website

* Add test cases

* Update pattern and Test cases

* Valid and Invalid samples for regex

* Update test cases.
2022-10-06 11:56:38 +05:30
Manish Kumar
ab2d580e90
chore: added datasource-save event differentiator for analytics (#17237)
* chore: added datasource-save event differentiator for analytics

* added more comments

* code readability changes
2022-10-05 17:03:30 +05:30
Shrikant Sharat Kandula
df1139e640
fix: Use proxy for access token requests (#17195)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-10-04 20:25:06 +05:30
Abhinav Jha
e6b89d03aa
Sandboxed iFrames with srcDoc (#11426)
Change iFrame widgets to use sandbox mode if srcDoc is provided
Allowed options:
`allow-forms allow-modals allow-orientation-lock allow-pointer-lock allow-popups allow-scripts allow-top-navigation-by-user-activation`

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-10-04 15:20:45 +05:30
Shrikant Sharat Kandula
2bc928745e
Fix updating wrong workspace (#17266)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-10-03 14:41:19 +05:30
Trisha Anand
ef53e46d86
chore: Permission Group Service minor refactor (#17247)
No requirement for generating a specific create event for the same. All the validations, and extra settings have already happened. Directly save
2022-10-02 21:56:28 +05:30
Trisha Anand
06bee0f13e
chore: Refactored validCreateWorkspaceTest test case to ensure EE test case scenario also passed by moving away from absolute assertions to containsAll way of expression (#17245) 2022-10-02 16:59:53 +05:30
Nilesh Sarupriya
80c22a42b3
chore: minor refactor get datasource from action (#17210) 2022-10-01 18:46:09 +05:30
Shrikant Sharat Kandula
cc68fac236
Fix escaping single quotes in env variable values (#16983)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-09-29 18:37:59 +05:30
Shrikant Sharat Kandula
9a351070b1
Fix template filtering version mismatch (#16843)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-09-29 17:20:07 +05:30
Arpit Mohan
c036087379
chore: Import template application to a git branch in application (#17032)
Also fixing the comodification array error when we are removing items from a list while iterating over it.
Fixes #17030

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-09-29 14:39:19 +05:30
Aswath K
756d27b00e
chore: Property pane config cleanup (#16639) 2022-09-29 10:54:49 +05:30
Nidhi
66f3dfe790
chore: Move to Jupiter JUnit5 (#17083)
* Upgrading to Jupiter tests for everything but plugins

* Whoops, too soon

* Fixed failing tests

* Imports fixed

* Removed PowerMock dep and JUnit4 from interfaces

* Woohoo! That's testcontainers

* Added maven enforcer to disallow junit4

* Update app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java

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

* Update app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceTest.java

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

* Update app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ActionServiceCE_Test.java

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

* Update app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/CreateDBTablePageSolutionTests.java

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

* Weird formatting and version upgrades

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-09-29 08:54:07 +05:30
Vishnu Gp
4b4b2f97d4
fix: Fixed NPE issue with analytics event on authentication method configuration (#17112) 2022-09-29 00:33:54 +05:30
Anagh Hegde
cf17eaa447
chore: Add view mode to the analytics events (#15791)
* Add view mode to the analytics events

* Add view mode to the analytics events

* Fix UnSupported operation with template

* Replace hardcoded strings
2022-09-29 00:31:14 +05:30
Anagh Hegde
cc1a39b36d
test: Fix Curl import test failures for AuditLog (#17013)
Fix Curl import test failures for AuditLog
2022-09-26 13:33:19 +05:30
Vishnu Gp
c72b8eae2a
chore: Changes in action execution analytics event (#17021) 2022-09-26 10:11:38 +05:30
Manish Kumar
bfc79bdfd3
feat: Informative error messages on cyclic dependency for queries on page load (#16634)
* This commit addresses the feature https://github.com/appsmithorg/appsmith/issues/16154

Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2022-09-24 15:31:52 +05:30
Trisha Anand
4c69e15b29
chore: Replacing redis entry with in memory storage for anonymous user permission groups (#17031) 2022-09-23 20:26:13 +00:00
Hetu Nandu
28a3fc6625
feat: Create a feature flag for Templates: Phase 2 (#17025) 2022-09-23 19:02:17 +05:30