Commit Graph

2412 Commits

Author SHA1 Message Date
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
Vaibhav Tanwar
f934b632f9
fix: Improved error message for google sheet insert/update empty body (#18558)
Google Sheet empty insert/update body error messages improved.
2022-12-21 19:00:02 +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
Sumit Kumar
8bc1c77a96
fix: replace Appsmith's mock server endpoint with MockWebServer (#18943) 2022-12-15 05:17:43 +01:00
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
Aman Agarwal
cb1b0b5aa3
fix: removed old key_val_input, updated keyval_array, show ds info (#18626)
fix: removed old key_val_input, updated keyval_array, show ds info
2022-12-13 20:09:16 +05:30
Vaibhav Tanwar
770afde191
fix: Execute api pagination fix (#17886)
Query parameters encoding parameter added for paginated prev and next url.
2022-12-13 09:07:15 +00:00
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
sneha122
c094a28c40
fix: gsheet multiline broken formatting fixed (#18552)
* gsheet multiline broken formatting fixed

* junit test added

Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2022-12-09 15:53:55 +05:30
Shrikant Sharat Kandula
cf81c14ec2
chore: Add multipart payload support for admin settings (#18434) 2022-12-09 13:46:14 +05:30
Aman Agarwal
1bcb321ec3
fix: gs quick wizard table header index (#18242)
* fix: gs quick wizard table header index

* fix: disable generate button if error

* Omni spex fix

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-12-08 22:20:51 +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
appsmithguru
b64df3e1c9
chore: rename_triggerUtils (#18405)
Refactored Renamed TriggerUtils.java to RestAPIActivateUtils.java and its usage
2022-12-07 15:03:50 +03:00