Commit Graph

2851 Commits

Author SHA1 Message Date
Nayan
ab568573cf
chore: Refactored code for git discard flow (#21453)
## Description
This PR refactors the discard flow by removing the Pull flow. It'll only
discard local changes and revert to the last committed version.



Fixes #20622 
> if no issue exists, please create an issue and ask the maintainers
about this first
2023-03-16 09:03:35 +00:00
Nayan
e0bfdbe6c3
chore: Added tests for leave workspace flow (#21416)
## Description

Added and updated tests for the leave workspace flow. 

Fixes # (issue)
> if no issue exists, please create an issue and ask the maintainers
about this first


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

> Please delete options that are not relevant.

- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- Chore (housekeeping or task changes that don't impact user perception)
- This change requires a documentation update


## How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Provide
instructions, so we can reproduce.
> Please also list any relevant details for your test configuration.
> Delete anything that is not important

- Manual
- Jest
- Cypress

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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

---------

Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com>
Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
Co-authored-by: nilansh <nilansh@appsmith.com>
2023-03-16 12:48:19 +05:30
sneha122
6ade2eab4d
chore: feature flag value updated for gsheets (#21391)
## Description

This PR updates the feature flag for Limiting Gsheet Access project,
earlier the feature flag was added for appsmith and moolya domain users,
but now it is updated to only for account integrations@appsmith.com

> Add a TL;DR when description is extra long (helps content team)

Fixes https://github.com/appsmithorg/appsmith/issues/21390


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

- Chore (housekeeping or task changes that don't impact user perception)


## How Has This Been Tested?

- Manual

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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

Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-03-16 11:51:05 +05:30
Anagh Hegde
07224e58d6
fix: for SAAS plugins user configured values not separated (#21369)
## Description

> 
1. We're not showing the count for queries with just metadata files.
This needs to be handled. Try it for Twilio queries.
2. The user-configured values and system-generated metadata are not
split into two files
This PR fixes these issues. 


Fixes #21343 

## Type of change

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


## How Has This Been Tested?

- Manual

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
2023-03-15 20:37:30 +05:30
Shrikant Sharat Kandula
7b56706717
feat: Add static header for CSRF protection (#20965)
We add a static constant value header, to all requests made by the
client, whose method isn't `GET` or `HEAD`.

More discussion in [this Slack
thread](https://theappsmith.slack.com/archives/C03RPDB936Z/p1669701485071579?thread_ts=1669460732.544859&cid=C03RPDB936Z).
2023-03-15 15:32:24 +05:30
Nilansh Bansal
3a22c4d91d
refactor: application detail refactor (#21130)
## Description

> This PR refactors the backend code and the `Application` model to
accumulate the newly added published and unpublished fields into
`ApplicationDetail`

Fixes #19280

## Type of change

- Breaking change (fix or feature that would cause existing
functionality to not work as expected)


## How Has This Been Tested?

- Manual
- JUnit

## 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
- [x] 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


### 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
2023-03-15 15:05:35 +06:00
Nayan
6158c49b05
fix: cloned application is not published (#21366)
## Description
When an application is cloned, it's not published. As a result if the
user tries to open the new application in view mode, it throws error.
This PR fixes it.

Fixes #21309

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

> Please delete options that are not relevant.

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


## How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Provide
instructions, so we can reproduce.
> Please also list any relevant details for your test configuration.
> Delete anything that is not important

- Manual
- JUnit test

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [x] 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


### 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
2023-03-14 13:20:40 +05:30
Nilansh Bansal
8a78450659
chore: fix flaky test publishApplication_withPageIconSet_success (#21355)
## Description
> This PR fixes the flaky test
`publishApplication_withPageIconSet_success` by maintaining the page
order of the application pages

Fixes #21220 

## Type of change
- Chore (housekeeping or task changes that don't impact user perception)


## How Has This Been Tested?

- JUnit

## Checklist:
### Dev activity
- [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
- [ ] 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
2023-03-13 17:29:58 +00:00
Nayan
ba81cb2ea1
feat: Add option to delete a application snapshot (#21216)
## Description
This PR adds the option to delete an application snapshot in the
following cases:
    
- A DELETE API that'll delete an application snapshot
- The restore API should delete the underlying application snapshot if
the restore is successful



Fixes #21215


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

> Please delete options that are not relevant.

- Chore (housekeeping or task changes that don't impact user perception)


## How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Provide
instructions, so we can reproduce.
> Please also list any relevant details for your test configuration.
> Delete anything that is not important

- Manual
- JUnit tests

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [x] 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


### 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
2023-03-09 11:16:43 +05:30
sneha122
0f838535c3
feat: file picker added and access token generation (#20778)
## Description

This PR includes following changes:

- In case of limiting google sheet access project, when user selects specific sheets as an option, they should be shown file picker UI once the authorisation is complete, In this file picker UI, users can select the google sheet files that they want to use with appsmith application and allow access to only those files.
- This PR contains the changes for file picker UI and updating datasource auth state based on the files selected by user.


TL;DR
Steps to test this PR:

- Create Google Sheet datasource
- In the datasource config form, select specific sheets as an option from the scope dropdown.
- Click on save and authorise
- This will take you to google oauth process

<img width="467" alt="Screenshot 2023-02-20 at 1 24 24 PM" src="https://user-images.githubusercontent.com/30018882/220045493-57b0ca6c-3f08-4963-af55-d603cf79bc43.png">

- Select the google account
- This will take you to google oauth2 consent screen

<img width="451" alt="Screenshot 2023-02-20 at 1 24 55 PM" src="https://user-images.githubusercontent.com/30018882/220045641-9f70dd29-6664-489a-b77b-df65445491df.png">

- Click on allow for all requested permissions
- This will take you back to appsmith's datasource config page in view mode and load the file picker UI
<img width="425" alt="Screenshot 2023-02-20 at 1 25 47 PM" src="https://user-images.githubusercontent.com/30018882/220045828-8b3e3e46-4ddc-4e30-b2f8-f12865395817.png">
- Select the files that you want to share with appsmith app
- Click on select
- You should see the new query button in enabled state, as datasource authorisation is complete

<img width="800" alt="Screenshot 2023-02-20 at 1 27 28 PM" src="https://user-images.githubusercontent.com/30018882/220046131-6ce99a85-cddc-4529-ae45-f9833aefd71b.png">

- In case you select cancel on google oauth2 consent screen, you should error message on datasource config page with new query button being disabled

<img width="810" alt="Screenshot 2023-02-20 at 1 28 49 PM" src="https://user-images.githubusercontent.com/30018882/220046385-6b8d636c-b517-44c3-a596-b52bc0084b94.png">

- In case you do give all the permissions but do not select any files in google file picker, then also you should see error message on datasource config page with new query button disabled.

Fixes #20163, #20290, #20160, #20162


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video


## Type of change

> Please delete options that are not relevant.

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


## How Has This Been Tested?

- Manual

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR)


## 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

Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-03-08 10:55:17 +05:30
Nayan
ab19f80e93
Improved error log while import application (#21229)
## Description
Sometimes our users face an error Plugin not found. The error message
and logs lack which plugin is missing and why. This PR adds missing
plugins package name to the message. It also logs the same information
in the error log in addition to the list of available plugins. This will
help to debug this type of issues in future.

> Add a TL;DR when description is extra long (helps content team)

Fixes # (issue)
> if no issue exists, please create an issue and ask the maintainers
about this first


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

> Please delete options that are not relevant.
- Chore (housekeeping or task changes that don't impact user perception)


## How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Provide
instructions, so we can reproduce.
> Please also list any relevant details for your test configuration.
> Delete anything that is not important

- Manual
- Jest
- Cypress

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
2023-03-07 22:37:15 +06:00
Nayan
e1d859acb4
feat: Add api to update mulitple layout (#21105)
## Description

We need an API to update multiple page layouts with a single request.
For the mobile responsiveness project, the client migrates an existing
app from fixed layout to auto layout. After the migration is done, it
needs to send the updated layout one by one. With this new API, the
client needs to make a single API call to update all the layouts.

Fixes #21104
2023-03-03 17:20:15 +06:00
Nidhi
ec351ccdb7
fix: Removed on page load edges from layout model (#21038) 2023-03-02 11:28:32 +07:00
Nayan
2116a2cc70
feat: Add a restore point for Applications (#20933)
## Description
This PR adds a way to take a snapshot of an application on the database.
That snapshot can be restored to the application.

Under the hood it uses the Export-Import feature.

Fixes #19720
2023-03-01 17:06:18 +06:00
Anagh Hegde
4f9fe83646
feat: file structure v2 for actions (#20606)
## Description

> Ignore the body field while committing the JS Object related actions
to git repo.


Fixes https://github.com/appsmithorg/appsmith/issues/20550
https://github.com/appsmithorg/appsmith/issues/19546


## Type of change

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


## How Has This Been Tested?

- Manual
- JUnit

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
2023-02-28 23:54:38 +05:30
Nilesh Sarupriya
fb9becec1d
fix: redirection to HomePage when CREATE WORKSPACE permission revoked from Default Role (#21004)
## Description

> Updating the SignUp success flow to take into account, if the new User
can create Workspace or not.
> Issue: 
> When the admin revokes the Create Workspace permission, the existing
flow is still trying to create the workflow post the signup, which
throws an Internal Server Error.
> Solution:
> A check has been introduced which will skip the Workspace Creation
step, if the admin has blocked Workspace Creation from the **Default
Role for All Users** role.
> Also, another change in behaviour is the redirection strategy.
> When the Create Permission is revoked, the user will land on the
HomePage.
> When the permission is not revoked, user will land on a new
Application with the Onboarding tutorial (this exists).

Fixes https://github.com/appsmithorg/appsmith/issues/20980

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

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

## How Has This Been Tested?
This has been tested manually on the local setups, and a QA has been
done on the same on the Deploy Preview.

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [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
- [ ] 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

---------

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
2023-02-28 20:37:56 +05:30
Shrikant Sharat Kandula
629e804769
chore: Add email domain hash (#20745)
Adds hashed email domain to some events.
2023-02-27 21:08:54 +05:30
Shrikant Sharat Kandula
3f0c8dccdf
chore: Add version information in instance_stats (#20937) 2023-02-27 19:47:38 +05:30
Manish Kumar
ab0a289d3a
fix: enforcing content-type header while registering the instance id (#20947) 2023-02-27 13:36:45 +07:00
Nilesh Sarupriya
bc77a214b2
fix: remove sensitive information being sent to analytics (#20924)
## Description

> Earlier, we were sending the emails of the invited users to Telemetry,
which should not happen. They should only be limited to Audit Logs.
Hence we are removing this information from the Analytics Data and
making it part of the Event Data. This will ensure that the user emails
will only go to the Audit logs only.

Fixes https://github.com/appsmithorg/appsmith/issues/20923


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

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


## How Has This Been Tested?
> Tests cases have been updated in EE.

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [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
- [ ] 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

---------

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
2023-02-24 14:54:34 +05:30
Nilesh Sarupriya
5a31fd53a7
feat: migrate default workspace to default domain (#20501)
## Description

> Migrate the Default Workspace Id field in Permission Group to a
combination of Default Domain Id and Default Domain Reference field.

Fixes https://github.com/appsmithorg/appsmith/issues/20500


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

- Chore (housekeeping or task changes that don't impact user perception)


## How Has This Been Tested?
> Tested manually

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [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
- [ ] 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

---------

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
2023-02-24 12:31:52 +05:30
Sangeeth Sivan
872f799778
feat: usage and billing ce (#20653)
### Description
 - Removes feature flags for usage & billing.
 - moves pricing url to constant.

---------

Co-authored-by: Vishnu Gp <vishnu@appsmith.com>
2023-02-20 22:29:06 +05:30
Manish Kumar
6282932c89
chore: refactoring workspace creation and archive methods to facilitate environment creation in EE. (#20494)
## Description

> In Enterprise edition, the environments will be created by default
when we create a new workspace.
However to facilitate those changes, and to keep code maintainable,
these snippets are neccesary.

> This PR has refactored workspace creation flow into separate methods
to
-  allow addition of resourceIds in `permissionGroup` permissions in EE.
-  added static method to reduce code repeatability

> This PR has changed some methods in workspaceServiceTest, those
methods were using same workspace object to create new workspaces when
called in a loop, however the workspace object used to create was
assigned id after first `workspaceService.create` call, the subsequent
create calls returned same workspace object, furthermore the linked
dependents were new each time causing problem.
As a fix, creating a new workspace object each time for create calls in
loop.

## TL;DR
> Refactor to facilitate the default environment creation PR in the EE 

Fixes https://github.com/appsmithorg/appsmith/issues/20790
> This issue is a facilitator PR for [default environments with
workspace PR](https://github.com/appsmithorg/appsmith-ee/pull/1027).

## Type of change
- Chore (housekeeping or task changes that don't impact user perception)

## How Has This Been Tested?
- Manual

## 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
- [ ] 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
2023-02-20 20:37:38 +05:30
Nidhi
412179d1fc
fix: Increased Nginx limit to 150 MB to allow 100 MB Base 64 encoded files (#20617)
## Description

We're increasing the default limit of request payload on cloud so that
100 MB files that are base 64 encoded can also be uploaded via Appsmith.

Fixes #20424

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

## How Has This Been Tested?
- Manual

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
2023-02-20 20:34:02 +05:30
Shrikant Sharat Kandula
269ad319e1 chore: Fix compilation error 2023-02-20 19:30:35 +05:30
Shrikant Sharat Kandula
5b0d701a27
chore: Refactor tenant email param (#20759)
Refactoring to make the `updateTenantLogoInParams` function testable in
EE code.
2023-02-20 19:08:33 +05:30
Sumit Kumar
8b32fb6e59
fix: allow MsSQL plugin to connect with ssl encryption (#20568)
## Description
- Currently MsSQL plugin enforces SSL setting to be disabled when
connecting with a database, hence any database that does not allow
non-encrypted connection would fail the connection.
- This PR introduces SSL dropdown to MsSQL datasource config page with
two modes - (1) `disabled` (2) `encryption with no verify`
- `encryption with no verify` means that an encrypted connection would
be established but the client would not seek to verify the authenticity
of the database server.
- This PR also migrates the older existing MsSQL datasources to include
the SSL config with mode being `disabled` since this is how the plugin
is effectively configured at the moment.
- An attempt was made to use the new `ChangeUnit` way of writing the
migration but was abandoned in the interest of time after some re-tries
due to some error during runtime.

Fixes #19039 #20048

## Type of change
- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)

## How Has This Been Tested?
- Manual
- Attempted to add JUnit TC but had to roll back because of some issues
with DB connections opened via other JUnit TCs. Tracking this issue
here: https://github.com/appsmithorg/appsmith/issues/20570

### Steps for manual testing
(1) Run MSSQL using docker cmd: `docker run -d --name sql_server -e
'ACCEPT_EULA=Y' -e 'SA_PASSWORD=someThingComplicated1234' -p 1433:1433
mcr.microsoft.com/mssql/server:2019-latest`
(2) Switch to `release branch`. 
(3) Create a MSSQL datasource and create valid connection to the DB
created in step (1). Check that the datasource has no SSL dropdown
config.
(4) Create a query on datasource created in (3). Verify that the query
runs.
(5) Switch to this PR branch. Spin up the sever. 
(6) Edit the datasource created in (3) and check that there is a SSL
dropdown with `Disabled` config set.
(7) Check that test datsource passes and query in (4) still works. 
(8) Create a new datsource and check that it has SSL option set to
`Enable with no verify`.
(9) Check that datasource in (8) works.

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [ ] 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


### 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
2023-02-20 18:32:46 +05:30
Anagh Hegde
33940ea348
chore: Add missing log statements (#20766)
> Add missing log statement for the content type error scenario.
2023-02-20 13:21:02 +05:30
ChandanBalajiBP
b72dea33f3
feat: Error handling phase 1 (#20629)
## Description
This PR updates the error logs 
- Establishing a consistent format for all error messages.
- Revising error titles and details for improved understanding.
- Compiling internal documentation of all error categories,
subcategories, and error descriptions.

Updated Error Interface:
https://www.notion.so/appsmith/Error-Interface-for-Plugin-Execution-Error-7b3f5323ba4c40bfad281ae717ccf79b

PRD:
https://www.notion.so/appsmith/PRD-Error-Handling-Framework-4ac9747057fd4105a9d52cb8b42f4452?pvs=4#008e9c79ff3c484abf0250a5416cf052

>TL;DR 

Fixes # 


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

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


## How Has This Been Tested?

- Manual
- Jest
- Cypress

### Test Plan


### Issues raised during DP testing


## 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
- [x] 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
- [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

---------

Co-authored-by: subrata <subrata@appsmith.com>
2023-02-18 18:25:46 +05:30
Anagh Hegde
b56c227b9f
chore: update error message for git file lock error (#20746) 2023-02-17 13:57:55 +01:00
Vishnu Gp
bda10bb070
chore: Added extra analytics events for license (#20638)
## Description

Added extra events for license-related analytics events. Also did some
functional breakdown of code

## Type of change

- Chore (housekeeping or task changes that don't impact user perception)


## How Has This Been Tested?

- Manual


## 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


### 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
2023-02-15 21:43:52 +05:30
Sumesh Pradhan
a846bd4952
fix: renamed rts port env to APPSMITH_RTS_PORT (#20121)
Issue: Nginx and RTS used the same env PORT for binding it's service,
while the backend server had the rts port hardcoded on its rts uri.
- Renamed env PORT to APPSMITH_RTS_PORT for starting the rts server.
- Updated nginx config templates to use env `APPSMITH_RTS_PORT`
- Added appsmith.rts.port property in server to use env
APPSMITH_RTS_PORT
- Updated CommonConfig.java rtsBaseDomain to use appsmith.rts.port

---------

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2023-02-15 07:06:02 +05:30
Anagh Hegde
34822d563a
fix: Add file system locks after the git operation (#12174)
## Description

> Add file locking using redis with retry. Helpful when multiple users
are trying to perform git actions in the Appsmith UI.

Fixes #10856 
Fixes #14366

## Type of change


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

## How Has This Been Tested?

- Test A
- Test B

## Checklist:

- [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
- [ ] 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

---------

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Sidhant Goel <sidhant@appsmith.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: System Administrator <root@Parthvis-MacBook-Pro.local>
2023-02-14 20:58:25 +05:30
Nilesh Sarupriya
291ba8d8a2
chore: use helper method for evicting all pg user related cache (#20546)
## Description

> The following code introduces a wrapper around the
`evictPermissionGroupForUser` cache which can then be extended for
further similar use cases with changes if required.

Fixes https://github.com/appsmithorg/appsmith/issues/20567

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

- Chore (housekeeping or task changes that don't impact user perception)

## How Has This Been Tested?
> Since this is just a wrapper around an existing function, there is no
change in User Experience.

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [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
- [ ] 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

---------

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
2023-02-14 17:13:16 +05:30
Abhijeet
3ec9154034
chore: Remove usage pulse logging for Appsmith cloud (#20588)
## Description

> We are working on usage and billing feature and as a part of usage
calculation, we are recording the usage pulses at 1 hr intervals today.
As the business cases are evolving we received a request to log the
pulses for every 5mins instead of an hour. Just to provide the existing
stats for the past month on our cloud alone we have received 155545
pulses with 1hr intervals between the pulses. Also going forward if are
doing it with 5mins intervals this count is going to increase by 12
folds. Now considering we will not be monetising the cloud platform
until multi-tenancy is out, do we have usecase where we still need the
usage data? If not we would like to stop recording these usage pulses on
Appsmith cloud and bring it back after multitenancy is live. Until then
self-hosted EE instances will report the pulses as expected.

> TL;DR: Remove logging of usage pulses for Appsmith cloud not to bloat
the cloud services DB, as these pulses will not be used unless the
multi-tenancy is introduced

Fixes https://github.com/appsmithorg/cloud-services/issues/400

## Type of change

- Chore (housekeeping or task changes that don't impact user perception)

## How Has This Been Tested?

- Manual
- JUnit

## 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
2023-02-14 11:46:33 +05:30
Vishnu Gp
7d64944550
chore: Added AppsmithError for invalid license key entered (#20571)
## Description
Added a new AppsmithError to handle invalid license key.

## Type of change

- Chore (housekeeping or task changes that don't impact user perception)


## 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
2023-02-11 14:21:44 +05:30
Nayan
d71fe7a883
chore: Removed comment feature codes (#20192)
## Description
Removed the codes related the comment feature
Fixes #20140
2023-02-09 22:54:21 +06:00
Abhijeet
9f6ef23f5a
feat: Support mongodb transactions for import application flow (#14939)
## Description

Import application flow is a multi-stage process where we touch all the
mongo DB collections required to store the application in DB, which
today includes pages, actions, JSObjects, etc. When the flow is complete
then only we can say the application is successfully imported and DB
won't have any stale objects stored. But in a negative scenario where
the flow might break because of some unknown exceptions, objects stored
earlier become stale and reside in DB forever. With this PR we are
establishing the infra for transactions to avoid saving stale DB
objects. This is achieved by a rollback mechanism in case an exception
is thrown in the middle of execution.

Note: Since transactions are built on concepts of logical sessions they
require mecahnics (like oplog) which are only available in replica set
environment.

You can always convert a standalone to a single noded replica set and
transactions will work with this one node.


[https://docs.mongodb.com/manual/tutorial/convert-standalone-to-replica-set/](https://docs.mongodb.com/manual/tutorial/convert-standalone-to-replica-set/?_ga=2.53712296.1453502529.1669195955-2065030687.1664009965)

```
For local dev earlier we used to run the single node without replica set. Henceforth if we want to take the advantage of transactions please follow the steps to run mongod single node in local with replica set:

- Upgrade the MongoDB version to 4.4 or higher if it’s 4.2 or lower (https://www.mongodb.com/docs/manual/release-notes/4.4/#std-label-4.4-upgrade)
- Close the mongoDB instance running in your local
- Start the mongoDB in replica set mode and initiate the replica set
    - mongod --port 27017 --dbpath <path/to/db> --replSet <replica-set-name> && mongo --eval “rs.initiate()”
- One can use following commands to check replica set status: 
    - mongo appsmith
    - rs.status()
- By this time you should have the mongo running with replica set
```
<img width="1788" alt="Screenshot 2022-07-01 at 10 31 27 PM"
src="https://user-images.githubusercontent.com/41686026/176944386-f9d94715-c0cf-4900-93b7-f73647132d60.png">

This also means mongodb connection string used in env file will now
include the replica-set name if one wants to leverage transactions:
`mongodb://localhost:27017/appsmith?replicaSet={replica-set-name}`

Fixes https://github.com/appsmithorg/appsmith/issues/14543

## Type of change

- Bug fix (non-breaking change which fixes an issue)
- This change requires a documentation update

## How Has This Been Tested?

> JUnit 
> Manual test

## Checklist:

- [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
- [ ] My changes generate no new warnings
- [x] 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

---------

Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2023-02-09 14:50:04 +05:30
balajisoundar
bacb77a352
chore: Render below the fold widget components when browser is idle using Intersection Observer (#18747)
## Description
In order to improve the first load of the applications, now we're only
rendering the widget components that are [above the
fold](https://en.wikipedia.org/wiki/Above_the_fold#In_web_design) right
away and rendering the other widget components whenever the browser is
idle. This decreases the amount of time it takes before the first paint
on the screen.

This is getting shipped behind a feature flag!
2023-02-08 16:53:39 +05:30
Nilesh Sarupriya
e39d6af9ef
fix: remove padding from state used in OIDC authorise (#20433)
## Description

> Cognito returns **Malformed URI** for redirect when User tries to
Login. Due to this, browser ends up throwing `400 Bad Request`. In order
to fix this, we have removed the padding from the `state` query
parameter which we send to the OIDC, in order to avoid the cases where
the additional `=` will lead to malformed URIs being created. Read
[here](https://stackoverflow.com/questions/6916805/why-does-a-base64-encoded-string-have-an-sign-at-the-end)
for Additional information on the Base64 encoding and padding.
> Also, we are changing the delimiter from `=` to `-` when server tries
to find the redirect URI for other use cases.
> Server uses `,` in order to split the state to get the `origin value`.
Now we will use `@` instead of `,`.

> TL;DR, remove `=` and `,` in order to avoid malformed URI strings.

Fixes https://github.com/appsmithorg/appsmith/issues/19692

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video

## Type of change

- Breaking change (fix or feature that would cause existing
functionality to not work as expected)


## How Has This Been Tested?
> Tested manually with different use case scenarios.

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [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
- [ ] 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

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
2023-02-07 19:20:00 +05:30
Sumesh Pradhan
fe0b641fb2
fix: minor update on APPSMITH_TRACING_ENDPOINT (#20437)
Removed api path from `APPSMITH_TRACING_ENDPOINT`
2023-02-07 17:13:54 +05:30
Shrikant Sharat Kandula
bb4ca19179
chore: Remove Maps API Key env variable for client (#19486)
Part of #11855.

Instead of getting the Google Maps API Key from runtime env variables,
we get it from the server, as part of the response of
`/api/v1/tenant/current`. This doesn't add a database call, just include
the env variable name in the response, so shouldn't have any performance
impact on the API.

On the client though, the Maps API key won't be available, until at
least the first call to `/tenant/current` is finished.

Also, first big PR in client code. 🙂

Edit: not `/me` anymore, but from `/tenant/current`.

---------

Co-authored-by: Pawan Kumar <pawan.stardust@gmail.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2023-02-07 14:53:15 +05:30
Nidhi
7e15d8b13d
feat: Server side observability (#19828)
## Description

TL;DR: This PR introduces metrics logging using native Spring support
for Micrometer. It includes a docker-compose to set up all the required
parts of this observability stack in the local environment as well.

In order to make use of this stack, please navigate to
`utils/observability` and execute the following command:
```
docker-compose up -d
```

The set up comes bundled with a default Grafana dashboard that can be
accessed at localhost:3001. Please feel free to switch the mapping ports
around in the docker-compose file.

This dashboard currently shows all http requests (sampled at 0.1 by
default), and the server side implementation has introduced some minimal
tracing for the `/api/v1/action/execute` endpoint. This means that you
can use the trace id from http server requests for this endpoint to
delve deeper into the spans exposed in this flow.

In case you would like to send trace information to another service,
please make use of the `APPSMITH_TRACING_ENDPOINT` variable. To override
the default sampling rate in your local (to say, 1), you can set that as
the value for the variable `APPSMITH_SAMPLING_PROBABILITY`.

Fixes #19153

## Type of change
- Chore (housekeeping or task changes that don't impact user perception)

## How Has This Been Tested?
- Manual

### Test Plan
No testing required, only needs regression after merge.

## 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

---------

Co-authored-by: Sumesh Pradhan <sumesh@appsmith.com>
2023-02-07 14:26:18 +05:30
sneha122
008c0b6d22
feat: feature flag added for limiting gsheet access (#20223)
## Description

This PR adds feature flag for Limiting Google Sheet Access project.

Fixes #20156 


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

> Please delete options that are not relevant.

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


## How Has This Been Tested?

- Manual

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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

---------

Co-authored-by: “sneha122” <“sneha@appsmith.com”>
2023-02-06 10:57:43 +05:30
Shrikant Sharat Kandula
6637716dea
chore: Increase Redis timeout in /health from 1s to 3s (#20383)
The current Redis timeout of 1s is triggering a lot of false-positives,
where we report as down, but operate just fine. In this PR, we change
this to 3s, in an attempt to reduce the number of such false-positives.

We increase it to 3s _only_, just so we don't change too much too fast.
If this also creates too many false-positives, we revisit.
2023-02-04 23:18:21 +05:30
Manish Kumar
1a1710f4bb
chore: Adding environmentName parameter in datasource test flow and required decomposition and refactors. (#19783)
## Description
- TL; DR , small Pr to add environmentName to Datasource-controller for
`test`, `structure`, and `trigger` flows. In order to adapt for
environments. There is a method addition in authenticationValidator, and
further refactor to avoid code duplicity.

- With Introduction of multiple environments we would have
configurations corresponding to each environment. In order to test these
configurations, we would require an environment parameter to be passed
as an argument, this could be done by passing an environment header with
the current datasource `test`, `structure`, and `trigger` flows,
however, since our community and enterprise flow uses the same code. We
require our community code to include the header which however, will not
be used in the community edition but it will have complete usage in
enterprise edition.
- A `validateAuthentication` method in `authenticationValidator`
interface has been loaded with an extra parameter (environmentId) for
environment support, EE changes will follow post the merge.
- `Datasource trigger and Datasource Structure flows`, required some
refactors to make it work with environments as well.

## Type of change

- Chore (housekeeping or task changes that don't impact user perception)

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

Existing test cases are adequate, just tweaked a few test cases to
accommodate changes.


## 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
- [x] 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


### 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
2023-02-03 18:43:34 +05:30
Shrikant Sharat Kandula
04f6208f86
chore: Add version to analytics events (#20295)
Currently, analytics events don't include Appsmith version information.
This PR adds version, and edition information to all events.
2023-02-03 10:45:39 +05:30
Sangeeth Sivan
ad5d236a05
chore: [Usage & billing] change upgrade hook link and refactor upgrade to BE page (#20312)
## Description

Updates the redirection link when the user clicks on `Upgrade`. Also
renders the background in CSS instead of using still image as an
placeholder.

Fixes #20313 


Media
![Screenshot 2023-02-02 at 2 09 25
PM](https://user-images.githubusercontent.com/74818788/216273606-99c88da1-c047-4940-ae24-4ba532c6a976.png)



## Type of change

> Please delete options that are not relevant.

- Chore (housekeeping or task changes that don't impact user perception)



## How Has This Been Tested?
- Manual


## Checklist:
### Dev activity
- [ ] 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
- [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
2023-02-03 09:48:50 +05:30
Nilesh Sarupriya
68082175cc
feat: add centralised comparators (#20279)
## Description

> Making comparators centralised in order to reduce code duplication.

Fixes https://github.com/appsmithorg/appsmith/issues/20242

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video

## Type of change

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

## How Has This Been Tested?
> This has been tested manually.

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [ ] 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

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2023-02-03 09:42:01 +05:30
Shrikant Sharat Kandula
0f5076064d
chore: Fix Installation complete event not being sent (#20301)
The problem was that the Mono returned by `analyticsService.sendEvent`
was returned inside a `.map` call, which, (almost) always results in a
bug.

This PR fixes that.
2023-02-02 12:09:01 +05:30
Nilansh Bansal
4034d9cc81
chore: Removed ShareApp Boolean Field (#20291)
## Description
> This PR removes the Boolean shareApp field from the Application Model

Fixes #20261 


## Type of change
- Chore (housekeeping or task changes that don't impact user perception)


## How Has This Been Tested?
- Manual

## Checklist:
### Dev activity
- [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
- [ ] 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
2023-02-01 14:28:04 +00:00
Nayan
d79c1b918e
chore: Add photos of workspace members in homepage API response (#20132)
The homepage API is used to load list of workspaces, apps under those
workspaces and their members. The list of members is used to display a
profile photo of the members. The client loads the profile picture using
the email address of the member. This can lead to 404 if the member has
no photo set.

This PR includes the photo ids in the response so that client knows
whether the user has photo or not. If photo is not set, client will not
try to load it. So the 404 responses will no more be there.

Fixes #20127
2023-02-01 17:38:12 +06:00
Nidhi
5bb1a060f0
chore: Added total parameter size in execution DTO to analytics (#20129)
## Description
This property will give us an insight into what range of parameter sizes
users are working with.

Fixes #20128 

## Type of change
- Chore (housekeeping or task changes that don't impact user perception)

## How Has This Been Tested?
- Locally via Segment

## 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
2023-02-01 11:18:14 +00:00
Nilansh Bansal
eb9f4f5883
feat: Adding Icon to Application Pages (#20247)
## Description
> This PR implements the backend APIs for updating icon to a Page.

Fixes #20199 


## Type of change

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

## How Has This Been Tested?

- JUnit
- Postman

## 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
- [x] 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
- [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
2023-02-01 11:17:56 +00:00
Shrikant Sharat Kandula
aff9f4bc0e
fix: NPE on server startup (#20288)
Fixes #20060.

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2023-02-01 16:07:36 +05:30
arunvjn
7ca4f73cdf
fix: library installation failure in public apps (#20112)
- Feature flag API returns an empty response for public applications.
The API to fetch installed libraries was behind the custom JS library
feature flag and thus wasn't invoked. This PR removes all the references
to CUSTOM_JS_LIB feature flag in the code base.
- Add change to make Custom JS Lib view endpoint accessible without
login.
- Add JUnit TC to test for js lib presence in view mode.
2023-02-01 10:37:39 +05:30
Nikhil Nandagopal
e07dc1b516
chore: Changed Id of analytics to instance id from ip (#20266)
## Description

Updates the analytics tracking of instance stats to use the instance Id
instead of IP address

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

## How Has This Been Tested?
- Manual

## 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
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] 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
2023-02-01 06:19:22 +05:30
Nayan
1a78741c4d
fix: Return system theme when application theme not found (#20170) 2023-01-30 19:26:29 +05:30
subratadeypappu
d25b476e0a
Fix unexpected cyclic dependency error due to server is not able to connect to the RTS server (#20012)
## Description
There’s a function named `checkInstanceSchemaVersion` in
`InstanceConfig.java `class which was not returning any signal due to
the use of `.then()`. Consequently, the RTS server checking wasn’t made
as it wasn’t receiving any signal/command to do so.

To know more about the error please check the details in the issue
itself.

Fixes #20010 



## Type of change

> Please delete options that are not relevant.

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


## How Has This Been Tested?

- Manual

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [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
- [ ] 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

---------

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2023-01-30 13:21:12 +05:30
Nilansh Bansal
ad2c9c060b
feat: Collapse invisible widgets Field for Auto-height (#20142)
## Description

> This PR implements the backend APIs for Invisible widgets in
Auto-height containers
> Notion doc here:
https://www.notion.so/appsmith/Invisible-widgets-in-auto-height-containers-460c6bf4e0a342e4a1fa4955f7f6c461
> Frontend feature implementation here:
https://github.com/appsmithorg/appsmith/pull/20118

Fixes #19983 


## Type of change

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


## How Has This Been Tested?

- Manual
- JUnit

## Checklist:
### Dev activity
- [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
- [x] 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
- [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
2023-01-27 17:43:20 +00:00
Shrikant Sharat Kandula
0aa97324bf
fix: Fix Appsmith logo in emails (#20030)
SVG images don't load correctly in emails, so we're switching back to PNG.

Co-authored-by: Pawan Kumar <pawan.stardust@gmail.com>
2023-01-26 14:13:24 +05:30
Shrikant Sharat Kandula
de4f787a68
feat: Add instanceId in tenant response (#20039)
In the tenant response, this PR adds the current `instanceId` to the
tenant response.

Why do we need it? This will be used to power the `Upgrade` buttons in
Admin Settings to start the U&B flow.

Why add it to the tenant API? So that for U&B flows on the cloud, we can
add something like a `tenantId` there, in the same request, so this felt
like the right place.

Potential performance impact? Unlikely. The `instanceId` is permanently
cached in the process memory, so this is a one-time DB-call, in the
lifetime of the server process.
2023-01-25 18:50:31 +05:30
sidhantgoel
4b66d0c87f
fix: flaky tests due to startup happening async (#20079)
Testcases were flaky because loading cache after application is ready is
happening in async with testcases, so sometimes testcases fails if cache
is not loaded by the time testcase executes.
Testcases fail and gives the following error message `Appsmith server is
not ready. Please try again in some time`

This fixes the issue by running startup process in sync after
application is ready.

And there is a genuine failure of testcase
`exampleApplicationsAreMarked` which is fixed.
2023-01-25 17:42:25 +05:30
Nilansh Bansal
6531bd6aeb
feat: APIs to Upload/Delete App navigation logo (#19164) (#19771)
## Description

Implements backend APIs for Uploading and Deleting Navigation Logo

Fixes #19164

## Type of change

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



## How Has This Been Tested?

- Manual
- Postman
- JUnit Tests

## 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
- [x] 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
- [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
2023-01-23 07:38:59 +00:00
sidhantgoel
e8d99205d3
feat: added models for export (#19963)
Added models for export, this will be used in Import/Export V2 service.
2023-01-21 13:11:53 +05:30
Nayan
89ae5ddf7f
fix: Forking fails when template has REST datasource with Bearer Token Authentication (#19930)
## Description
When an application is exported with credentials i.e. template
application, it does not contain the bearer token authentication
credentials. As a result, when user is trying to import this
application, the datasource configuration popup appears. This PR fixes
this issue.

TL;DR enable export-import application with bearer token authentication

Fixes #19415 

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video

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


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

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [x] 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


### 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
2023-01-20 15:36:49 +06:00
Sumit Kumar
89265391c4
fix: fix git related issues in Custom JS Library feature (#19886)
## Description
- Remove published JS libraries from becoming part of the exported application when exporting for Git. 
  - This was causing a problem with git status because git status would consider the published libraries as well when fetching git diff however, when creating commit only unpublished libraries are used. 
  - I am not sure why, but it seems to fix the git merge issue as well - not sure at the moment. Waiting for a verification from QA on this. (Update: QA has verified this as well)
 
Fixes #19764 #19766 

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


## How Has This Been Tested?
- Manual
- JUnit TC

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR)


## 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
- [ ] My changes generate no new warnings
- [x] 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


### 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
2023-01-20 13:25:53 +05:30
Anagh Hegde
52e4d32a3f
feat: Separate the js object code and metadata when used with git sync (#19156)
As per current DB structure actions are embedded inside the JSObjects.
Every new method in JSObjects results in new action getting created in
DB. Consider user updates the JSObject.myFun1 then user will have
changes at 2 locations

Queries directory under myFun1 file
Body of JSObject1
We should not commit these duplicates and JSObject body should be
committed as is. These steps surely makes it easier to resolve the
conflicts even if occurs at same line.
2023-01-19 20:12:22 +05:30
Manish Kumar
f04552ae75
chore: formatting and access modifier changes (#19874)
## Description

- TL;DR formatting changes and added a protected 

## Type of change
- Chore 

## How Has This Been Tested?
- Manual

## Checklist:
### Dev activity
- [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
- [ ] 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
2023-01-19 12:09:56 +05:30
Anagh Hegde
6400d8c7c1
fix:use correct error message for git import failures (#19848)
## Description

> Instead of the generic error message which confuses the user during
the git sync failure due to the hydration from file to db or vice versa,
we are now showing a better error message which does not confuse the
user.

## Type of change


- Chore (housekeeping or task changes that don't impact user perception)


## How Has This Been Tested?

- Manual

## 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
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] 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
- [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
2023-01-19 11:15:28 +05:30
arunvjn
b72ba55528
chore: disable JS Libs feature flag (#19884)
## Description
Enables JS libs for all users without removing the references of feature
flag code.

#### Type of change
- Chore (housekeeping or task changes that don't impact user perception)

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

### 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
- [x] 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


#### 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
2023-01-19 10:38:09 +05:30
Anagh Hegde
a60322948f
fix: Add support for the shh url that does not contain domain name (#19879)
## Description

> When the git service is self hosted, one can chose to not to set up a domain name. But this set up does not work with the current git sync feature. This PR fixes this bug by supporting such use cases. 

Fixes https://github.com/appsmithorg/appsmith/issues/19878

## Type of change

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

## How Has This Been Tested?

- Manual
- JUnit


## 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
2023-01-18 19:46:53 +05:30
Nidhi
9e79b76403
fix: Modified upgrade path error for v1.9.2 (#19865)
Fixes #19862
2023-01-18 14:39:50 +05:30
Abhijeet
4feed5d01f
fix: Usage pulse delivery for invalid user where manage user permission is missing (#19852)
## Description

> As we are using updateUser method within UsagePulse
(`api/v1/usage-pulse`) API to update the hashedEmail. This requires the
user to possess required permission but as this is a internal usecase
it's safe to expose a method to perform the update operation.

Fixes https://github.com/appsmithorg/cloud-services/issues/226

## Type of change

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

## How Has This Been Tested?

- Manual

## 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


### 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
2023-01-18 10:20:07 +05:30
Nilansh Bansal
3b1c663a54
fix: Navigation Settings API (#19780)
## Description
This PR bug fixes the API for updating Navigation Settings (implemented
by #19272).

Fixes #19163 

## Type of change

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

## How Has This Been Tested?

- Manual


## 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


### 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
2023-01-17 13:28:38 +00:00
Trisha Anand
e97370ec85
fix: This fixes the DDOS that appsmith production database faced when the sessions set in redis were in bad state. (#19807)
1. Pre fetch and set the anonymous user cache instead of fetching it
when its required. This is now done on startup. In case any request for
anonymous user permission group ids comes through and the cache is not
ready, we throw an error to request the user to try again in some time.
This stops the DDOS on the mongo database
2. In case the session is in bad state and the user object is malformed,
before we fetch the user permission group ids, we check the presence of
email, tenant and user id before making a bad database query which was
another reason for DDOS.
2023-01-17 16:22:10 +05:30
Ashok Kumar M
3537a1eed9
chore: feature flag changes for auto layout. (#19472)
## Description

This PR will be adding a new feature flag on the backend to provide way
for Auto layout feature to show up only for internal users until the
beta is released to all users.

Fixes #19523

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

> Please delete options that are not relevant.

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


## How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Provide
instructions, so we can reproduce.
> Please also list any relevant details for your test configuration.
> Delete anything that is not important

- Manual

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [ ] 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
- [ ] 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
2023-01-17 00:06:33 +05:30
Manish Kumar
5aadb4161e
chore: datasourceContextService refactor (#19485)
## Description

In order to account for multiple environments changes, the
DatasourceContextServiceImpl.java methods needs refactoring to achieve
minimal code duplicity.

- [x] Create class to hold the key for dscontext maps.
- [x] Refactor methods in order to have minimum duplicity.

Fixes #19451 
This PR is to facilitate the below reference PR in achieving minimum
code duplicity and reducing excess db calls to fetch same resource.
More reference: https://github.com/appsmithorg/appsmith-ee/pull/756


## Type of change
- chore

## This has 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
2023-01-16 21:22:55 +07:00
Anagh Hegde
b736138505
chore: fix error message not logged from cloud service in Mockdata service (#19718)
## Description
Error from the CS is logged properly due to the missing arguments in
log.error in MockDataService.


## Type of change

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


## How Has This Been Tested?

- Locally

## 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
2023-01-16 12:49:47 +05:30
Hetu Nandu
205adeea37
feat: Add a description field for pages (#19573)
## Description

Adds a description field to the PageDTO so that we can add a short
description of a page. This will be used to fill the meta tags for
internal use case apps for better visibility on Google

Fixes #19572

## Type of change

- New feature (non-breaking change which adds functionality)
2023-01-15 00:58:02 +05:30
Nayan
335c079781
feat: Return first page as home page when application has no home page (#19680)
## Description
When an application has no home page set, the get pages API returns
internal server error. Instead of failing, the get pages API should
return the first page as home page.

Fixes #19679

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

## How Has This Been Tested?
- Manual

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [x] 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


### 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
2023-01-13 16:22:01 +06:00
balajisoundar
74fc54f520
chore: change billing and usage feature flag email (#19731)
## Description
Changed the billing and usage feature flag email to usage@appsmith.com

Fixes https://github.com/appsmithorg/cloud-services/issues/205

## Type of change

> Please delete options that are not relevant.

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


## How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Provide
instructions, so we can reproduce.
> Please also list any relevant details for your test configuration.
> Delete anything that is not important

- Manual
- Jest
- Cypress

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
2023-01-11 15:07:40 +05:30
Nirmal Sarswat
5e97eec525
feat: adding new api for release items (#18966)
On User Home Page, we show `what's new` and that release items information use to be part of `/application/new` API. Now we are extracting release items info and creating new API for it which is `/application/releaseItems`.
2023-01-11 11:08:20 +05:30
Sumit Kumar
d33d35fbdb
fix: fix git sync related bugs for Custom JS Lib feature (#19352)
## Description
- Fix git import / export / status related bugs. Please check out this issue for more details : https://github.com/appsmithorg/appsmith/issues/19038
- Remove feature flag usage from the server side, since it was interfering with the JUnit TCs. Please note that the overall feature is still under feature flag since the client side also uses the same feature flag. 

Fixes #19038

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

## How Has This Been Tested?
- Manual
- JUnit TC

Test plan is the same as the one present for https://github.com/appsmithorg/appsmith/pull/17895

Issues raised during QA
- [ ] https://github.com/appsmithorg/appsmith/pull/19352#issuecomment-1373626895

## Checklist:
### Dev activity
- [x] 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
- [x] 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


### 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
2023-01-10 19:26:48 +05:30
Vaibhav Tanwar
20cd7ee31d
feat: Google Sheet oAuth analytic events (#19118)
Added google sheet oAuth flow analytic events.
2023-01-10 11:48:03 +05:30
Sangeeth Sivan
ac5997cfe4
chore: code split usage and billing files (#19436)
## Description

Since Usage & Billing is EE only, there are a few components which needs
to be code splitted. So code splitted those files and also added feature
flag for Usage & Billing.

TL;DR Code split usage and billing files

Fixes [#146](https://github.com/appsmithorg/cloud-services/issues/146)

## Type of change

> Please delete options that are not relevant.

- Code splitting


## How Has This Been Tested?

- Manual

## Checklist:
### Dev activity
- [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
- [ ] 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
2023-01-10 11:09:15 +05:30
Nilesh Sarupriya
05e421308c
fix: save a query as valid if datasource has no permissions (#19307)
## Description

> Currently a query is saved as invalid, if there are no datasource edit
permissions provided. This leads to query being invalid for all the
users. So, if now the edit permissions are provided to the Query, but
not to the datasource, the user will be able to save the queries.

Fixes https://github.com/appsmithorg/appsmith/issues/19275


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

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

## How Has This Been Tested?
> validateAndSaveActionToRepository_noDatasourceEditPermission

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [ ] My changes generate no new warnings
- [x] 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


### 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

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
2023-01-09 14:19:48 +05:30
Nilesh Sarupriya
873fb99ce3
fix: user from group leaves workspace proper error handling (#19347)
## Description

> Given that a User is assigned to a User group and then assigned to a
workspace currently can't leave the workspace, but it gives an ugly
error right now.
> Now we throw a meaningful error whenever such a user tries to leave
workspace.

Fixes https://github.com/appsmithorg/appsmith/issues/19058


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

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

## How Has This Been Tested?
> Test cases added in EE version

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [ ] 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

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
2023-01-09 14:19:38 +05:30
Sumit Kumar
03f8b2a523
fix: add connection pool to MySQL plugin and fix issues due to Spring upgrade (#17873)
- Add connection pool to MySQL
- Fix JUnit TC failures due to Spring upgrade
- Fix Cypress TC failures due to change in the MySQL plugin code 
- Remove `Preferred` SSL option
2023-01-09 14:04:51 +05:30
Vishnu Gp
5e6d13a759
chore: Codesplit on FieldName.java (#19574)
## Description
Removed unused Fieldnames

## Type of change

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


## How Has This Been Tested?

- Manual

## Checklist:
### Dev activity
- [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
- [ ] 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
2023-01-09 13:01:46 +05:30
Vishnu Gp
80f23a5af1
chore: Updated the usage pulse format (#19565)
## Description

The usage pulse format is updated

Fixes https://github.com/appsmithorg/cloud-services/issues/148

## Type of change

- Breaking change (fix or feature that would cause existing
functionality to not work as expected)

## How Has This Been Tested?

- Manual
- JUnit

## 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
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] 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


### 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
2023-01-09 10:47:34 +05:30
Nilansh Bansal
75a8cbf288
Feat: App Positioning Feature Backend Implementation (#19514)
## Description

Implements backend functionality for App Positioning (Auto Layout)
Feature

Fixes #19348 


## Type of change

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


## How Has This Been Tested?

- JUnit 
- Manual


## 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
- [x] 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
- [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
2023-01-06 18:59:57 +00:00
Anand Srinivasan
071b992710
chore: send segment anonymous id (#19122)
Add segment's `anonymousId` as a header in all API calls.

cached id ->
[details](https://segment.com/docs/connections/sources/catalog/libraries/website/javascript/identity/#segment-id-persistence)

On Page load actions:
- If segment is enabled:
  - and cached id exists -> trigger with cached id
  - if cached id doesn’t exist, we wait for max 2 seconds.
    - if segment init is success -> trigger with anonymous id
    - if failed/delayed -> trigger without anonymous id
- If segment is disabled we don’t wait at all and anonymous id is not
sent.

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Hetu Nandu <hetu@appsmith.com>
2023-01-06 19:39:38 +05:30
Nidhi
a6d428b513
fix: Fixed an edge case with refactoring widget names similar to template widget names (#19350)
## Description

If a widget was being refactored from `Text1` to `Text2`, and the same
application had a List widget with a template widget of the name
`Text12`, then the refactor logic was breaking the recalculation of
dynamic binding path list. This fix checks for the complete name instead
of a partial match.

Reproduction and context:

https://theappsmith.slack.com/archives/C02JV8G1MP0/p1672388698340299?thread_ts=1671080059.752969&cid=C02JV8G1MP0

Fixes one cause of #10037 

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

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

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [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
- [x] 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


### 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
2023-01-06 17:33:22 +05:30
Nidhi
fdf9ea8334
ci: Back merge v1.9.1 (#19517)
Should be what already exists in master at v1.9.1
2023-01-05 21:02:04 +05:30
Nidhi
e93173653c
fix: Check for instance schema serially instead of in parallel (#19493) 2023-01-05 20:46:20 +05:30
Abhijeet
111f5d3065
fix: Race condition to save datasource and action in import flow (#19490)
## Description

We are seeing the flakiness in the import flow testcases, which is
happening due to the race condition while saving the datasources and the
actions. As we embed the datasource reference within the action object
if because of the race condition action got saved prior to datasource
imported application ends up with invalid action. References from CI
failed jobs:
| Failed Test | CI run |
| --- | ---|
| importApplicationFromValidJsonFileTest |
https://github.com/appsmithorg/appsmith/actions/runs/3828799911/attempts/1
|
| importApplication_withUnConfiguredDatasources_Success |
https://github.com/appsmithorg/appsmith/actions/runs/3828799911/attempts/2
|
| importApplication_withUnConfiguredDatasources_Success |
https://github.com/appsmithorg/appsmith-ee/actions/runs/3840001967/jobs/6538521019
|

## Type of change

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

## How Has This Been Tested?

- Manual

## Checklist:
### Dev activity
- [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
- [ ] 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
2023-01-05 18:07:24 +05:30
Nilansh Bansal
f70987c52f
fix: Updated isPublic field to fetch from Permission groups (#19132)
## Description
> Fixes the `isPublic` field in the update application API
`/applications/{applicationId} (PUT)` response.


Fixes #19131 

### Media



https://user-images.githubusercontent.com/25542733/209096894-2d88d20d-6636-4d8a-9bf0-7a04a95f75dd.mov



## Type of change

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


## How Has This Been Tested?

- Manual

## Checklist:
### Dev activity
- [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
- [ ] 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
2023-01-05 06:58:47 +00:00
Nilesh Sarupriya
f30359baaf
fix: update health check url (#19482)
## Description

> Update the health check url from `/api/health` to `/api/v1/health`

Fixes https://github.com/appsmithorg/appsmith/issues/19424

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

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


## How Has This Been Tested?
> URL end point has been changed.

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [ ] 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

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
2023-01-04 16:37:15 +05:30
Nidhi
02c5c45972
fix: Added handling for empty evaluated values (#19438) 2023-01-04 02:17:57 +05:30
Abhijeet
4c8dac4454
fix: Fix flacky testcase for clone application (#19452)
> Pull Request Template
>
> Use this template to quickly create a well written pull request.
Delete all quotes before creating the pull request.

## Description

> Please include a summary of the changes and which issue has been
fixed. Please also include relevant motivation
> and context. List any dependencies that are required for this change
> Links to Notion, Figma or any other documents that might be relevant
to the PR

> Add a TL;DR when description is extra long (helps content team)

Fixes # (issue)
> if no issue exists, please create an issue and ask the maintainers
about this first


Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

> Please delete options that are not relevant.

- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- This change requires a documentation update


## How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Provide
instructions, so we can reproduce.
> Please also list any relevant details for your test configuration.
> Delete anything that is not important

- Manual
- Jest
- Cypress

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
2023-01-03 18:52:33 +05:30
Nilesh Sarupriya
2b1c27de04
feat: separate health check api for redis and mongo (#19425)
## Description

> Use a distinct health check api for checking the health of Redis and
Mongo.

Fixes https://github.com/appsmithorg/appsmith/issues/19424

Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video


## Type of change

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

## How Has This Been Tested?
> Tested manually by force shutting the Redis and Mongo docker images.

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## 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
- [ ] 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

Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com>
2023-01-03 15:12:59 +05:30
Nidhi
f288da54ef
chore: Moved usage of projection query from custom to generic (#19413)
## Description

Simply a refactor in code to reuse generic repository layer that didn't
used to exist when this hot fix was made.

Fixes #19351 

## Type of change
- Chore


## How Has This Been Tested?
- Manual
- Existing unit tests

### Test Plan
> Add Testsmith test cases links that relate to this PR

### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)


## Checklist:
### Dev activity
- [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
- [ ] 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
2023-01-02 19:42:01 +07:00
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
1cb59ab172
chore: Flapdoodle version upgrade to 3.5.0 (#17609) 2022-10-17 13:18:28 +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
Shrikant Sharat Kandula
0989aca511
Upgrade commons-text (#17566) 2022-10-14 19:36:16 +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
Nidhi
ca5499c358
chore: Tests pass, server runs w/ analytics (#17205)
* Tests pass, server runs w/ analytics

* Fix okhttp
2022-09-30 11:49:25 +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
Nidhi
bc669182c6
chore: Fixing dependencies (#17188) 2022-09-29 18:34:04 +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
Sumit Kumar
b8f30a8f10
fix: remove RapidAPI plugin src code from API server (#16501)
* remove RapidApi plugin related code from API server
* mark RapidApi plugin related data as deleted in DB (soft delete)
2022-09-23 13:20:03 +05:30
Anagh Hegde
63fa43ecc1
test: Add user details for tests (#16944)
* Add user details for tests

* Remove withUserDetails annotation where not required
2022-09-22 21:37:36 +05:30
Dhruvik Neharia
2088c7e117
feat: Add font family to system-themes for map chart (#16922) 2022-09-21 17:28:55 +05:30
subratadeypappu
2751af6810
fix: Fix NPE in execute API (#16722) (#16888)
* Fix NPE in execute API (#16722)

* Add unit tests with usual and unusual ordering of the parts (#16722)
2022-09-21 15:36:09 +05:30
sneha122
44e08b096d
fix: fixes right body type not selected after curl import (#16549)
* fixes rght body type not selected after curlimport

* added apiContentType key in ActionConfiguration formData property

This commit fixes the bug https://github.com/appsmithorg/appsmith/issues/13978 and changes two files:
		* appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java
		* appsmith-server/src/main/java/com/appsmith/server/services/ce/CurlImporterServiceCEImpl.java

additionaly this commit fixes the Body type detection for REST APIs with GET method  when imported from cURL.

* Made changes to the casing of Header key 'content-type', now it is  HTTPHeader.CONTENT_TYPE standard -> 'Content-Type'. changed test cases accordingly.

* Made header-key check in assertHeader functions case insensitive in CurlImporterServiceTest.java

* removed wildcard imports and changed some comments

* changes according to PR review comments

* updated imports for APIPaneUtils

Co-authored-by: “sneha122” <“sneha@appsmith.com”>
Co-authored-by: manish kumar <manish@appsmith.com>
2022-09-21 09:40:36 +00:00
Trisha Anand
e3a100d67b
chore: Shutting down get applications endpoint (#16902)
Shutting down get applications endpoint
2022-09-20 17:20:47 +05:30
Anagh Hegde
c2d7b0c2c1
chore: Add support for limit - queryAll method of base repo (#16710)
## Description

> The `queryAll` method of AppsmithBaseRepository does not support the mongodb limit. This PR adds the support for the same. 

## How Has This Been Tested?

- locally

## 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
- [ ] 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

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-09-20 15:54:27 +05:30
Arsalan Yaldram
34e7eb12b7
feat: added theme values for slider widget. (#16462) 2022-09-17 12:11:16 +05:30
Vishnu Gp
75bac52626
Added users name to sessionUser (#16825) 2022-09-17 07:55:13 +05:30
subratadeypappu
cf2ef37527
feat: Add a service layer to get AppsmithType from client-type (#16508) (#16619)
* feat: Add a service layer to get AppsmithType from client-type (#16508)

This commit takes care of the following things
- It creates a service layer to get the target AppsmithType from the client-side data type and the evaluated value
- This service layer is currently not consumed by any plugins
- A full JUnit test suit for MySQL-specific types

* feat: Remove FloatType and add comments for better understanding (#16508)

* feat: Add FallbackType and covert the DataTypeService to a util class (#16508)

This commit takes care of these
- Introduce FallbackType as a separate type
- Convert the DataTypeService to a util class
- Add java doc around the methods in DataTypeService class

* feat: Rename DataTypeService to DataTypeServiceUtils (#16508)
2022-09-16 17:40:28 +06:00
Shrikant Sharat Kandula
c3ac06c639
chore: Allow env API for frame ancestors variable (#16765) 2022-09-16 13:07:16 +05:30
Sumit Kumar
ecec0e1975
fix: re-install graphql plugin in workspaces (#16764)
* re-install graphql plugin in workspaces
2022-09-15 21:09:01 +05:30
Shrikant Sharat Kandula
89620d3cbf
Fix unused reactive publisher (#16732) 2022-09-13 18:08:35 +05:30
Shrikant Sharat Kandula
83fc89f1a1
fix: No-op Asserts (#16690) 2022-09-13 13:55:33 +05:30
Trisha Anand
becd778fe1
chore: Added username to error logs when signup is disabled (#16720) 2022-09-13 13:07:12 +05:30
Trisha Anand
aa45f851eb
chore: Minor code refactor + Deleting PermissionGroupServiceTest from CE (#16680)
Minor code refactor + Deleting PermissionGroupServiceTest from CE
2022-09-11 20:53:12 +05:30
Parthvi
e3ba513e2a
fix: Update AppsmithError.java (#16676)
Update AppsmithError.java
2022-09-11 00:06:26 +05:30
Sumit Kumar
0cbe81dfde
feat: merge GraphQL plugin to release (#16554)
* merge GraphQL plugin to release
2022-09-09 21:29:47 +05:30
Vishnu Gp
43ee8b2089
chore: Changes in user invited analytics event (#16611) 2022-09-09 10:31:18 +05:30
Anagh Hegde
4d609a5b4d
feat: Add non-configured datasource to merge template to an existing app API response (#15918)
Add unconfigured datasource to merge template to app API
2022-09-08 22:55:47 +05:30
Dhruvik Neharia
c87fd20b02
feat: Update QR Scanner Themes to Code Scanner Themes (#16595)
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-09-08 15:04:12 +05:30
Trisha Anand
96435ac235
chore: Using single permission group for all public viewable objects (#16620) 2022-09-08 11:37:12 +05:30
Trisha Anand
245a09ae21
fix: Duplicate default workspaces for first login using SSO (#16606) 2022-09-07 14:11:04 +05:30
Anagh Hegde
274205196f
test: refactor git test (#16550)
* Refactor tests

* Use Mock.Spy to mock the method of the testing class

* Add the mock for new workspaceId in the test class

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-09-07 10:21:09 +05:30
Shrikant Sharat Kandula
06c8210a3a
fix: Fix LinkageError with macOS DNSResolver class (#16581)
On macOS, when running a MySQL query, we see the following error:

```
java.lang.ClassCastException: class io.netty.channel.kqueue.KQueueEventLoopGroup cannot be cast to class io.netty.channel.EventLoopGroup
```

This is because of a `LinkageError`, caused because these classes exist both in the parent `server` module classpath, as well as in this plugin's classpath separately. To fix this, we removed this dependency from the server module.

But then, this caused a problem with how the `DNSResolver` class was being, well, resolved by the application class loader, vs the plugin class loader. This is a macOS specific problem, and doesn't affect other operating systems.

For this, we add just this package as a dependency to the MySQL plugin.
2022-09-06 22:00:53 +05:30
Trisha Anand
70bb40d5c5
fix: Creating default workspace for SSO signed up users before creating first application (#16579) 2022-09-06 12:55:07 +00:00
Trisha Anand
9cf3714d36
chore: Code Split for Policy Generator (#16538) 2022-09-05 20:40:52 +05:30
Vishnu Gp
75a9858397
chore: Added some changes in authentication analytics events (#16432)
* chore: Added some changes in authentication analytics events

* Review Changes
2022-09-05 10:46:59 +05:30
Trisha Anand
97a651c6a5
chore: update-bad-theme migration should only run once. (#16507)
Update bad theme migration should only run once.
2022-09-04 21:04:20 +05:30
Trisha Anand
918c018049
fix: Performance improvement of /new API by updating the api used for fetching apps. Eliminating public applications from the result (#16497) 2022-09-03 22:33:29 +05:30
Trisha Anand
8c4451a2fe
fix: Duplicating themes where 1:many applications mapping exists (#16496) 2022-09-02 22:39:21 +05:30
Dhruvik Neharia
f97cd4c38a
feat: Add QR Scanner to System Themes (#16474) 2022-09-02 17:06:34 +05:30
Nidhi
29fe999dc7
chore: Converted server log timestamps to UTC (#16475) 2022-09-02 13:09:12 +05:30
Shrikant Sharat Kandula
8a0838505a
All outgoing requests should go through the configured proxy (#14427)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-09-01 11:16:45 +05:30
Anagh Hegde
b53dc1d47f
chore: Refactor repo limit check function (#16356)
* Refactor repo limit check function

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

* Fix the repo limit check

Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-09-01 08:53:27 +05:30
Trisha Anand
0163c22003
fix: For a public app, do not export the default permission group (#16409)
* For a public app, do not export the default permission group

* Adding test to assert that exported application JSON is not public.
2022-08-31 10:44:32 +05:30
Vishnu Gp
fa31166eaa
fix: Added analytics event for workspace creation (#16383)
## Description
This adds the missing analytics event for workspace creation

## Type of change

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

## How Has This Been Tested?

- Locally

## 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-08-30 10:41:36 +05:30
Trisha Anand
8d9e071648
feat: Adding cache eviction for users whose permissions change due to super user changes (#16362)
Adding cache eviction for users whose permissions change due to super user changes
2022-08-29 13:21:24 +05:30
Trisha Anand
a5e6d09ae8
fix: Super user updated from docker.env on every restart (#16351) 2022-08-27 23:04:39 +05:30
Trisha Anand
649fe2ec7c
chore: refactor code split for UserUtils for super user creation (#16348) 2022-08-27 21:39:17 +05:30
Anagh Hegde
043705f343
chore: refactor git constants (#16287) 2022-08-25 20:52:25 +05:30
Trisha Anand
8f3591615a
feat: RBAC framework (#14823)
Co-authored-by: Sidhant Goel <sidhant@appsmith.com>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
Co-authored-by: Sangeeth Sivan <sangeeth@appsmith.com>
Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com>
2022-08-22 23:27:07 +05:30
subratadeypappu
0e2637b1b2
chore: Modified action execution payload to support data types (#16106)
* POC: Datatype handling autogenerated naming params client

* added array and file datatype

* handles all primitive types

* paramproperties convetred to map instead of array

* parametermap inversion

* handled no bindings bug

* feat: Consume action execution payload changes w.r.t. data type mapping (#15555)

This commit does the following things
1. It consumes data type metadata from payload
2. It consumes the mapping between the pseudo binding name and original binding name
3. It doesn't apply any logic w.r.t. data type identification after consumption

* added comments and cleaned code with proper datatypes

* removed URLencoding for binding params names

* feat: Remove URL decoding on param keys from server-side codebase (#15555)

* Remove unused import (#15555)

Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
2022-08-19 01:01:47 +05:30
Nidhi
cdb70066b6
fix: Logging execute events again (#16125)
Execute action triggered events were not getting logged because of a lack of subscription. Fixed in place.

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

## How Has This Been Tested?
- Locally connected to segment

## 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-08-18 13:40:29 +05:30
Trisha Anand
48ab154cf1
chore: Removing debug feature flag logs from the server (#15931) 2022-08-11 12:50:37 +02:00
Nayan
8e38079a31
chore: Return custom slug in other api (#14854)
* -return custom slug in response to the get list of pages API

* -return custom slug for default page in home page API

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-08-10 21:52:24 +06:00
Vishnu Gp
2c03cecbb1
feat: Added more data to existing analytics events (#15684)
* feat: added more data to existing analytics events

* Added extra audit data points for page and action events

* Corrected minor comment issue

* Review changes

* Removed audit references in variable names

* Review changes related to sending analytics events and DB optimization
2022-08-09 13:05:00 +00:00
Anagh Hegde
82a9d720ae
feat: Added unconfigured datasources to the template API response (#15606)
Co-authored-by: Akash N <akash@codemonk.in>
2022-08-04 09:50:54 +05:30
Keyur Paralkar
bfd341510e
feat: added accentColor and fontFamily to the theme config chartwidget (#15622) 2022-08-03 11:47:01 +05:30
Nidhi
02aa9b29bf
fix: Reset sync function fields on each update (#15442)
* Reset sync function fields on update

* Partial cypress test

* Completed cypress test

* Uncommented every other test :P
2022-08-03 10:11:02 +05:30
Nidhi
7693c759aa
fix: Do not cache updatable connections (#15593)
* fix: Do not cache updatable connections

* Delete cache entries for stale connections

* Test fixes
2022-08-02 23:13:18 +05:30
Hetu Nandu
69490bbcbf
chore: Extend commenting deprecation deadline to 1.7.12 (#15616) 2022-08-02 10:02:34 +00:00
Shrikant Sharat Kandula
928a93d02e Fix OIDC session tokens support in Redis sessions
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-08-02 15:28:29 +05:30
Shrikant Sharat Kandula
de23ea9d61
feat: JSON Session serialization on Redis (#15368) 2022-07-30 00:42:56 +05:30
Vishnu Gp
7d8fca9545
chore: Fixed flaky ApplicationForkingServiceTests (#15550) 2022-07-30 00:34:23 +05:30
Shrikant Sharat Kandula
8619a311ad
Fix compile error 2022-07-29 15:16:43 +05:30
Shrikant Sharat Kandula
04f8d2799d
Fix potential delay in sending setup completion (#15534)
The Installation setup complete event is not getting sent sometimes, and it's behavior looks very much like there's some race condition somewhere. I'm proposing this change towards two goals.

One, currently, we send the event after the user-entered data is saved to the DB. But, there's no actual dependency, no point to waiting on that for sending the event. The actual user itself, is already created and signed up. So, one change is that we don't wait for the DB update to be applied. I'm also changing .onSuccess to .map, hoping that might make a difference.

Two, make a debug log entry to see if it is our callback function that's not getting invoked, or if Segment's API isn't doing it's job, when the event is not sent.

This PR also fixes formatting of Segment error messages.
2022-07-29 14:35:26 +05:30
Anagh Hegde
4821a5c141
fix: ssh url validation in git to include a few cases where - is present in the url (#15499)
Fix the ssh URL validation to include a few cases with `-` in the url
2022-07-29 10:44:19 +05:30
Nidhi
12e626d5b0
chore: Added isMock and isTemplate to action execution analytics (#15505)
Added isMock and isTemplate to action execution
2022-07-29 01:18:09 +05:30
Nidhi
daea0a8545
chore: Added analytics for C, U, D operations on actions (#15069)
* chore: Added analytics for C, U, D operations on actions

* chore: Added isTemplateOrMock field in datasource

* fix: Set mock datasource field as true on creation

* Split template and mock identifiers into two. Added them to analytics as well

* Added tests as well as felt like a noob.

* Add isMock and isTemplate fields to datasources of created Actions

* Removed execute action triggered props

* Revert "Removed execute action triggered props"

This reverts commit cad1b8af504218813daa5f563f7b417fa263101b.

* Stringified response body before recording event

* Adding ds fields

* Reverting client side changes

* Fixed failing tests

Co-authored-by: Ayangade Adeoluwa <adeoluayangade@yahoo.com>
2022-07-28 09:40:47 +05:30
Nidhi
6df4dafead
chore: Better server logging infra (#15440)
* Fixed a bunch of server side logging issues

* Tests

* Added ISO8601 timestamp to log format
2022-07-28 09:40:03 +05:30
Vishnu Gp
828f734b18
Added missing analytics events and extra data (#15408)
This adds a few missing analytics events and some more extra data for audit purposes. The missing event added are,

    User login (login_USER)
    User logout (logout_USER)
    Import Application (import_APPLICATION)
    Export Application (export_APPLICATION)
    Clone Application (clone_APPLICATION)
    Create Workspace (create_WORKSPACE)
    Delete Workspace (delete_WORKSPACE)
    View Page (view_NEWPAGE)
2022-07-27 21:01:34 +05:30
Anagh Hegde
712e15a1fc
chore: NPE issue while copying in git-theming migration (#15480)
## Description

> Fix the NPE issue in theming while copying the properties. 


## Type of change

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

## How Has This Been Tested?

> Locally

## 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-07-27 17:14:17 +05:30
Vishnu Gp
91025f94d7
chore: Fixing flaky test in ApplicationForkingServiceTests (#15468)
## Description

Fixes issue in ApplicationForkingServiceTests

## Type of change

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

## How Has This Been Tested?

- Local tests

## 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-07-27 11:25:15 +05:30
Nayan
9489484ffd
Add migration to fix deleted themes when branch was deleted (#14957)
Due to a bug, customized themes set to the parent branch where deleted when user deletes git branch. The bug has been fixed already. This PR adds a DB migration that fixes the data if there is any.
2022-07-27 10:13:39 +05:30
Vishnu Gp
d7fe87fac8
fix: Converted ApplicationForkingServiceTests to synchronous to temporarily solve tests failing on CI (#15450) 2022-07-26 18:20:40 +05:30
Hetu Nandu
a1e5b511eb
chore: Deprecation warning for comments (#15363)
Adds deprecation warning for comments

Resolves #15364
2022-07-26 18:04:54 +05:30
Ankita Kinger
3b7ace67b5
feat: migrate texts and error messages from organization to workspace (#15410) 2022-07-25 17:52:09 +05:30
Nidhi
833a6b05c4
fix: Modified available scopes for Google Sheets (#15169)
* fix: Modified available scopes for Google Sheets

* fix: Fixed locator reference

* Modified text for scope

* Fixed failing tests
2022-07-21 16:35:54 +05:30
Nayan
63370c1819
feat: Add API to get sample apps related to a template (#14942)
This PR adds query params to the get similar templates API.
2022-07-21 16:56:49 +06:00
Nidhi
50172ecd64
fix: Added support for self signed certificate during OAuth2 flows (#14719)
* Added support for self signed certificate during OAuth2 flows, server side changes

* fix: authentication.useSelfSignedCert key added

* Merging from release

* Fixed issue with dependencies, plus bug with using ssl

* Cypress test attempt 1

* Cypress test attempt 2

* Cypress test attempt 3

* Clean up

* Review comments

* Enabled compression again

Co-authored-by: Aman Agarwal <aman@appsmith.com>
2022-07-21 16:10:36 +05:30
Vishnu Gp
728728cac4
fix: App deploying when git push fails (#15255)
* Fix: Prevented publishing the app when git push fails
2022-07-21 10:29:22 +05:30
Sumit Kumar
fc65216782
fix: fix race condition on datasource creation (#14348)
* fix race condition on datasource creation for non-clustered setup
2022-07-20 23:31:50 +05:30
Ankita Kinger
3933f5f4d1
feat: migrate from org to workspace under phase 3 (#14158)
* migration from organization to workspace on code level

* updated a few more files

* fixed runtime errors

* update org settings URL

* Renamed organizationId in domain objects

* changed field named from organization to workspace

* Reverted AppsmithRole changes

* fixed migrations

* recreating indexes

* migration update

* seed data runs before migration, undo changes

* mock commit

* seedmongo to populate upgraded data, datasource upgrade

* fixed two test cases

* updated migrations

* updated prop name

* Upgraded AclPermission

* comment

* migrated AppsmithRole

* more changes

* final set of changes

* variable name changes

* update cypress variable name

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java

* Update app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java

Co-authored-by: Trisha Anand <trisha@appsmith.com>

* reverting encryption handler change

* refactor code to migrate from org to workspace

* migrated a few missed out org to workspace

* updated a few more

* migrated a few missed out org to workspace

* migration changes

* Removed Permission import

* reverted code change

* few more changes

* fixed failing cypress test

* fixed failing cypress test

Co-authored-by: Sidhant Goel <sidhant@appsmith.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Sidhant Goel <sidhant@hexcod.in>
2022-07-20 17:24:16 +05:30
Shrikant Sharat Kandula
5d166a46f1
fix: Block the call to clear Redis sessions (#15330) 2022-07-20 16:09:09 +05:30
Shrikant Sharat Kandula
e8be0936e6
Fix method name for Redis cleaning migration (#15322) 2022-07-20 12:48:55 +05:30
Anagh Hegde
dbf0b94973
feat: Update the table widget to v2 in suggested widget list (#15277)
Co-authored-by: balajisoundar <balaji@appsmith.com>
2022-07-20 12:28:50 +05:30
Shrikant Sharat Kandula
39ad73228c
Log users out to fix serialization error from upgrading Spring (#15314) 2022-07-20 07:43:38 +05:30
Shrikant Sharat Kandula
bba78afc3b
chore: Upgrade dependencies reported by Dependabot (#13735)
Upgrades vulnerable dependencies in all plugins except for MySQL. That one is still failing and I'll fix it in a separate PR. Issue #14475

Co-authored-by: Nayan <nayan@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
2022-07-19 10:23:27 +05:30
Nidhi
02a5e1d490
fix: Added dropdown to select whether to send credentials in header or body in client credentials flow (#14545)
* Added dropdown to select isAuthorizationHeader in client credentials flow

* Added tests

* Added cypress test

* Oopsie
2022-07-13 14:33:19 +05:30
Nayan
bac6162921
feat: Add new field for the page meta data in templates (#14784)
In order to import a specific page or browse to that page, the templates FE need page names and page ids. This PR replaces the list of page names with a list of objects that contains the page names and page ids.
2022-07-13 00:07:18 +06:00
Anagh Hegde
317f340421
feat: fetch branch speific refs from the remote repo (#15067)
* fetch branch specific refs from the remote repo
2022-07-08 11:29:16 +05:30
Anagh Hegde
883d9d801e
chore: Refactor git api to include application id as request param instead of the path variable (#14800)
* Refactor git API's to add `/app` to the API path to identify the appId

* Update the url in cypress tests

* Update the path in git spec cypress files

* Update the url for connection spec
2022-07-07 12:35:03 +05:30
Shrikant Sharat Kandula
30236469a9
Fix saving values with special chars in env file (#14873)
Fix how special chars in env values are saved

Also included some refactoring to fix several compile time warnings and lint errors,
including proper formatting.

Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-07-07 11:27:16 +05:30
Nidhi
c5253fc300
fix: Handled migration of empty condition objects, or missing operators (#15038) 2022-07-06 12:37:58 +05:30
Nidhi
ff58dad704
fix: Switched Google Sheets JSON to local directory (#14971)
* fix: Switched Google Sheets JSON to local directory

* fix: Fixed placeholder text for insert row object

* fix: Enabled server side caching of plugin resources again
2022-07-04 22:02:54 +05:30
Nidhi
906a7298dc
feat: Simplified Google Sheets queries (#14869)
* Client changes 1

* add DSL functionality

* Temp commit for refactoring changes

* Do I even know what I'm doing here?

* chore: Second GS layout

* Update: Visibility conditional outputs for schemas

- Added the output from conditional outputs for schema children too

* Update: Entity selector visibility control

- Added logic for controlling visibility of sub components via the JS expressions system

* Update: Passing disabled prop to toggle button

* Update: Passing disabled prop to toggle btn

* Update: Styled component for toggle button

- Added disabled styles based on the disabled prop sent to the toggle form view JSON button

* Update: configProperty role in Entity Selector

- Removed dependance of the configProperty of the entity selector children to it's parent component

* Update: type of placeholder key

- Made placeholder key from form config JSON to accept either string or an object
- Earlier only string was accepted
- This is for pagination component

* Update: Added placeholder control for pagination

* Client changes 1

* add DSL functionality

* Do I even know what I'm doing here?

* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design

* fix: updated tooltip component for wrong ui on entity explore

* temp triggers

* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design (#12395)

* fix: updated uqi forms ui, clubbed JS switch button to ads, updated tooltip design

* fix: updated tooltip component for wrong ui on entity explore

* fix: updated tooltip ui, where condition placement, sort by ui

* temp form data access logic

* fix: updated sorting type width ui

* fix: updated ui for spacing, width and text issues

* Update: Type for tooltip of UQI forms

- Added option to send an object to the tooltipText object.
- This allows for composite components like pagination to have tooltips for each sub component

* Update: tooltip for pagination component

- Added handling to parse the tooltip for multiple components.
- This allows for composite components like pagination to have tooltips for each sub component

* Update: Type cast for tooltip component

- Made the content passed to tooltip component as a string only

* Update: Fixed tooltip component CSS

* Update: Dropdown option component

- Added a tooltip wrapper to each option
- This is to show on hover text like disabled state

* fix: updated ẇhere clause broken ui for condition

* Add: functions to check and extract expressions

- Loop through the formConfig and find any keys that have a value that is bindable
- Used pre defined regex to check if value is a moustache binding

* Add: Types for evaluated form configs

- Added types for the form configs to be evaluated and their output post eval

* Add: Flow to run the form config

- Run the form config and update the result to the redux state

* Update: Name of the type for formconfigs

- Updated since it was clashing with a component of the same name

* Add: Function to enforce config type checks

- This is done so that the improper configs can be weeded out and the rest of the form can be shown

* Add: Function to update evaluated config

- Added option to update the config if it's values needed evaluation

* Add: Type check for schema sections

* Update: Error handling for invalid control type

- We were throwing an exception till now, changed it to a warning text

* Add: Exposed tooltip for dropdown option disabled state

* Update: switch to json mode functionality

- Added logic to convert data to a string rather than an object when the first switch to JSON mode happens

* Update: Added key to tooltip for dropdown options

* Trigger API modification

* Add: function to fetch default trigger URL

* Update: Made URL optional in dynamic trigger config

* Update: Dynamic trigger API call

- Made the API call for dynamic triggers have URL as optional field
- Added type check to the response of the API call

* Update: resp type for trigger APIs

* Update: Moved code to utils folder

- Moved functions for UQI form eval processing to utils file

* Update: passing original controltype to JS switch

* Update: config for JSON editor mode

- Updated the config to have different options for JSON mode depending on the original control type

* Update: Connected line numbers flag to config

* Revert: CSS changes for tooltip

* Refactor: Removed consle

* Add: type for the config of dynamic values

* Add: Feature to evaluate config for triggers

* Refactor: fix type check errors

* fix: dropdown ui width with text alignment

* Update: fixed selector for dynamic values

* Update: selector call for fetchDynamicValues

* Add table header index prop for columns selector

* migration partial commit

* migration partial commit

* Refactor: removed unused import

* Update: reused function for checking dynamic value

* Update: removed unused import

* Fix format JSON issues

* Retrieve binding paths from entity selector components

* Fixes 6 remaining issues with UQI implementation

* Fix dropdown issues

* Fix dropdown height issues and fixes triggering of APIs when option is deselected

* Migration changes

* Fix QA generated UQI issues

* Fix projection component height and route change logic

* Fix multi select dropdown placeholder text issue and json stringify issue with switching view types

* Reset entity type value when command value changes

* Test changes

* Review comments

* Moved migrations around

* Corrected import statement

* Added JSON schema migration

* Updated schema version

* perf improvements and filter dropdown options feature

* Fix Code mirror component config for toggleComponentToJson input fields.

* Fix prettier issues

* fix prettier issues

* Fix style issues as a result of the merged conflicts

* Fix failing test case

* Fixed a few other flows (#14225)

* Fixed a few other flows

* Review comments

* Fix generate CRUD, fix evaluation of dynamic bindings and fix various styling issues.

* More fixes (#14367)

* Factor in the root formconfig parent key.

* Fix flickering issues, and evaluatedFormConfig issues

* fix: Teeny bugs (#14455)

* Teeny bugs

* Added previous functionality as is

* Improvements in the way we fetch dynamic values

* Fix stringiification issue and cyclic dependency issues

* Resolve projection component values deletion

* Resolve merge conflicts and fix prettier issues

* fix: Tsc issues

* Fix property pane connection navigation

* updating ee locator

* updating inputfield locator

* dropdown locator update

* Merge conflict not properly resolved.

* Fix s3 spec

* Fix Mongo Spec

* Fix some more tests

* fix: prevent cyclic dependency when switching to js mode (#14668)

* add delete events for change from array to string in diff

* add test to assert absence of cyclic dependency error when switching to js in switchgroup widget

* Assert that evaluation is not disabled when no cyclic dependency happens

* Cypress test preparations for google sheets and form controls

* Fixed a few test errors (#14874)

* Add: unit tests for uqi UI updates

- view type tests
- conditional output extraction
- processing conditional output to handle view/enabled state of the component

* Add: completed isValidFormConfig test

* Update: improved tests for update config

- These tests cover the functionality to update a section config after it's components are done evaluating

* Fix failing cypress tests and cyclic dependency issue

* Fixes some more tests

* Fixed migration of row objects (#14896)

* Bumped the version of design system package

* Update: reverted change to EE selector

* Fix deletion pointer

* Update: selector for js on load spec

- Synced with changes related to ADS dropdown

* Fix mongoDBShoppingCart spec

* Remove comments

* Fix: mongo shopping cart test failures

* fix: mongo shopping cart spec

* Dummy push to retrigger vercel

* fix: mongo shopping cart spec

* Update MongoDBShoppingCart_spec.js

* fix: removed unused click away

* dummy commit

* Update: moved helper functions to separate file

* Add: added tests for saga functions

- Worked on testing for
   - extractFetchDynamicValueFormConfigs
   - extractQueueOfValuesToBeFetched

* Add if check for queueOfValuesToBeFetched

* Resolve review comments

* Empty-Commit

Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Ayangade Adeoluwa <37867493+Irongade@users.noreply.github.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Favour Ohanekwu <fohanekwu@gmail.com>
Co-authored-by: Albin <albin@appsmith.com>
2022-07-04 11:13:27 +05:30
Pawan Kumar
545540723c
fix: Update the default themes in app theming (#14576)
* add new themes

* update default themes

* fix cypress tests

* comment theme test in backend

* updated tests for theming changes

* fix font name in sun rise theme

* update border radius/box shadow labels

* update snapshots + fix cypress tests

* fix cypress tests

* fix cypress tests

* trying fixing snapshot bugs

* trying fixing snapshot bugs

Co-authored-by: Nayan <nayan@appsmith.com>
2022-07-01 11:26:16 +05:30
Nayan
1cf3e0983d
fix: Increase file size limit for templates (#14855)
Forking a template was failing due to file size limit. This PR increases the file size limit to 4 MB.
2022-07-01 11:53:20 +06:00
Nayan
1509d4b0ab
Fix Server build failure due to failing tests (#14837)
Fixes build failure due to missing dependency in controller tests.
2022-06-28 11:01:06 +05:30
Nayan
737bab389d
bug: fixed test failure for get profile of anonymous users (#14805) 2022-06-27 11:55:50 +06:00
Anagh Hegde
e95602ce8a
feat: Add keyType to git import key generation flow (#14762) 2022-06-23 17:54:39 +05:30
Nidhi
049de6b58f
chore: Added actionId and requestedAt fields in ActionExecutionRequest (#14720)
* chore: Added actionId and requestedAt fields in ActionExecutionRequest

* Reverted unrelated failing test

* Fix test failures

* Refactor test

Co-authored-by: Anagh Hegde <anagh@appsmith.com>
2022-06-22 22:43:31 +05:30
Nayan
530a571ba0
chore: send whether the app was published manually to the analytics event (#14728)
Sends an attribute along with publish app analytics event to denote whether this was a manual publish or automated publish.
2022-06-22 23:10:22 +06:00
Anagh Hegde
14eb9b4cb5
feat: Add API for git docs and supported shh keys (#14641) 2022-06-22 21:50:04 +05:30
Nayan
076f2a6ced
fix: Admin email not working (#14474)
When a new email of an existing user is added to admin emails from the admin settings page, that user does not get admin access instantly. Same happens when an existing user's email is removed from admin settings - permission is not revoked instantly.
2022-06-22 11:26:37 +06:00
Vishnu Gp
63205dce27
Merge pull request #14184 from appsmithorg/feat/git-delete-only-removed-resources
Feat: Perform file ops only when the resource is updated
2022-06-22 10:53:45 +05:30
Nayan
4431c79e75
fix: Custom theme not copied when creating new branch (#14680)
When a new branch is created where source branch has a custom theme, theme is not copied.
2022-06-21 02:30:46 +00:00
Trisha Anand
437224b856
fix: Fix migration for overwriting recently used workspaces (#14634) 2022-06-17 15:01:52 +05:30
Trisha Anand
c307fc686b
hotfix: Adding workspaceId when missing (#14617) 2022-06-17 12:21:56 +05:30
Abhijeet
ebc4090b53
chore: Enable serialisation for JsonIgnore fields during export flow to avoid adding intermediate fields in DTO (#14120)
* Add separate DTO for import export to serialise JsonIgnored fields

* Move remove unwanted field method for app in aaplication class

* Refactor sanitise objects before export

* Write migrations as per updated serialization implementation

* Fix migration

* Fix NPE during import

* Refactor

* Fix partial import scenario

* Fix testcases for DSLActionDTO

* Remove unwanted testcase

* Fix testcases for orgId to workspaceId migration

* Fix empty repo import testcase
2022-06-17 10:09:28 +05:30
sidhantgoel
15559d0048
fix: for Running an API query returns a missing organization ID error for an unsaved datasource (existing apps) 2022-06-16 18:24:03 +05:30
Pawan Kumar
a6c8e03702
fix: Theming is not applied to Table's 'Delete' & JSONForm's 'Reset & Update' buttons in Crud template (#14316)
* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-06-16 16:43:39 +05:30
Sidhant Goel
0f5e371ad7
added migration 2022-06-16 13:04:28 +05:30
Anagh Hegde
32f9adef21
test: Fixing test failures for git file utils (#14582) 2022-06-16 09:00:36 +05:30
Ankita Kinger
9b7944e7ee
feat: migrate organisation to workspace (#13863)
* migration from organization to workspace on code level

* updated a few more files

* fixed runtime errors

* update org settings URL

* Renamed organizationId in domain objects

* changed field named from organization to workspace

* Reverted AppsmithRole changes

* fixed migrations

* recreating indexes

* migration update

* seed data runs before migration, undo changes

* mock commit

* seedmongo to populate upgraded data, datasource upgrade

* fixed two test cases

* updated migrations

* updated prop name

* Upgraded AclPermission

* comment

* migrated AppsmithRole

* more changes

* final set of changes

* variable name changes

* update cypress variable name

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java

* Update app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java

Co-authored-by: Trisha Anand <trisha@appsmith.com>

* reverting encryption handler change

* migrated a few missed out org to workspace

* migrated a few missed out org to workspace

* migration changes

* Removed Permission import

* fixed AppsmithRole

* mongodb version update

* fixed compile error

* fixed compile issue

* fixed some tests

* simplified embedded mongodb config

* updated a cypress test

Co-authored-by: Sidhant Goel <sidhant@appsmith.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Sidhant Goel <sidhant@hexcod.in>
2022-06-15 21:07:41 +05:30
Aravind
595da2d9ef
fix: Redirection after login does not work for Google and Github (#14268)
* Fix for issue #9819

Security.STATE_PARAMETER_ORIGIN is already set to "origin="

* removing redundant variable 

Refactoring code
2022-06-15 17:59:56 +05:30
sidhantgoel
0ccc1aee93
fix: Fixes issue where CI was not executing all tests (#14338)
* made test classes public

* added surefire compatible with junit 4

* Revert the changes of tests class accessibility

* Fix test failures

* test case fixes

* fixed NPE

* Fixed failing tests

Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
2022-06-15 12:04:28 +05:30
Vishnu Gp
74ac6b9a1c
Resolved the issue of actionCollection updatedAt field not getting updated (#14323) 2022-06-11 10:03:26 +05:30
Anagh Hegde
c64784646a
Update the delete app flow for git connected apps (#14399) 2022-06-10 18:39:00 +05:30
Ankita Kinger
3b62e3f26a
Refactor code for RBAC feature (#14426) 2022-06-10 07:35:30 +05:30
Shrikant Sharat Kandula
6fafbf58df
Fix okhttp dependency (#14421) 2022-06-09 16:36:45 +05:30
Aswath K
a88618d17d
chore: Adds feature flag for Property pane grouping (#14311)
* Adds feature flag for Property pane grouping

* changes assertion logic
2022-06-09 11:16:00 +05:30
Ankita Kinger
442b849d9e
Refactor code for RBAC feature (#14362) 2022-06-08 18:48:15 +05:30
Abhijeet
6778af219c
chore: Improve the import application flow performance (#14364)
* Use saveAll instead of save in import flow
2022-06-08 13:53:50 +05:30
Nayan
51744a6727
feat: Return recently used templates first (#13996)
If user has recently used templates set, those should come first in the response of get templates API
2022-06-08 13:25:00 +06:00
Nayan
da2455bb5c
feat: Import an template inside an existing Application (#12507)
This PR adds the feature to import a template inside an application.
2022-06-08 13:24:37 +06:00
Somangshu Goswami
cdf0454db5
Merge branch 'master' into release 2022-06-08 11:08:30 +05:30
sidhantgoel
bacb0ab640
organization export permission in seed data (#14335)
Signed-off-by: Sidhant Goel <sidhant@appsmith.com>
2022-06-07 17:31:15 +05:30
Nayan
722aa11be2
Add custom slug along with auto generated slug for pages (#14065)
Adding custom slugs for pages that can be set by the user.
2022-06-05 00:48:25 +06:00
Pawan Kumar
78e6bcf7ad
fix: Theming UX Changes (#13741)
* update color control ux

* add reset theme option

* remove the console

* update theme card

* update icons + text for reset

* update button size

* fix cypress tests

* fix cypress tests

* fix flaky git tests

* incorporate ashit feedback

* fix cypress tests

* fix color button in theme panel

* fix reset theme logic + jest tests

* fix button styles reset issue in json form

* add cypress test for theming reset

* incorporate ashit feedback

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
2022-06-03 15:55:38 +05:30
Anagh Hegde
4c6c109edf
fix: Update the widget from drop down to select widget in suggested widget list (#13944)
* Update the widget from drop down to select widget
2022-06-03 07:49:56 +00:00
Abhijeet
acf3e0c6fd
fix: Add sequential counter suffix for imported application nomenclature (#14245)
* Add sequencial counter for import application flow

* Refactor
2022-06-03 10:37:56 +05:30
Abhijeet
78ce45a190
chore: Remove client subscription for delete branch (#14152)
* Remove client subscription for delete branch

* Remove unused imports
2022-06-02 11:47:13 +05:30
Pawan Kumar
33767cf75f
fix: Theming is not applied to Table's 'Delete' & JSONForm's 'Reset & Update' buttons in Crud template (#14193)
* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-06-02 11:37:36 +05:30
Trisha Anand
5054cf312e
feat: Add Policy Domain (#14224) 2022-06-01 16:35:54 +05:30
Trisha Anand
ecce50a1b4
feat: Add User Group domain (#14221) 2022-06-01 16:33:11 +05:30
Anagh Hegde
c073170816
Update url for connecting to repo git sync (#14226) 2022-06-01 16:20:01 +05:30
Trisha Anand
adf70ed6fa
feat: Adding Permission Group datastructure (#14147) 2022-06-01 16:19:14 +05:30
Aishwarya-U-R
be926e3b22
Merge branch 'master' into release-v1.7.2 2022-06-01 11:50:27 +05:30
Abhijeet
d669cf4e4d
chore: Add branch name param for git analytics events (#14133) 2022-05-30 10:32:54 +05:30
Nayan
a362e536fd
feat: Sort datasources alphabetically and mark recently created datasources (#13958)
Return list of datasources in the GET /api/v1/datasources sorted alphabetically. Also set a flag isRecentlyCreated to the most recently created 3 datasources.
2022-05-29 00:02:39 +06:00
Trisha Anand
132a5065fe
feat: Add conceptual Tenant (#13935) 2022-05-27 18:29:08 +05:30
Shrikant Sharat Kandula
39b071961a
Better error response for admin API when env file is not found (#13373) 2022-05-27 17:04:40 +05:30
Arpit Mohan
f0663ec341
Merge branch 'master' into v1.7.1_promote_release_to_master 2022-05-27 07:49:15 +02:00
Abhijeet
6c1e5ec8c4
fix: Close insert modal for MongoDB and Google sheet after InsertQuery is executed for generated CRUD pages (#14115)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-05-26 16:20:28 +05:30
Abhijeet
845d5b2ad4
chore: Update CRUD page template to include JSONFormWidget (#12662)
* Updated Template

* Fix testcases

* Try removing autogenerated field entry from insert modal

* Update mongo testcase
2022-05-26 09:19:33 +05:30
Anagh Hegde
7f56d3972c
fix: Add support to generate ssh keys of type RSA (#13640)
* Add support to generate ssh keys on RSA algo
* Add the ssh key metadata to the get ssh key api
2022-05-25 14:14:02 +00:00
Sidhant Goel
8a50dea54d
added comment 2022-05-23 16:18:06 +05:30
Sidhant Goel
54b82d0502
Fix for running migrations before application start 2022-05-23 15:21:32 +05:30
Nayan
6b6deaf98f
feat: Add query count and page count as attributes to publish app event (#13847)
Adds number of pages and number of queries in a Application to the list of analytics attributes when an application is published.
2022-05-20 23:42:09 +06:00
Anagh Hegde
961d412a9f
chore: Add isSystemGenerated field to analytics for git operations (#13705)
* Add isSysteGenerated field to analytics for git operations
2022-05-19 20:42:16 +05:30
Sidhant Goel
12a269f66e
closing stream 2022-05-18 17:00:50 +05:30
Sidhant Goel
a2132d18c7
Added comment to explain processing optimizations done using stream 2022-05-18 16:17:26 +05:30
Sidhant Goel
f24553cc12
optimized the workspace copy migration 2022-05-18 14:52:52 +05:30
Sidhant Goel
a3e593250d
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-18 12:53:08 +05:30
Nayan
33c78e93ef
feat: Update organization slug (#13791)
When organization name is updated, the slug is not updated. This generates a outdated URL when user clicks on a organization name from the left panel. This PR changes the following behaviors

    The Organization slug will be no more unique
    Link to organization applications will be based on organization id instead of slug
    Organization slug will be updated whenever there is a change in organization name
    All the existing organization slugs will be updated
2022-05-18 11:08:13 +06:00
Sidhant Goel
47f8ed94b1
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-17 20:23:36 +05:30
Trisha Anand
11ee278740
fix: NPE check when datasource createdAt is null (#13894) 2022-05-17 15:44:14 +05:30
Trisha Anand
ea80a6028c fix: NPE check when datasource createdAt is null
(cherry picked from commit beafb371b24180dce2e351f1dea6d9d34db2a204)
2022-05-17 14:34:28 +05:30
Ankita Kinger
ccf74e691b Merge branch 'master' of https://github.com/appsmithorg/appsmith into chore/release-v1.6.26 2022-05-17 12:39:04 +05:30
Nayan
71ffbdeb45
fix: Theming issue when application has multiple git branches (#13870)
* fix: Themeing issue when application has multiple git branches

* Don't commit published mode theme

* -updated as per review comment

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-05-17 10:14:08 +05:30
Abhijeet
e7f34b0034
chore: Improve execution time logging (#13811)
* Increate timeout for git APIs and log execution time in mixpanel

* Improve execution time logging
2022-05-16 09:45:34 +00:00
Sidhant Goel
6a249c1cbe
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-12 16:21:24 +05:30
Sidhant Goel
6a9d62476d
Added migration to update sequence names 2022-05-12 16:16:18 +05:30
Anagh Hegde
807eea20b4
test: Fix git test failures (#13748)
* Fix test failures

* Fix testcase for pull changes

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-05-12 15:44:13 +05:30
Sidhant Goel
9cde523e52
Reverted changes in strings from workspace to organization 2022-05-12 15:20:33 +05:30
Sidhant Goel
109f34b3ab
renamed USER_ADDED_TO_ORGANIZATION_EMAIL_TEMPLATE to USER_ADDED_TO_WORKSPACE_EMAIL_TEMPLATE and corresponding template file name 2022-05-11 22:21:25 +05:30
Sidhant Goel
0abf57488a
Renamed PluginOrgDTO to PluginWorkspaceDTO 2022-05-11 22:18:26 +05:30
sidhantgoel
1e1e11d9be
Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
grammar correction

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 22:16:55 +05:30
sidhantgoel
4a984b68ae
Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
grammar correction

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 22:13:54 +05:30
Sidhant Goel
3f83e93a89
Merge branch 'feat/migrate_organization_to_workspaces' of github.com:appsmithorg/appsmith into feat/migrate_organization_to_workspaces 2022-05-11 22:10:15 +05:30
Sidhant Goel
087d24c6de
Removed migration to delete organization collection
Renamed constant FieldName.ORGANIZATION to FieldName.WORKSPACE, kept the value as organization
Renamed constants in appsmith errors
2022-05-11 22:08:03 +05:30
sidhantgoel
9848cb5294
Update app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ApplicationFetcherCEImpl.java
Organization to Workspace in comments

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:37:04 +05:30
sidhantgoel
30aa1a9a6a
Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
orgMono to workspaceMono

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:36:44 +05:30
sidhantgoel
93e96d0c7f
Update app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ExamplesWorkspaceClonerCEImpl.java
grammar correction in comments

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:34:56 +05:30
sidhantgoel
e0ee0134eb
Update app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
orgMono to workspaceMono

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:34:17 +05:30
sidhantgoel
796868ab79
Update app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java
renamed organizationId to workspaceId in comment

Co-authored-by: Trisha Anand <trisha@appsmith.com>
2022-05-11 21:33:31 +05:30
Sidhant Goel
214e5a8318
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-11 18:03:51 +05:30
balajisoundar
ba0b58aa8f
chore: add theme stylesheet for Table widget v2 (#13713) 2022-05-11 11:06:19 +05:30
Sidhant Goel
c1cd3d2f10
Merge branch 'release' into feat/migrate_organization_to_workspaces 2022-05-10 16:59:26 +05:30
Abhijeet
797828a50a Fix build failure 2022-05-10 15:18:57 +05:30
Anagh Hegde
ab3d1d9815
Delete application created during git import for empty repo (#13450) 2022-05-10 13:02:30 +05:30
Nayan
c75e330506
feat: Track recently forked templates (#13159)
This PR adds feature to track recently forked templates by the user.
2022-05-10 13:28:43 +06:00
Nayan
12dfef1578
fix: Test failing for theme name change (#13663)
Fixes a failing junit test due to theme name change.
2022-05-10 10:59:20 +06:00
Sidhant Goel
98d1ac017b
Renamed organization in variable names and comments 2022-05-09 21:16:23 +05:30
Anagh Hegde
4db07f88b4
Fix test failures (#13306) 2022-05-09 13:17:20 +00:00
Sidhant Goel
9f56a7e49b
Renamed variable names and function names 2022-05-07 00:44:57 +05:30
Sidhant Goel
19483c6f07
QOrganization to QWorkspace in CustomWorkspaceRepositoryCEImpl 2022-05-06 23:19:19 +05:30
Sidhant Goel
db73a16ad6
UserOrganizationServiceImpl to UserWorkspaceServiceImpl 2022-05-06 23:13:39 +05:30
Sidhant Goel
0b99548493
OrganizationControllerTest to WorkspaceControllerTest 2022-05-06 23:12:07 +05:30
Sidhant Goel
549ca3ee4a
OrganizationController to WorkspaceController 2022-05-06 23:10:29 +05:30
Sidhant Goel
f514847847
OrganizationPlugin to WorkspacePlugin 2022-05-06 23:08:19 +05:30
Sidhant Goel
a4e4c00826
OrganizationPluginStatus to WorkspacePluginStatus 2022-05-06 23:07:45 +05:30
Sidhant Goel
25ec1ec5ae
ShareOrganizationPermissionTests to ShareWorkspacePermissionTests 2022-05-06 23:06:50 +05:30
Sidhant Goel
7298b05ef6
Renamed ExamplesOrganizationClonerTests to ExamplesWorkspaceClonerTests 2022-05-06 23:05:56 +05:30
Sidhant Goel
0b7dc1aa7e
Renamed UserOrganizationServiceCEImpl to UserWorkspaceServiceCEImpl 2022-05-06 23:04:44 +05:30
Sidhant Goel
ddc99df246
Renamed ExamplesOrganizationCloner(s) ExamplesWorkspaceCloner(s) 2022-05-06 23:03:43 +05:30
Sidhant Goel
1c2db28676
Renamed OrganizationApplicationsDTO to WorkspaceApplicationsDTO 2022-05-06 22:58:41 +05:30
Sidhant Goel
cb1cb07ba2
Renamed UserOrganizationServiceTest to UserWorkspaceServiceTest 2022-05-06 22:57:25 +05:30
Sidhant Goel
c73defbb03
Renamed UserOrganizationService to UserWorkspaceService 2022-05-06 22:56:25 +05:30
Sidhant Goel
50082fcd14
Renamed UserOrganizationServiceCE to UserWorkspaceService 2022-05-06 22:36:23 +05:30
Sidhant Goel
6c5134ca42
Renamed UserOrganizationServiceCE to UserWorkspaceServiceCE 2022-05-06 22:35:34 +05:30
Sidhant Goel
ffed375768
Renamed OrganizationServiceImpl to WorkspaceServiceImpl 2022-05-06 22:31:25 +05:30
Sidhant Goel
8f4cacd9bf
Renamed OrganizationControllerCE to WorkspaceControllerCE 2022-05-06 22:29:55 +05:30
Sidhant Goel
91678931e4
Renamed OrganizationServiceCEImpl to WorkspaceServiceCEImpl 2022-05-06 22:28:28 +05:30
Sidhant Goel
6e27e5abd4
Renamed OrganizationServiceUnitTest to WorkspaceServiceUnitTest 2022-05-06 22:26:29 +05:30
Sidhant Goel
8ff79a5c22
Renamed OrganizationServiceTest to WorkspaceServiceTest 2022-05-06 22:25:18 +05:30
Sidhant Goel
4ade25c457
Rename OrganizationService to WorkspaceService 2022-05-06 22:23:50 +05:30
Sidhant Goel
49297c35ac
Renamed OrganizationServiceCE to WorkspaceServiceCE 2022-05-06 22:21:36 +05:30
Sidhant Goel
7458df100a
Renamed Organization repositories to Workspace repositories 2022-05-06 22:19:13 +05:30
Sidhant Goel
96adf6c273
Created Workspace domain object
Marked Organization deprecated
Replaced all references to Organization with Workspace
Added migration to copy documents from organization collection to workspace collection
Added migration to create indexes on workspace collection
Added migration to drop organization collection
2022-05-06 22:04:10 +05:30
Abhijeet
9aa4bd104a
fix: Missing pluginId issue for datasource during the import flow if destination org don't have sepcific plugin installed (#13487)
* Fix missing pluginId issue for datasource

* Refactor assertion

* Update error message
2022-05-06 15:08:06 +05:30
Abhijeet
ad4772f5ea
fix: Improve git error logging (#13580)
* Add appropriate error type

* Fix warnings

* Update repo not found exception
2022-05-06 10:57:35 +05:30
Abhijeet
ecb3904680
chore: Add analytics event for SSH key generation (#13505) 2022-05-05 15:52:30 +00:00
Vishnu Gp
f23077285b
Merge pull request #13570 from appsmithorg/feat/analytics-events-for-authentication-methods
Chore: Functional breakdown for authentication analytics feature
2022-05-05 20:14:48 +05:30
Nidhi
dc70220a2f
fix: Throw error when trying to import a cURL command that has a subshell in it (#13558) 2022-05-05 11:08:17 +05:30
Vishnu Gp
21f5447e40 Functional breakdown for authentication analytics feature 2022-05-04 20:39:03 +05:30
Abhijeet
9fc9f7a774
chore: Commit application files during the connect flow (#12288)
* Commit application files during the connect flow

* Refactor detach remote method name

* updating connectToGitRepo method

* fix git tests

* Update default dsl to remove uncommitted changes for bottomRow and pathlist

* updating git cypress tests

* fixed git bug spec cypress test

* enabled other test case

* with store test

* fixed comment

* closing git sync modal

* updated test logic

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Parthvi12 <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: haojin111 <haojin828@outlook.com>
2022-05-04 12:27:07 +05:30
Vishnu Gp
acca123872
Merge pull request #13462 from appsmithorg/feat/analytics-events-for-authentication-methods
Feat: Added analytics events for GitHub and Google Auth
2022-05-03 19:51:39 +05:30
Arpit Mohan
80516658b4
Release v1.6.24 2022-05-03 16:14:15 +02:00
Anagh Hegde
75a326470c
fix: Add null check for createdAt field in analytics event (#13491)
* Add null check for createdAt field

* send empty value
2022-05-03 11:42:34 +05:30
Anagh Hegde
d274fa3974
fix: Optimize flow to maintain page order during export-import (#13401)
* Use map isntead of sorting list

* Refactor

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-05-03 11:42:22 +05:30
Nayan
e9b1108e47
fix: Set default theme when application is exported (#13321)
When application is exported and it does not have a theme set, a NullPointerException was raised in that case. This PR fixes that by returning the default theme when theme is missing.
2022-04-30 01:41:08 +06:00
Vishnu Gp
a8fa0b7465 Added analytics events for GitHub and Google Auth 2022-04-29 19:18:24 +05:30
Anagh Hegde
3e3a32604a
fix: Git connected Application forking should use default branch application (#13255)
* Application forking use default branch application

* refactor changes

* Update the permission
2022-04-29 19:05:23 +05:30
Anagh Hegde
0653f657cf
Merge pull request #13262 from appsmithorg/bug/duplicate-app-git-connected
fix: For git connected apps duplicate should use default branch resources
2022-04-29 15:01:50 +05:30
Nayan
501fb1c1ed
feat: Delete theme when application is deleted (#13252)
This PR archives the related themes when an application is deleted aka archived.
2022-04-29 12:38:09 +06:00
Anagh Hegde
4a19f83a42 Merge branch 'release' into bug/duplicate-app-git-connected 2022-04-29 11:43:45 +05:30
Anagh Hegde
aa4c3fe953 fix: Unable to see apps in home page after git connect fails (#13387) 2022-04-28 17:17:50 +05:30
Anagh Hegde
2c484d5538
fix: Unable to see apps in home page after git connect fails (#13387) 2022-04-28 16:43:53 +05:30
Pawan Kumar
0aec29d837 update theming config 2022-04-28 16:00:03 +05:30
Pawan Kumar
6052600d0b update theming config 2022-04-28 15:58:51 +05:30
Anagh Hegde
a768bb5eb7 Merge branch 'release' into bug/duplicate-app-git-connected 2022-04-27 12:31:23 +05:30
Anagh Hegde
456b5b94ef
fix: Page order sequence for git import (#13126)
* Added page sequence to metadata

* Update test resources

* Add null check for the pageOrder List

* FIx NPE

* Add logic to handle page order for deployed version

* Add tests for the page order

* Add null check for published pages

* Fix unpublished page names getting added in the order list for published

* update the variable name

* Use published page order in tests for published view

* Fix NPE
2022-04-27 11:45:40 +05:30
Nidhi
10f83ef698
fix: Throw error on trying to access non-existent unpublished action (#13210)
* fix: Throw error on trying to access non-existent unpublished action

* Fixed NPE at copy policies from page to action
2022-04-26 20:04:14 +05:30
Rimil Dey
0da092baa7
Merge branch 'master' into promotion-release-1-6-22 2022-04-26 17:55:31 +05:30
Sumit Kumar
7e9eb58f03
fix: fix action objects missing plugin id and plugin type info in database (#13263)
* add plugin id and type info to action object if found missing
* this fix is currently added to the read and update action flows
2022-04-26 16:51:30 +05:30
Abhijeet
b88cdacc7d
Fix npe and duplication for JSObject during clone application (#13297) 2022-04-26 13:13:58 +05:30
Nidhi
21b6936f86 fix: Fixed compile time errors 2022-04-25 14:44:58 +05:30
Anagh Hegde
838b45a8f5 Add branchName check for the clone 2022-04-25 14:24:04 +05:30
Anagh Hegde
94ba542606 use default branch app for clone operation 2022-04-25 14:18:17 +05:30
Abhijeet
56998d77d5 Add index for git (#13133) 2022-04-22 18:31:52 +05:30
Nayan
0a038e714f
feat: added page names to the templates meta data (#12786)
Adds page names to templates meta data
2022-04-22 12:58:35 +06:00
Nayan
c4ee44de15
feat: log template app name to analytics service when template is forked (#12972)
Logs application template name to analytics service when template is forked.
2022-04-22 11:40:32 +06:00
Vishnu Gp
534bdd93b2
fix: Add validation for Git URLs on server (#13182)
This PR adds a backend validation for git URLs on the backend side. Plus added some more test cases for URLs
2022-04-22 07:23:13 +05:30
Nayan
6889882088
feat: updated download template App API to download from cloud services (#12311)
Update download json file API so that it downloads via cloud services
2022-04-22 00:19:46 +06:00
Nayan
15394207a5
feat: Add API to get template filters (#12969)
Adds a new API to get available filters for application templates from Appsmith cloud services. It acts as a proxy to the API.
2022-04-21 15:52:27 +06:00
Abhijeet
3a22cda148
Add index for git (#13133) 2022-04-21 11:10:41 +05:30
Vishnu Gp
cfb7fc4b94
fix: git remote SSH url for Azure | BE (#12933)
Users were not able to add Git SSH URLs from some providers. This fixes the BE aspects of this issue.
2022-04-20 14:47:02 +05:30
Pawan Kumar
a5e32c8083
chore: Update theming default themes configs (#13117)
* theming config update

* add progress bar

Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
2022-04-20 12:08:35 +05:30
Anagh Hegde
ecb08a4918
Add logic to change default branch for git connected application (#11549)
We are opening the appsmith default application when the user clicks on edit. But when the app is connected to git we should always bring up the default application of the default branch.
2022-04-19 19:43:23 +05:30
Abhijeet
cebccc5401
Fix issues in git flows when pages don't have reference in application object (#13040)
As a part of git-directory update we have introduced a bug where if the entity names includes the - we were not able to filter the entities in the individual page directory. This commit introduces a new name-seperator to avoid such issues.
2022-04-19 17:25:11 +05:30
Anagh Hegde
f9fee48c14
Remove feature flag for git import (#12909) 2022-04-18 16:36:59 +05:30
Anagh Hegde
4b8646dd05
Handle logic to delete the application during git delete branch flow (#12986) 2022-04-18 15:24:40 +05:30
Abhijeet
a12750b536
feat: Update directory structure for git-sync to mimic UI (#11705)
* File migration for git

* Testcases added

* Comments added

* Update the action file names to keep unique constraints

* Separate out the theme from metadata

* Update server version to convey the file migration
2022-04-14 23:35:08 +05:30
Vishnu Gp
c7a4ac7353
fix: Organization name can be empty
fix: Organization name can be empty
2022-04-13 17:36:32 +05:30
Anagh Hegde
5c17422956
fix: Connection timeout for git connect when the git repo is behind a firewall (#12819)
* Use non blocking IO for checking the repo status

* Cache the results

* Update tests for the util class method
2022-04-13 10:33:28 +00:00
Vishnu Gp
ccc25f35f5 code refactoring for empty organization name fix 2022-04-13 11:17:35 +05:30
Nayan
4819907a34
feat: Add analytics events to track user activation (#12611)
Adds some attributes to existing analytics events to track user activation.
2022-04-12 20:09:03 +06:00
Nidhi
e36b352a42
fix: Conversion logic for expires in field (#12781) 2022-04-11 11:27:24 +00:00
Vishnu Gp
2c24050bf9 Added comments and test case for empty organization name fix 2022-04-11 16:27:31 +05:30
Anagh Hegde
f9df59f02b
Handle empty repo during git import with proper error message (#12752) 2022-04-11 12:29:18 +05:30
Abhijeet
8dd6bc8d4c
fix: After cloning the page with JSObject creating a new branch copies all the JSObject in a single page (#12743) 2022-04-11 07:42:09 +02:00
Vishnu Gp
1826f3dfef Fix empty organization name 2022-04-11 10:53:38 +05:30
Abhijeet
75cfe8df5b
fix: Fix clone page issue where JSObjects are not showing up in destination page when application is connected to git (#12723) 2022-04-09 13:53:28 +00:00
Anagh Hegde
e386c594fe
fix: Maintain page order during file import (#12698)
* Add logic to order page after creating

* Add test to check if the page order is same as the json file during the import
2022-04-09 11:15:45 +05:30
Anagh Hegde
f9f689af69
fix: Current branch delete exception in delete branch API (#12699)
* Handle current branch delete exception

* Updated error message

* Update error message
2022-04-08 18:28:43 +00:00
Anagh Hegde
737680bb9b
fix: Reset of isPublic flag during git merge operation (#12703)
* do not update the isPublic flag during git operation

* Add tests

* update the comments
2022-04-08 14:35:20 +05:30
arunvjn
fabfb65a4f
chore: Parallelise feature flags and user info API (#12263) 2022-04-07 23:27:32 +05:30
Nikhil Nandagopal
1d27c951de
Reverted to older template file 2022-04-07 12:14:41 +05:30
Nikhil Nandagopal
73b3a54e08
chore: Update crud template (#12634) 2022-04-07 11:36:55 +05:30
Pawan Kumar
cf425249ca
chore: update theming stylesheet config (#12645) - skipChangeLog
Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
2022-04-07 11:28:45 +05:30
Nikhil Nandagopal
2539d6ec12 Updated Template 2022-04-06 19:44:23 +05:30
Nikhil Nandagopal
8dd700f663 Updated Template 2022-04-06 19:41:30 +05:30
Nikhil Nandagopal
a9ccfab55b Updated Template 2022-04-06 19:41:28 +05:30
Nikhil Nandagopal
a6fe504768
feat: Updated CRUD Template (#12579)
* Updated Template

* Updated Template

* Updated Template

* updated xpaths for gemeratePage

Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
2022-04-06 15:46:36 +05:30
Nidhi
79a63d535d
fix: Only add missing user set actions to scheduling order (#12601) 2022-04-06 12:04:41 +05:30
Nidhi
981c618420
fix: Using form url encoded content type for token requests (#12597)
* fix: Using form url encoded content type for token requests

* fix: Using form url encoded content type for cc as well

* fix: Conversion logic for expires in field
2022-04-05 17:47:44 +00:00
Anagh Hegde
e3c7d2b3f2
fix: While importing the application page sequence does not match with the source application (#12539)
* Add logic to maintain page order while exporting the app

* Add test for the page order during export
2022-04-04 23:24:42 +05:30
Abhijeet
ffd0595330
fix: Fix importing datasource with same name but different plugin issue (#12512)
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
2022-04-04 13:23:00 +05:30
Nayan
797f1c0788
chore: removed feature flag for app template (#12485)
Removed feature flag for templates as we're planning to go live
2022-04-03 10:07:59 +06:00
Sumit Kumar
c2f39f4eda
feat: [server side change only] convert Mongo's form data to raw / native query (#10058) 2022-04-01 18:44:32 +05:30
Anagh Hegde
f03a163a38
feat: Export application with datasource configuration for sample apps and templates (#12310)
* Expose a way to export crdentials for sample apps and templates

* Export application with creds if marked as exportableWithCred in application object

* Fix and add testcases

* Add comments

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-03-31 21:56:18 +05:30
Nayan
085b4a3a15
fix: Update admin settings permission from users when they are added or re… (#11770)
Update user permission when email address is added as admin email from settings page.
2022-03-31 20:17:47 +06:00
Trisha Anand
f51da7019d
chore: Adding delete endpoint in ConfigService (#12450) 2022-03-31 19:02:54 +05:30
Shrikant Sharat Kandula
72ee8e7296
Add UsagePulse API, create-only (#12340)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-03-31 06:00:11 +05:30
Abhijeet
d9b2a747df
chore: Add git discard and pull documentation url for status API response (#11869)
* Added discard doc url for status API response
2022-03-30 13:10:38 +00:00
Anagh Hegde
98c69868f1
fix: Fix binding for APIs during git import (#12357)
* Add org id for the actions during git import

* Updated the test resource
2022-03-30 12:44:09 +05:30
Nikhil Nandagopal
b80e536a71
Update crud template (#12298)
* Updated Template

* Updated Template

* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
2022-03-28 18:59:46 +05:30
Abhijeet
b13cf320f0
chore: Add manual and auto update fields within application object to distinguish between the migration related changes (#12099) 2022-03-26 10:40:59 +05:30
arunvjn
69c09c03aa
feat: adding slug names in urls (#10957)
* Init commit clean urls

* Changes to builder route

* Refactored URLs

* Remove default params from url builder functions.

* Fixed more urls

* Changed selector name

* Minor url correction

* Type fixes

* Jest fixes

* Fixed routing for old published apps

* Fixed url slug replace

* page-1 -> page1 as default page slug name

* Remove application id from init editor calls

* Use default page slug

* Added comments and placeholder values for slug names

* variable rename

* Removed redirection and added back the old routes

* Prevent page slug name recompute

* Fixed home page load in view mode

* Added null checks

* Fixed jest test

* Fixed jest test

* Update URL slugs when app/page name changes

* Added unit tests and updates types

* Removed unused code

* * Removed duplication fetch page call.
* Fixes #11354
* Fixed sign up flow

* Refactored initializeEditorSaga

* Fixed warnings

* Fixed integrations screen URL bugs

* Cypress fixes

* Fixed slug names in copy/move operations and pages screen

* Minor refactor

* Fixed page highlight bug in published apps

* Added new url factory and middleware to store url params

* Changed store to default export and fix unit tests

* Fixed slugs unit test

* Minor fixes

* Fixes #11379

* Fixed set as home page feature

* Updated types

* app id adjustments for cypress

* Fixed bad merge

* Refactored routes to functional component

* * Fixed EE active entity highlight.
* Remove unused code in editor router.

* jest fix

* Mock history to prevent security errors

* constant rename

* Removed console logs

* Fixed page id regex

* Do not check for /pages in url

* Fixed missing pageId on quick edit/deploy clicks

* Missed files from previous commit

* Fixed warnings

* Fixed jest test

* New api integration

* feat: Add applicationVersion property to Application (#11626)

Added a new property to Application object - applicationVersion. This property can be used to identity when there is a breaking change and can not be solved with migration. FE will use this property to detect such conditions. Another API is added to migrate the applicationVersion to latest version when user migrates the breaking changes.

* Added manual upgrade modal.

* Test fix

* Fixed jest test

* function rename

* Fix deploy error

* Added null check

* Changes to persist URL search params when redirecting

* Added updates tooltip

* More unit test cases

* Fixed git url redirection

* Fix warning

* Fixed evaluation on upgrade

* Fixed warnings

* File rename

* Added cypress for clean urls

* Fixed import/export/fork cypress

* Cypress api server fixes

* Fixed mongo spec

* Fixed replay spec

* Fixed comments spec

* More cypress fixes

* Fixed tooltip in update btn

* Text size changes

* Minor fixes

* Jest test fix

* Fixed type error

* Fixed warnings

* Fixed todo comments

* Moved description to constants file

* Fixed cypress CI run crash

* Fixes git cypress failures

* Import/Export cypress test fixes

* Import export fork cypress fixes

* Explorer test fix

* Switch branch test fix

* Added applicationVersion in export app json

* Calls plugin forms in parallel

* Fixed warnings

* Fixed warning

* Import export CI fixes

* Reverts previous changes

* Fixes import export

* Fixed import export cypress URL verification

* Pass applicationVersion when duplicating application

* Cypress fix

* Dummy commit

Co-authored-by: Nayan <nayan@appsmith.com>
2022-03-25 16:13:26 +05:30
Nayan
468ed8454f
chore: Send test email error message to client (#11968)
Passes error message from server to client when there is error in send test email
2022-03-24 14:52:51 +06:00
Sumit Kumar
47ad7cc9b1
feat: add JSON smart substitution feature to Firestore plugin actions
* This PR adds the JSON smart substitution feature to Firestore plugin actions.
* This smart substitution will work exactly the same way as it works for REST API actions.
* Currently, smart substitution only gets applied to the body section of Create, Set, Add or Update commands as this is the only input field that expects a JSON input type.
* It can be toggled On/Off via the Settings tab.
* It is set to On by default. However, data migration has been added to set it to Off for all existing Firestore actions so that they are not impacted by this PR's changes.
2022-03-24 13:02:54 +05:30
Anagh Hegde
fae7fc6e7c
fix: App visibility of git connected application is reset after git merge (#11890)
* Fix issue with policies being overridden during hydration from file system to db

* Fix tests

* Update the policies for the branched application

* Add test cases for the visibility changes for git connected applications

* Remove the visibility flag from application object while committing to git repo
2022-03-24 07:01:28 +00:00
Abhijeet
b4dfb6919f
fix: Archived pages are getting copied in forked application (#12050)
* Filter cloning archived pages in application fork action
2022-03-23 17:34:42 +05:30
Anagh Hegde
e44a81e031
fix: Reconnect application showing for existing datasources due to missing flag value (#12034)
* Add migration to fix the reconnect application showing for existing datasources

* Changes per review

* Check the invalids before adding the configured flag

* Fix NPE in migration

* Refactor

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-03-23 09:03:39 +05:30
Nidhi
1ca9fd803a
fix: S3 formData path for bucket name (#12049) 2022-03-22 12:56:42 +01:00
Nidhi
608e7b4fa0
chore: Updated Template for form/json mode for Firestore, S3 and Mongo (#12021)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-03-21 16:13:52 +05:30
Nidhi
dddb85abbf
Null map values (#12018) 2022-03-21 15:37:04 +05:30
Nidhi
079689951d
Null map values (#12017) 2022-03-21 15:19:55 +05:30
Nidhi
aef4001fde
chore: Ignore actions that are already migrated (#12013)
* Ignore actions that are already migrated

* Logging exception
2022-03-21 14:47:55 +05:30
Nidhi
ac3cdc7325
Added null checks for formData keys (#12010) 2022-03-21 14:15:19 +05:30
Nidhi
9912aac4c6
Added null checks for formData (#12009) 2022-03-21 13:52:16 +05:30
Shrikant Sharat Kandula
1d916e1c3c
Fix NPE in form-data migration (#12006) 2022-03-21 13:14:32 +05:30
Nidhi
c97b7e31e7
chore: Migrations to enable JSON and form mode (#11534)
* feat: added new component to perform generic json raw toggle functionality

* chore: Migration to convert formData references

* fix: Redid migration for per plugin changes, fixed consumption

* fix: Added JSON migration for git import

* Added JSON migration as well

* Reverted client side changes

* fix: Modified plugin config aggregation logic

* Merge conflict fixes

* different paths for different commands

* Whoopsie

* Modified usage to different paths

* Reverting env change

* Config changes to show json mode

* Test fixes

* Migrated body,path,next,prev

* Cypress test fixes

* Modified dynamic binding replacement

* Changed view type

* Reverted json form mode display

* Modified structure of JSON mmigrations

Co-authored-by: Aman Agarwal <aman@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-03-21 11:22:14 +05:30
Anagh Hegde
f869930c92
chore: Update error message for checkout remote branch flow (#11891)
* Update error message for checkout remote branch flow

* Changes per review
2022-03-21 11:19:55 +05:30
Abhijeet
f8b62894d6
fix: Handle JSON schema migration for CRUD page generation JSON template (#11948)
* Added migration for CRUD psge generation resource

* Testcase for JSON migration
2022-03-18 14:48:56 +00:00
Nayan
5cdda5a450
fix: Combined API returns branched application id instead of root application id (#11925)
We've added a new API to combine the get application details and get page list APIs as part of the clean URL project. This API was returning root application instead of branched application when application is in separate branches. This PR fixes that problem.
2022-03-18 09:49:04 +00:00
Nayan
e1ba450c91
feat: Added new fields to templates (#11940)
Added two new fields to templates - productImageUrl and sortPriority.
2022-03-18 15:34:59 +06:00
Nayan
21151b851a
-added migration to change default theme name (#11898)
Changes the name of the default theme by introducing a new theme property - display name.
2022-03-18 09:24:29 +06:00
Nayan
ed790f9794
fix: added response meta to the response for import template API (#11662)
Added Response meta to the JSON response for import template API.
2022-03-17 10:51:29 +00:00
haojin111
9cfca0518f
feat: 9754 import work flow (#10453)
* updated import application modal design as v2

* updated import flow

* added title, description, uploadIcon on filepicker ads component for custom file picker

* adding modal of add credential for git import

* added "Git Import" modal

* added generating ssh key for importing flow

* fixed issue of merging

* chore: fix import

* chore: show old import modal based on feature flag

* seperated import api from connect

* added datasource list on reconnect credential modal

* chore: minor changes

* chore: move ssh keys to git sync reducer from applications reducer

* chore: minor fixes

* chore: fetch datasource config for import

* for pulling

* for review of displaying of datasource

* added reconnect datasources after git import

* fix: initialize datasource with default values

* fix: initialise redux for after updating datasource with default values

* fixed issue of git connection init when importing

* if there is a datasource config missing in import, reconnect modal should be opened

* updated logic for unconfigured datasources

* commented unnecessary code

* fixed issue of successful import

* updated import app error logic

* Add un-configured datasources to Import via file response

* Add test

* fix

* chore: refactors

* change per review

* fix: reset ssh keys / url

* Fix issue with newly created datasources not sent

* fix

* chore: minor updates

* chore: minor fix

* WIP

* added saas and rest api datasource form

* feat: fixes and updates for file import flow

* chore: close on upload

* Refactor logic ofr finding unconfigured datasources

* fix: minor fixes

* Fix issue with IsPartialImport

* fix

* Add PartialImport flag for ImportExport service

* refactoring of datasource editor form for both of importing app and editing app

* fixed collapse config

* Fix tests

* Handle redirection back to the /applications for oAuth type

* Show reconnect button on the datasources pages if the datasource configuration is skipped

* added analytic events for reconnecting datasource modal

* Fix the repo limit check for git import

* updated test of importing app from json as new work flow

* updated exported app json while testing automatically

* Add isImport flag for handling OAuth redirection in import flow

* WIP

* updated card UI for import from git title and message in import app modal

* chore: cleanup

* chore: lint

* fix: add is import query param to get token for oauth

* fix

* When the user imports the application there should not be any uncommitted changes displayed on the commit icon

* Add flag to identify OAuth redirection for git import

* Update the variable name

* refactoring reconnect datasource modal

* close git import modal when repo limit error responded

* fixed issue of restoring draft data of datasource form without save on reconnect datasource modal

* chore: update query

* updated query name of oauth redirection url

* Fix duplicate name issue in git import

* fixed rest api reconnect issue on reconnect modal

* init datasources and plugins after imported app, updated reconnect modal as new design

* added unconfigured datasource list logic when importing and updated rest api form delete button visible

* removed put default config of datasource and fixed issue on it

* Add logic to check isCOnfugred in datasource API

* Expose API to get un configured datasources for git import

* added fetch unconfigured datasource list api when redirecting form OAuth

* Remove sensitive fields from application json during export

* update put call response to check for datasourceConfig

* chore: use @appsmith for constants/messages

* chore: use download icon and Import for Importing application label

* chore: move import application text up a bit

* Fix bad merge

* chore: update skip to application tooltip text

* fixed tooltip content of skip to application CTA

* init values of datasource when importing

* updated ui of git import modal as figma design

* fixing padding issue of reconnect datasource modal

* fixed cursor issue on import app modal

* Fix issue with datasource config

* chore: make code compile

* chore: sort lines

* fixed save button issue of dbform on reconnecting modal

* fixed style of import application modal

* Fix iisue with wrong value updated to flag

* reverted from reconnection form style

* fix: update design as per slack discussions on 2022.02.23

* fix: move modal close button to the left

* Remove check for the flag and use the one from db

* Set siCOnfigured as true for mockdata sets

* updated creating datasource with isConfigured as false

* Fix NPE while importing

* fixed scrollbar issue and text alignment on reconnect datasource modal

* fixed style of form container in reconnect datasource and redirecting to app if all are configured

* remove unwanted fields from application json

* FIx NPE for file import

* fix: move close button up in import modal

* remove delete button on reconnect datasource modal

* Add isConfigured false while creating datasources

* fix: add a gap and update color

gap between git import dialog title and subtitle
update color of subtext to GREY_800

* fix: use git import feature flag

* fix: do not use older modal

* updated selecting logic of unconfigured datasource in reconnect modal

* cleanup: auto format

* cleanup: refactor react component

* cleanup: refactor some more

* cleanup: autoformat

* Fix reconnect flag for mockdatasource

* During git import set the isConfigured to false for datasources

* Remove decrypted field from the applicationJson file

* Remove decrypted field from the applicationJson file

* Add app slug to remote repo

* fixed cypress test related with git

* updated json while testing

* Changes per review

* Update the method name

* fixed cypress test related with git

* fixed migration cypress test

* set is configured field as true on tour app

* Fix issue with datasource creation for welcome tour

* fixed issue of replay_editor cypress test

Co-authored-by: Rishabh Saxena <rishabh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: Anubhav <anubhav@appsmith.com>
Co-authored-by: f0c1s <iamanubhavsaini+git@gmail.com>
2022-03-17 15:58:54 +05:30
Nayan
a1255582e4
feat: Added analytics events on themes (#11866)
This PR adds analytics events on different actions on themes - save, customize, delete, apply.
2022-03-17 15:28:36 +06:00
Nidhi
496d908a92
fix: Modified import export flow to use valid names for actions (#11879)
* fix: Modified import export flow to use valid names for actions

* Added test
2022-03-16 20:50:29 +05:30
Abhijeet
9e896dde06
fix: Fix git repository visibility status check and update error messages for git-checkout API (#11858) 2022-03-15 15:29:48 +05:30
Nayan
215285cfeb
Application template fork fails (#11719) 2022-03-15 13:04:34 +05:30
Trisha Anand
b526c0b1b6
fix: Analytics sendEvent should be able to send events even during sign in process (#11818) 2022-03-13 22:23:08 +05:30
Anagh Hegde
1921af9b28
fix: Support repo url conversion for all top level domains (#11694)
* Add support for all top level domains

* Fix tests

* Add tests for git util class
2022-03-10 09:20:12 +00:00
Abhijeet
bc929f2f67
chore: Don't take client subscription into account for discard git changes (#11666) 2022-03-09 16:58:54 +05:30
Nidhi
aaf12c513d
fix: Adds user set on load prop from actions to exported JSON file (#11718) 2022-03-09 16:57:45 +05:30
akash-codemonk
a6946fbcf0
fix: end guided tour on exiting editor (#11084) 2022-03-08 20:25:20 +05:30
Shrikant Sharat Kandula
ae5f9569c9
Fix startup failing if signup disabled is empty (#11686)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-03-07 17:38:18 +05:30
Shrikant Sharat Kandula
1233f7f7ee
chore: Change watchtower to latest from latest-dev (#11669)
This is because watchtower:latest-dev doesn't run on ARM architectures.
2022-03-07 13:58:20 +05:30
Nayan
be5b12b7bb
[Fix] Added permission in security config for themes (#11527)
Theme API path was not added added to security config path. As a result, themes in published mode in public apps were not loaded. This PR fixes that issue.
2022-03-07 01:43:26 +06:00
Anagh Hegde
dde1eb1735
Add check for default branch before deleting branch (#11631) 2022-03-05 08:30:29 +00:00
Shrikant Sharat Kandula
cde48bf9a9
Don't provide extra information on forgot password (#11596) 2022-03-04 15:16:58 +05:30
Nayan
caab37de26
feat: Add new API to combine get application details and get pages API (#11448)
Merges the get application details and get page list API into one. This API takes either applicationId or pageId and returns the list of pages of that application.
2022-03-04 12:32:48 +06:00
Abhijeet
13d6450616
chore: Soft delete resources across Appsmith board for delete operation (#11555)
* Soft delete resources

* Add TC and migrations
2022-03-03 23:06:34 +05:30
Nidhi
8b1638aba6
chore: Modified plugin config aggregation logic (#11561)
* fix: Modified plugin config aggregation logic

* Modified logs a bit

* Reverted incorrect path from another branch
2022-03-03 19:26:55 +05:30
Nidhi
d57207d224
fix: Changed test class reference to CE (#11578) 2022-03-03 12:00:55 +05:30
Abhijeet
cdf06cb773
feat: API to discard changes for git connected applications (#11362)
* Add discard changes functionality for git

* Recover deleted resources from the file system and refactor

* Remove untracked files, remove unwanted actions

* Testcases added for discard changes

* Added comments
2022-03-02 19:54:09 +00:00
Nidhi
5c994975d7
fix: Modified action execution endpoint (#9473) 2022-03-02 16:01:50 +00:00
Anagh Hegde
1d90a9fed9
feat: Add API for delete branch for git connected application (#11432)
* Add API to delete git branches

* WIP

* Fix test failures

* Change the method from POST to DELETE

* Changes per review

* Changes per review
2022-03-02 13:42:16 +00:00
Nayan
3cfc3781f1
Handle NPE in home page API (#11481) 2022-03-02 11:54:24 +05:30
Ayangade Adeoluwa
51b43daa1b
fix: Fixes modal pop up bugs on page load (#11504)
* Fixes modal pop up bugs on page load

* send confirmBeforeExecute attribute with page execution order info

(cherry picked from commit 6d3cfdfbdb83b435e67797f3fb27024799d5d579)

Co-authored-by: Sumit Kumar <sumit@appsmith.com>
2022-02-28 23:07:21 +05:30
Shrikant Sharat Kandula
8056e76946
Fix casing of plugin names (#11447)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-02-25 13:10:31 +05:30
Rishabh Saxena
acf01995bd
chore: git sync cypress tests (#10006)
* Fix connect test

* check api response

* [wip] test comments across branches (#8704)

* Intercept only connect api

* chore: update switch branches tests (#9005)

* test switch branches from the query params

* test flow wip

* .

* fix merge status update

* change mergeAble to isMergeAble

* wip

* fix: show error popup if pulled from bottom bar

* fix: append branch query to notification links

* fix: disable git connection during onboarding

* fix: typo

* fix: typo

* fix: typo

* fix: z-index bottom bar cout

* fix: pull button minor fix

* fix: reset conflicts when the git sync modal is opened

* fix

* feat: enable search for branch dropdown

* fix

* fix: typo

* added merge conflicting on merge tab

* updated gitsyncsaga for git sync error action

* added generate ssh key on init and updated git changed count message

* removed git sync error action from error processing module(toast and log)

* commented push button on bottom git action bar temperory

* added option to use git global config

* Added latest deploy preview time: didn't appear until the duration was in minutes

* Link open repo button with repo link

* fixed of commented code part

* upated tooltip of push button on bottom quick git sync toolbar

* Update banner styles for error and warning

* updated repo publish url pattern and last deployed view part

* when the user clicks on the push icon the deploy tab should open

* when branch name is too big and user hover on it the tooltip is not displayed

* The dropdown alignment displayed for the git connect should be polished

* update tests

* fix: minor git sync fixes (#9228)

* fixed of Under the merge tab when the user searches for the branch name which is not present the pop up closes all of a sudden

* fix: update merge api, use message from api response

* fix: update field

* added tooltip of long dropdown option and updated merge tab dropdowns

* removed log

* chore: add connection cypress tests

* temp update for running tests locally

* fixed long branch name on branch list popup

* Use _ as the branch name separator, instead of -

* Use large buttons as CTAs

* Remove the % from the progress bar

* Fix alignment for the skeletons on the deploy tab

* Merge CTA moves down when the status is rendered, add offset to prevent that and error branch dropdown on merge tab

* Show progress bar after clicking on Merge CTA as the loading state and generate key button

* after generating the deploy key before clicking on connect close the pop-up and open it again the Remote URL is not visible in the input box

* fixing of conflicting issue

* updated git connection design

* Provide more spacing between the lines

* Learn more does not have a hover state

* Heading Merge Changes should be sentence cased like headings on other tabs

* Button can trigger CTA call when in loading state

* disabled clickable icon on git connect bottom bar

* Git connection tab: on error the window doesn't scroll all the way to the bottom

* updated temp remote url values on action and reducer

* updated ellipsis functions of text

* fix: prune branch flag

* fix: update page level roomId to include branch name

* fix

* fix

* feat: add a separate feature flag for git import

* feat: branch section headers bottom bar branch list

* fixed branch list comments

* fixed merge issue

* fix

* feat: hotkey for commit and push

* remove pull button on git conflict info

* move tempRemoteUrl redux to gitSyncreducer and added messages

* splited git error as individual action

* removed push button from git sync bottom buttons

* feat: section header at the merge dropdown

* added comment of converting ssh to https

* feat: show connected to git badge

* feat: show asterisk when we have uncommitted changes

* fix: upate segment header for dropdown

* t fix: remove redundant success toasts

* removed tempory git repo url from app data

* wrapped tooltip with elipsis text

* fix: rm unused vars

* fix: bottom bar icon updates

* updated dropdown option with ellipsis text

* added new props named "wrappedOption" on dropdown for wrapping ellipsis option

* rename wrappedOption to truncateOption on dropdown component

* updated dropdown option with disabled props of tooltip

* fix: remove remote branches from merge branch dropdown

* reset yarn lock

* reset yarn

* fix: keeping it same as the existing value

* fix: remove branch dropdown border

* fix: show merge success indicator

* feat: init repo limit error modal

* fix: disconnect git wip

* added git user config test

* removed test data

* fix: checkout api

* fix: lint

* chore: pre connection test specs

* added revoking git workflow

* renamed revoke to disconnectGit

* added setting on git sync action over bottom bar

* added analytic on git connection

* added learn more for remote url and init module of temp remote url when select new application

* .

* chore: test learn more ssh url

* Verify the functionality of Read documantation link

* added git connect with onboarding workflow

* Validate the Input Box displayed below Commit to master Text

* updated test module for deploy tab with commit comment and deploy preview

* test of prune branch name

* Validate the error faced when user switches between the branches

* verify the functionality when user click on "+" Icon

* Verify the functionality of serach input box inside the serach dropdown

* Verify the display of the Merge Button

* advanced of disconnect git ui

* added git disconnect modal test case

* updated repo limit error condition

* added learn more link test on git disconnect modal

* for review of repo limit error modal test script.

* fix: issue with intercept

* fixes

* fixes

* add key, misc fixes

* fix

* revert changes

* fix

* fix imports

* Fix import

* Yarn lock update

* fix

* fix imports

* chore: remove timeout for a test run

* Increase timeout for jgit APIs

* chore: try increasing timeout

* try increasing timeout further

* Handle git connect error on the basis of error type

* Add env variable to CI build script

* Fix bad commit for adding env var in workflow

* Refactor

* FAdd env var for local repo path

* fix import

* fix specs

* fix

* fix

* try

* fix

* fix

* fix

* fix

* fix: don't validate error msgs

* fix spec

* improve spec

* chore: rm unused code

* chore: update descriptions

* rm commented out code

* fix

* rm comment

* chore: rm comments

* fix: lint

* chore: update comment

* fix: wait for widget switch transition

* spec updates

* fix

* fix imports

* try waiting for getPagesForViewApp

* fix: rm unused file

* fix: remove spec

* fix: add js collection, comment out repo limit exceeded error since it seems not limited on appsmith instances

* Fix server failure

* chore: correct bootIntercom import and sort lines

Co-authored-by: Rishabh-Rathod <rishabh.rathod@appsmith.com>
Co-authored-by: haojin111 <haojin828@outlook.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
Co-authored-by: Abhijeet <abhijeet@appsmith.com>
Co-authored-by: Abhijeet <41686026+abhvsn@users.noreply.github.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
2022-02-25 06:13:16 +00:00
Abhijeet
612d7d6727
feat: API to provide a way to distinguish if the application is updated manually or through DB migration (#11414)
* Added check for updating application resources manually

* Refactor to include client-side migration
2022-02-24 14:17:50 +00:00
Nayan
10033aea09
-Added new API to return list of default plugins (#11297)
Added a new API that'll return a list of plugins which are available to install. In other words, it'll return list of default/system plugins. This returns the package name, name and icon only - which will be used by templates to show datasource name and icons.
2022-02-24 16:43:11 +06:00
Nayan
32757a9f35
-set feature flag for templates (#11368)
Adds feature flag for templates.
2022-02-24 16:39:15 +06:00
Mojtaba
450950d68f
fix: curl import tries to guess the content-type from the body if content-type header is not specified (#11295)
* fix: content-type is empty when it's not specified.

* feat: try to guess the content type json or form-urlencoded

* fix: broken test for curl with `--data-urlencode` parameter

* fix: fix guessing urlEncodedPattern

* fix: fix broken tests

* fix: Fixed and improved the code formatting
2022-02-24 13:58:26 +03:30
Abhijeet
86c7c09982
fix: Map correct collection ids for onPageLoad actions during import application (#11328)
* Introduce defaultCollectionId for onLayoutLoadAction

* Added TC for clone application

* ImportExportSpec & Dropdown resetSpec flaky fix

* Fix test failures

Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
2022-02-24 12:42:28 +05:30
Nayan
4ae0b5b1de
fix: Set comment authors email address as reply to field in comment notification email (#11251) 2022-02-23 21:56:57 +05:30
Nayan
f060ab8c03
feat: Allow saving theme customizations (#11165)
This PR adds API to save a customized theme so that it can be used again for that application. It also adds permission to themes. Each customized theme will have permissions set just like other domain objects.
2022-02-23 12:32:18 +06:00
Trisha Anand
860b573bc2
chore: Rename metadata to idToken (#11313) 2022-02-21 16:43:37 +05:30
Nayan
a877d137a6
fix: NPE when application has no page (#11204)
This PR fixes a NPE when application has no page or page are missing.
2022-02-18 12:14:02 +00:00
Shrikant Sharat Kandula
4d3e1282ad
Move data counts to properties for analytics (#11236)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-02-17 19:07:31 +05:30
Trisha Anand
ac7ccfd243
feat: Disable form login configurable via admin settings page. (#11234) 2022-02-17 07:54:07 +00:00
Abhijeet
aaf9740674
chore: Remove theme ids during git commit (#11225) 2022-02-17 05:33:25 +00:00
Anagh Hegde
9992a9ae3c
feat: Add api to check the git connection after the key is regenerated (#11144)
* Add api to check the git connection

* Add analytics event for test connection api
2022-02-16 22:25:38 +05:30
Abhijeet
325f27982a
fix: Take previously connected git applications accessibility into consideration to accurately calculate private repo count (#11151)
* Take already connected apps repo accessibility into account during connect and import flows

* Testcases for private repo limit check
2022-02-16 13:36:39 +05:30
Nayan
eefae47b09
feat: Return page slug for default pages in get applications API in home page (#11080)
The GET /application/new API is used to show list of organizations, applications in home page. The list of pages under each application contains only page id. As we're introducing page slugs in URLs, we need the slug of the default page inside the response of this API. This PR adds default page's slug to the response of GET /application/new API.
2022-02-16 12:19:29 +06:00
Abhijeet
ce2cf1ba3a
fix: Fix error code for application controller test case(#11161)
* Fix error code for the application controller TCs

* Fix import-export TCs
2022-02-15 16:28:02 +05:30
Trisha Anand
e892ba18a7
Moving ActionServiceTest to ce package (#11125) 2022-02-15 06:54:03 +00:00
Abhijeet
d8e4ba61fe
fix: Add migration for actionCollection and newAction to improve the performance for getResourceByPageId queries (#11148) 2022-02-14 20:07:02 +00:00
Trisha Anand
80bab90e28
chore: Minor code refactoring for bean utils and action execution (#11102) 2022-02-14 10:24:54 +05:30
Anagh Hegde
eb54d7d325
fix: Remove default error fields for git-sync related analytics for success events (#11097)
* Do not include the error data points in the map for success states

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-02-12 15:10:52 +05:30
Abhijeet
d218b48cf6
fix: Increase supported header size for multipart data (#11058)
* Increase supported header size for multipart data to 128kB

* Update error to be thrown from the global exception handler
2022-02-11 11:26:40 +00:00
Abhijeet
6f7691b6aa
fix: Update error handling for git connect (#11070)
* Update error handling for git connect

* Add testcase for git generic error
2022-02-11 16:17:02 +05:30
Anagh Hegde
5bb73ce36f
Fix NPE in git analytics (#11072) 2022-02-11 05:49:29 +00:00
Abhijeet
860318e0fe
chore: Add stopwatch to log execution time by process name (#11069)
* Add stopwatch to log execution time by process name

* Refactor
2022-02-10 16:59:26 +05:30
Abhijeet
ee6d639e42
chore: Update error handling for resource not found exception for clone, fork and import APIs #11044 2022-02-10 10:26:07 +05:30
Nayan
a5dec675b1
feat: Added application templates (#10952)
Added the required BE API for application templates. It gets templates from Appsmith cloud services through REST API.
2022-02-09 23:13:31 +06:00
Anagh Hegde
b1055cc94d
feat: Add gitHosting provider to analytics (#11036)
* Add gitHosting provider to analytics

* Add support for git provierders like bitbucket

* Change the logic to get provider name
2022-02-09 16:41:19 +00:00
Trisha Anand
d7ce026b93
Minor refactor of code to avoid merge conflicts. (#11039) 2022-02-09 13:53:57 +00:00
Shrikant Sharat Kandula
6e1e2faaac
chore: Anonymous stats if telemetry is enabled (#11014)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-02-09 10:31:00 +05:30
Sumit Kumar
aa2290405d
fix: fix refresh token flow in REST API OAuth (#10875)
Co-authored-by: Segun Daniel Oluwadare <dodanieloluwadare@gmail.com>
2022-02-09 09:38:58 +05:30
Abhijeet
fa0e900f3f
fix: Sort unordered set elements before committing to git repo so as to have same serialised output string for identical set of elements (#10933) 2022-02-08 00:48:20 +05:30
Abhijeet
fba0fc2fd7
chore: Remove git feature-flag (#10914)
* Remove git feature-flag
2022-02-07 06:46:15 +00:00
Anagh Hegde
fa06473d63
fix: Delete the pages post merge operation from application when they are removed from file system (#10810)
* Delete the pages post merge operation from application if they are removed from file system

* Changes per review

* Add tests

* changes per review

* Use string utils for null check

* Change per review

* Fix tests

* Fix tcs
2022-02-04 12:07:07 +05:30
Abhijeet
2e5c1ea4ec
chore: Update doc urls for errors related to git (#10852)
* Update doc urls for errors and SSH key response
2022-02-03 21:13:40 +05:30
Abhijeet
7329d7ff23
fix: Fix NPE during import application when page ids are missing for published action and actionCollection (#10858)
* Provide a fallback pageIds for missing ones in action and JSObjects published version

* Add TC
2022-02-03 20:08:58 +05:30
Abhijeet
e356fd039f
chore: Commit only unpublished resources to git repo which includes queries, JSObjects, pages to avoid data duplication (#10776)
* Commit only unpublished resources to avoid resolving merge conflicts twice

* Added TCs

* Update directory names, fix pull issue in JSObjects
2022-02-03 11:47:57 +00:00
Keyur Paralkar
da638d7f2b
Updated Template (#10853)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-02-03 15:23:56 +05:30
Abhijeet
0b1a8ad20b
fix: Update ApplicationPageId with defaultPageId while fetching applications for homepage (#10812) 2022-02-03 10:56:35 +05:30
Tolulope Adetula
bb2f7da823
feat: Select and Multiselect V2 (#10359)
* fix: Select V2

* Fix: CI Fail

* fix: failing test

* fix: failing test

* Fix: MultiSelect

* Fix: loading issue

* Fix: loadin state

* Fix: loading

* fix: failing test

* fix: evaluation tests

* Fix: failing tests

* Fix: failing test

* fix: failing tests

* Fix: Failing tests

* fix: select All

* fix: filtering

* Fix: filtering

* fix: refactor Select widget

* fix: hide MultiSelect

* fix: select options

* Fix: failing tests

* fix: failing tests

* Fix: issues

* Update system-themes.json

* Update system-themes.json

* Update system-themes.json

* Update system-themes.json

* fix: PR reviews

* Update EntityDefinitions.ts

* Fix: issues

* fix: console

* fix: QA issues

* fix: options issues

* fix: add widget icons

* fix: update Selectv2

* empty commit to fix CI

* fix: failing test
2022-02-02 06:15:07 -08:00
Nidhi
bc93a1d413
fix: Removed filter of JS actions from get method (#10726) 2022-02-02 08:28:41 +00:00
Nidhi
b02a7f53f6
fix: Disabled generate CRUD page feature for MsSQL (#10811) 2022-02-02 08:27:59 +00:00
Keyur Paralkar
2ec0d2b02a
fix: Updated Template (#10694)
* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-02-02 12:50:21 +05:30
Abhijeet
6b1e3fe7c0
fix: Add branch param for redirect url while authorising Google Sheet when application is connected to git (#10715)
* Add branch param in the redirect url
2022-01-31 10:11:12 +05:30
Abhijeet
8c4d711f5b
chore: Make sure to keep forked application in valid state even if client exits the flow before server responds (#10704) 2022-01-30 17:43:35 +05:30
Shrikant Sharat Kandula
d3d1f8bbf9
Clear sessions on password reset (#9955)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Nayan <nayan@appsmith.com>
2022-01-28 16:49:00 +05:30
Shrikant Sharat Kandula
cc3ab115b5
Remove CORS config as it's unused now (#10312)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-01-28 16:48:04 +05:30
Abhijeet
07082f6bde
fix: Copy evaluation version for cloned application from the source application to fix dynamic binding evaluation to support escaped characters without double escapes (#10702) 2022-01-28 08:07:59 +00:00
Abhijeet
8d93d06317
feat: Add reference doc url for error responses for git APIs (#10620)
* Added reference doc urls for pull conflicts

* Update TCs
2022-01-27 13:08:21 +05:30
Anagh Hegde
e0e4a73650
fix: Logic to delete stale git branch which are not in db (#10647) 2022-01-26 21:29:00 +05:30
Anagh Hegde
c83f7fb3c1
feat: Git import api (#10282)
* Added API to generate deploy keys and store them in a collection for import flow

* Add tests for the key generation flow

* Move the key generation to helper class

* changes per review

* Fix bad merge

* add api to import application

* handle timeout for git import

* Update the comments

* Add API for git import

* handle duplicate application name error & add profiles while importing

* Add tests for import api

* Hydrate from file system after cloning the repo

* Fix test failures

* Test cases

* changes per review

* throw error when the datasource with same name of different type exists

* Fix test failures

* Fis error messages

* Fix test failures

* Fix issue with checking the datasource types

* Add datasource name check while importing the application

* Refactor SSH key gen code for import

* Resolve issues around defaultResourceIds, don't commit app name

* Resolve the issue related to duplicate name for app during import

* Minor fixes

* WIP

* Add logic to get unconfigured datasources for the application

* Fix tests

* WIP

* revert datasource related changes

* Add a boolean flag to Datasource entity

* Add a boolean flag to Datasource entity

* Add flag to identify import status

* Set application name before importing from json files in git-import

* update the variable name

* changes per review

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2022-01-26 21:26:22 +05:30
Abhijeet
0183897d5a
chore: Update mongo indexes to improve the query performance (#10658)
* Add index for JScollection, action and userData

* Refactor
2022-01-26 21:24:56 +05:30
Abhijeet
231c3aaeb7
fix: Bugfix for curl import when the request is made from the child branch for git-connected application (#10638)
* Fix for curl import in sub-branch

* Added comment
2022-01-26 18:20:49 +05:30
Anagh Hegde
341bc61e8c
feat: Add logic to sync the repo if the path is not updated in env file (#10478)
* Add logic to sync the repo if the path is not updated in env file

* changes per review

* checkout branch locally when the branch is not present in remote

* Add the local checked out branch to list
2022-01-26 12:55:07 +05:30
Shrikant Sharat Kandula
6accb9e364
fix: Use CDN for all assets (#10417)
Co-authored-by: Nayan <nayan@appsmith.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2022-01-26 02:19:43 +05:30
Nayan
bb9010d875
fix: fetch user by case insensitive email for oauth login (#10350)
When an user signs up, we store the email in lower case. When user logins with oauth2, we fetch user by email ignoring case. This creates a problem if email from oauth is in upper case. As users are registered with lowercase and we're trying to fetch with upper, users are not found.
This PR fetches user by case insensitive emails during oauth login.
2022-01-25 13:54:50 +00:00
Nidhi
44f5e353fa
fix: Fix typo in default resources ids for actions within collections while creating new collection (#10349)
* fix: Small fix in default resources for actions within collections

* Added tests
2022-01-20 18:17:34 +00:00
Leo Thomas
58b376fa9b
fix: Fix 10463 js object cloning issue (#10523)
* fixes js object cloning issue

* fix10463- JSObject returning new name of cloned object

Co-authored-by: Irongade <adeoluayangade@yahoo.com>
Co-authored-by: Leo Thomas <leoweb2010@gmail.com>
2022-01-20 22:02:11 +05:30
Rishabh Rathod
10e64df1e5
chore: S3 Template (#10461)
* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-01-20 14:07:05 +00:00
Abhijeet
62b720ab00
feat: Add documentation URL alongwith the error response to offer more info about the exception (#10325)
* Add doc url param in error response

* Modify TCs

* Update error codes to follow the sequence
2022-01-20 02:48:43 +00:00
Abhijeet
0ec6875b47
fix: Fix clone JSObject issue where cloned JSObject gets attached to both parent and cloned page and fix race condition for delete action when trying to delete page with JSObject (#10455)
* Fix clone JSObject issue where cloned JSObject gets attached to both parent and cloned page

* Race condition for delete action when trying to delete page with JSObject

* Set published collection to null during fork application
2022-01-19 17:06:27 +00:00
Abhijeet
a48aa9c72b
feat: Remove action and actionCollection ids in exported application JSON (#10430)
* Export action and actionCollection without actual ids

* Added TC

* Comments
2022-01-19 11:46:32 +05:30
Abhijeet
3471de90cd
fix: Gracefully handle defaultResourceIds exception (#10454)
* Gracefully handle defaultResourceIds exception

* Added TCs

* Remove sentry logs
2022-01-19 10:45:36 +05:30
Abhijeet
1ed1bf0e5d
feat: Apply JSON schema migration while importing the application using JSON file (#10339)
* Json schema version check added before importing an application

* Added TC

* Fieldname refactor to make it more relevant
2022-01-18 07:11:23 +00:00
Shrikant Sharat Kandula
f2d26db290
Use CDN for plugin icons (#10393)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2022-01-15 12:54:30 +05:30
Abhijeet
0b71b3840c
Fix error for import curl when app is connected to git (#10355) 2022-01-14 08:59:56 +05:30
Abhijeet
c1e2a1ed59
Revert "chore: Don't take client subscription into account for fork application (#10220)" (#10375)
This reverts commit 814a7d57f9.
2022-01-13 19:00:04 +05:30
Nayan
02be902fdc
feat: add page slug in the get pages API (#10345)
We've added slug for pages. Each page has a slug which is generated from name automatically. In our get pages API /api/v1/pages/application/<app_id>, the slug names were not included in the Page DTO. This PR adds slug name in this API response.
2022-01-13 17:29:09 +06:00
Anagh Hegde
f660c0696d
fix: Fix issue with current branch not deleted exeception (#10334) 2022-01-13 14:07:01 +05:30
Anagh Hegde
7718e03b76
fix: Change SSH key generation protocol for git (#10307)
* move away from RSA-SHA1 to ECDSA-SHA2 protocol for key generation

* Add migration to regenerate SSH keys via new protocol

* use 256 bit signature for the keys

* remove unused imports

* Fix error message for key generation
2022-01-12 12:05:35 +05:30
Sumit Kumar
7306967d0b
fix: fix page load action execution order (#10252)
* This PR fixes the page load action execution order when the actions have been set to run on page load explicitly via the settings tab by the user and its data has not been referenced in any other widget or action. e.g.
  - create action1 and action2.
  - make action2 dependent on action1 by adding {{action1.data}} in action2's body.
  - set both action1 and action2 to run on page load via settings tab. Do not reference action1 and action2 data in any other widget or action.
2022-01-11 16:13:54 +00:00
Shrikant Sharat Kandula
a0aa41145b
chore: Re-run the fakeapi DB migration (#10310) 2022-01-11 13:38:07 +00:00
Abhijeet
814a7d57f9
chore: Don't take client subscription into account for fork application (#10220) 2022-01-11 16:20:40 +05:30
Abhijeet
5f14dcc798
chore: Add migration to update indexes for DB collection to include branchName param for git enabled apps(#10295)
* Add migration to insert index to include branch param for newAction, newPage, application and actionCollection
2022-01-11 16:10:07 +05:30
Rishabh Rathod
034aadf835
fix: Update crud template (#10281) 2022-01-11 04:11:31 +05:30
Sumit Kumar
f045af8bfc
feat: Mongo plugin: add limit field to aggregate command to allow users to define batchSize (#10257)
* This PR adds a limit field which sets the batchSize for aggregate command. This way the user can set the number of documents they want in their Mongo query result.
* limit is set to 10 initially. However, for pre-existing Mongo actions, migration has been added to set this field to 101 - which is the default value that has been used by Mongodb in the absence of any user set value. Ref: https://docs.mongodb.com/manual/tutorial/iterate-a-cursor/
2022-01-10 16:42:30 +00:00
Rishabh Rathod
b4a5540b60
chore: Revert "Updated Template (#10146)" (#10248)
This reverts commit 28d05e29fc.
2022-01-10 13:23:50 +05:30
Anagh Hegde
2469d21c51
fix: ssh to http url conversion (#10173)
* fix ssh to http url conversion

* fix sync branch issue

* changes per review

* changes per review

* fix error message
2022-01-10 11:00:36 +05:30
Rishabh Rathod
28d05e29fc
Updated Template (#10146)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2022-01-07 10:12:14 +00:00
Abhijeet
92a5cbf7f2
chore: Don't take client cancellation for git flows into account to keep the repo and DB in sane state even when client cancels subscription (#10036)
* Added Mono sink calls for git and import application APIs

* TC for import-export

* Update TCs for gitService

* Added git commit and create branch test

* Test added for midway cancellation flow
2022-01-06 20:04:35 +05:30
Anagh Hegde
ed490304d9
feat: Git import - generate and save SSH Keys (#9129)
* Added API to generate deploy keys and store them in a collection for import flow

* Add tests for the key generation flow

* Move the key generation to helper class

* changes per review

* changes per review
2022-01-06 15:16:33 +05:30
Nayan
758d6d6725
fix: Fixed error due to string to instant serialization (#10074)
Fixes the serialization exception when exported application has deleted JSObject.

Fixes #9807
2022-01-06 11:13:25 +06:00
Anagh Hegde
48af7ea0df
fix: Merge and pull branch analytics NPE (#10117)
* Fix merge and pull branch issue

* fix detach remote API

* changes per review

* changes per review
2022-01-04 13:25:58 +05:30
Anagh Hegde
4718f519a3
fix: sync branch issues (#9918)
* Error handling for git limit

* clear cahe of git limit on connect api

* update per review

* check the repo is public before checking for the limit

* changes per review

* check if the repo is public or private during connect flow

* fix issues with sync branches

* Add sucess error handler

* changes per review

* add missing return statement

* remove unused import statements
2022-01-03 11:42:58 +05:30
Nayan
50fd155d2f
fix: Unable to add comment to public apps (#10103)
Commenting on a public app fails if the user is not not part of the corresponding organization. This PR fixes that issue.
2022-01-03 11:59:35 +06:00
Nayan
abd4de1cd9
fix: Application is not publishable when imported without theme (#10009)
When we import an application from a JSON file where themes are not present, publishing the application fails. This PR fixes this issue.
2021-12-30 12:32:54 +06:00
Abhijeet
9cba2986f3
fix: Fix npe while importing application when JSObject contains only variables and no action (#10044) 2021-12-29 15:48:04 +00:00
Abhijeet
d24703cdea
feat: Introduce version field for git JSON files structure (#9800)
* Introduce version field for applicationJson

* Update TC to check the version
2021-12-29 15:29:53 +05:30
Anagh Hegde
f921305e95
feat: Add analytics for BE git events (#9899)
* Add analytics for connect flow

* Add analytics for commit flow

* Add analytics events for git flows

* changes per review

* add reference to constructor

* Add error events to git analytics

* changes per review

* resolve conflicts
2021-12-29 07:23:03 +00:00
Abhijeet
3bf43dc73a
fix: Filter the action and collection with no pageIds to fix server error while importing the application (#10024)
* Filter the action and collection with no pageIds to fix npe

* Added TC
2021-12-29 04:59:47 +00:00
Abhijeet
4c5241bc93
fix: JS objects not getting copied over when app is duplicated while retaining the JS objects in original app (#10011)
* Create new action collection instead of updating the original collection 

* Update TC
2021-12-28 12:00:41 +00:00
Abhijeet
b72ac43bd7
fix: Update defaultResourceIds with resource ids after the disconnect event (#9990)
* Update defaultResourceIds with resource ids after the disconnect event

* Update TC to check the applicationPage updates correctly

* Added TC
2021-12-28 10:57:50 +05:30
Nidhi
3426d70b28
chore: Fixed dot replacement policy for mongo (#9961) 2021-12-25 21:29:05 +05:30
Abhijeet
904b05abaa
chore: Update git error codes to log only useful errors in sentry (#9994) 2021-12-25 09:55:01 +00:00
Nayan
e3f8040265
fix: Set auth db name in MongoDB properties (#9997) 2021-12-24 20:45:18 +05:30
Anagh Hegde
74f0d7400f
add tests and fix tests failures (#9981) 2021-12-24 14:54:47 +00:00
Nayan
cd3a2ac1c4
Set a default color to application when application has no color set from FE (#9919) 2021-12-24 15:51:42 +06:00
balajisoundar
1fad719dbe
Add API for application themes (#9449) 2021-12-24 12:14:59 +05:30
Nidhi
9af1f4c9f4
fix: Switched reference from package name to plugin name (#9916) 2021-12-23 14:16:30 +00:00
Nidhi
b2855ccf77
fix: Do not return JS actions when fetching page actions (#9960) 2021-12-23 14:16:16 +00:00
Sumit Kumar
4a075628d7
fix: add work around to handle bad data in Firestore UQI migration (#9966)
* add another migration for those Firestore actions that could not be migrated.
* handle ClassCastException via try catch and assigning default empty value.
2021-12-23 15:59:53 +05:30
Abhijeet
0e0b4d0d1e
Check for layoutOnLoadAction during clone application (#9947) 2021-12-22 21:40:19 +05:30
Anagh Hegde
4f4d0fd7df
fix: Clear the cache - git limit number of repos (#9874)
* Error handling for git limit

* clear cahe of git limit on connect api

* update per review

* check the repo is public before checking for the limit

* changes per review

* check if the repo is public or private during connect flow
2021-12-21 14:17:26 +00:00
Nikhil Nandagopal
0b0b978245
chore: Updated Template for CRUD DB template (#9913) 2021-12-21 19:34:37 +05:30
Shrikant Sharat Kandula
2dec964e21
Add migration for new MongoDB mock endpoint (#9909)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-21 18:04:12 +05:30
Abhijeet
20649ccb0a
fix: Fixes issues related to git profile and use appsmith user profile as a fallback value (#9891)
* Fixes related to git profile

* Added a TC for connect application with empty git profile and null default git profile
2021-12-21 16:45:56 +05:30
Sumit Kumar
b8cfc18f7f
fix: fix firestore pagination cyclic dependency error (#9892)
* fix firestore pagination cyclic dependency error
fix firestore UQI migration error

* fix TC
2021-12-21 11:27:05 +05:30
Abhijeet
95869517f6
fix: Replace default IDs for forked application with destination resource IDs (#9886) 2021-12-21 11:19:00 +05:30
Nayan
a447c6ee5d
Hide updated date when application was not updated manually (#9493)
We should last updated date of an application in the home page. If an application was updated internally e.g. a new user was added to the application, the updated date was set and it was displayed in the home page. This PR fixes that problem.
2021-12-20 22:54:02 +00:00
Anagh Hegde
8a75928c2f
fix: Fix the wrong CS url for private repo limit check (#9865) 2021-12-20 15:16:57 +05:30
arunvjn
99a12be018
feat: add option to delete org (#9287)
Co-authored-by: Nayan <nayan@appsmith.com>
2021-12-20 05:58:01 +00:00
Anagh Hegde
1b30c58617
feat: Limit private git repos which can be connected within organization (#9803)
* Added check for private repos

* WIP limit repos

* Get the git connected apps from git

* Call CS to get the limit for the git connected apps

* Update comment

* Changes per review

* Add check for limiting the repo

* Cache the results from cloud service

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2021-12-18 17:40:46 +00:00
Abhijeet
5e6e6caedb
fix: Use Appsmith user profile as a fallback git profile (#9821)
* Added appsmith profile as a fallback value

* Modified TC for userData to include git profile TCs

* Added check for null value when user want to use repo level profile and provide empty author name or email

* Refactor method names
2021-12-18 21:36:25 +05:30
Nayan
68a9584fd9
fix: removed sentry reposrting when application not found (#9839) 2021-12-17 20:16:49 +05:30
Nidhi
ab4add4b83
fix: Install plugin to existing organizations after approval (#9840) 2021-12-17 12:35:19 +05:30
Shrikant Sharat Kandula
8a336d3caa Fix OOM in insertDefaultResources migration
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-16 22:39:48 +05:30
Shrikant Sharat Kandula
1247864893
Fix migration OOM in firestore action migration (#9830)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-16 21:03:35 +05:30
balajisoundar
3c1edbeb3a
feat: Admin settings page to tinker with env variables (#9687) 2021-12-16 19:47:16 +05:30
Nidhi
508865f1dc
fix: Added handling for refactor of default list elements (#9774) 2021-12-16 11:33:40 +00:00
Abhijeet
52782c6088
fix: Resolve issues related to disconnect git repo flow (#9760)
* Fixed issues related to git disconnect

* Update TC
2021-12-16 08:50:11 +00:00
Abhijeet
c51c0036af
fix: Fix action collection not being deleted when the deleted collection in edit mode is published (#9785) 2021-12-16 13:48:14 +05:30
Sumit Kumar
7909ae8680
feat: port Firestore plugin to UQI (#9393)
* Port Firestore plugin to UQI schema
* This PR implements a non-functional requirement i.e. from an end user perspective there is no change in the features that the plugin provides. However, the underlying DSL to render and interpret the query interface has been updated.
* It also involves a migration change to port existing Firestore plugin actions to the new UQI schema.
2021-12-16 13:31:09 +05:30
Nidhi
8d53c16e25
fix: Added check for self references in layout (#9756) 2021-12-16 13:30:19 +05:30
Trisha Anand
11603e0d24
chore: Backend code split (#9610)
* Server comes up

* Instead of extracting ee, we extract the ce to get the mongo repo to work

* ActionRepo migrated

* ApiTemplateRepo migrated

* Application repo migrated

* Asset Repo migrated

* Collection repo migrated

* Comment repo migrated

* Comment thread repo migrated

* Config repo migrated

* datasource repo migrated

* group repo migrated

* Invite user repo migrated

* layout repo migrated

* New action repo migratd

* .

* Migrated rest of the repos.

* Migrated the repo impl as well between ce and common

* acl package partially migrated

* Authentication migration done!

* Controllers migrated

* AppsmithPermission enum migrated to class and split

* Unnecessary change removed

* Appsmith role enum converted to class

* Revert

* Reverting enum to class conversion after failing at implementing

* All services migrated

* server.solutions package completed

* Fixed solutions failing test cases

* Code compiling! Woohoo!
2021-12-15 22:59:46 +05:30
Nayan
f0a2cbd73f
chore: Added DB migration to flush redis (#9772) 2021-12-15 13:54:27 +05:30
Anagh Hegde
e216dad15b
feat: Refactor APIs to include branch name in the request header (#9679)
* refactor api's to include branchName for git

* Check for updating Ids for move action

* Added check for global profile

* Fix bad merge

Co-authored-by: Abhijeet <abhijeet@appsmith.com>
2021-12-14 15:09:30 +00:00
Nidhi
b0900d1c22
fix: Added collection id and clientsideexecution to layout on page load DTO (#9683) 2021-12-14 16:34:45 +05:30
Nayan
28c181b59c
feat: [Feature] Upgrade spring boot version to 2.5.5 (#8932)
Upgrades spring boot version to 2.5.5
2021-12-14 16:22:37 +06:00
Nayan
c126786e98
fix: application is added to recent list if duplicated (#9549)
When user duplicates an application, the source application is also being marked as recently accessed application. As a result both the duplicated application and the source application are shown in the beginning of the list of applications.
2021-12-14 16:21:50 +06:00
Nidhi
861ee2c46e
fix: Added handling for action collections during duplicate app flow (#9637) 2021-12-14 13:40:25 +05:30
Abhijeet
e6c323a2ec
fix: Update crud template for failing S3 list file action (#9691)
* Updated Template

* Update TC

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-12-12 18:23:59 +05:30
Abhijeet
f12b97b9d8
fix: When the SQL table provided by user have less number of columns than template columns for generate CRUD page (#8810) 2021-12-10 09:11:57 +05:30
Trisha Anand
3a21d91a57
fix: PageLoad - action.data implicitly depends on action.actionConfiguration. Added this relationship to dag (#9178)
* fix: PageLoad - action.data implicitly depends on action.actionConfiguration. Added this relationship to dag

* Random walkthrough comments

* Logic does not work!

* Ignore pagination configuration from dynamic binding path list to avoid creating cyclic dependency

* The most complicated test case ever passed! Woohoo!

* Code cleanup

* Incorporated review comments
2021-12-09 20:04:55 +05:30
Nayan
15ca54e43f
Custom domain should be configured from admin UI (#9633) 2021-12-09 14:40:08 +05:30
Arpit Mohan
7dfd8ac6f5
chore: Making smtp default install true for new all organizations (#9654) 2021-12-08 16:33:31 +05:30
Shrikant Sharat Kandula
4b7b9b698b
Migration to update mockdb endpoint (#9562)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-08 11:35:16 +05:30
Nayan
092b78bbc4
Send test mail by config (#9478)
Sending the test email was using existing email configuration, this commit fixes this to use the configuration provided by the user on the admin settings UI.
2021-12-08 09:56:49 +05:30
haojin111
d701f8dfb1
fix: misc git sync fixes / ui polish (#9229)
Co-authored-by: Rishabh Saxena <rishabh@appsmith.com>
Co-authored-by: Rishabh-Rathod <rishabh.rathod@appsmith.com>
2021-12-07 07:59:32 +00:00
Arpit Mohan
b5e27aaa57
feat: Adding a SMTP plugin (#8927) 2021-12-07 09:15:15 +05:30
Shrikant Sharat Kandula
77caf4c536
chore: Send telemetry option in user profile to client (#9535)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>

Co-authored-by: sbalaji1192 <balaji@appsmith.com>
2021-12-03 01:56:16 +05:30
Shrikant Sharat Kandula
cd624982b8
Handle telemetry disabled (#9517)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-12-02 16:58:26 +05:30
Nidhi
2653c7828f
feat: authentication for SaaS (#9352)
* initial commit

* fix: Added migration gor google sheets plugin name
2021-12-02 14:46:51 +05:30
Nidhi
5434d25735
fix: Added client side execution logic and on page load logic for js (#9392)
* fix: Added client side execution logic and on page load logic for js

* Revert dev env

* Revert dev env

* Updated tests expectation partly to break PR

* fix: Reverted test breakage for this PR
2021-12-01 22:02:43 +05:30
Nayan
06656eca5d
feat: [Feature] Show recently accessed apps first (#9017)
Most recently apps will be displayed under each organization in user homepage. Earlier, the applications were sorted based on application names.
2021-11-30 15:43:30 +06:00
Trisha Anand
4512c86d87
feat: Trigger framework with default implementation for entity selector for UQI (#9142)
* Untested trigger framework added

* Entity selector is working!

* Moved to query params instead of request body for the trigger api (since the trigger api is of type GET)

* Adding minor comments

* Added test case for trigger functionality
2021-11-25 12:35:43 +05:30
Nidhi
9283e258e1
fix: Add null check for unpublished collections in view mode (#9254) 2021-11-19 15:46:59 +05:30
Nikhil Nandagopal
dc510161d9 Updated Template 2021-11-19 14:02:11 +05:30
Nayan
a0ea8c21ba
fix: [Fix] Set user email to lowercase before creating the user and in reset password (#9179) 2021-11-19 09:49:33 +05:30
Nayan
c696b369eb
fix: add migration for application going public event it has isPublic false set (#9166) 2021-11-15 16:11:14 +00:00
Shrikant Sharat Kandula
255b6bf940
Fix sending email when from address is empty string (#9126) 2021-11-12 16:25:04 +05:30
Anagh Hegde
a7b1902afd
feat: handle error messages for merge action (#9030)
* Handle merge conflicts

* Fix test failures

* Move branch name from request params to body for merge operation

* Use request body for branchNames
2021-11-12 10:04:29 +00:00
Nidhi
8474806aad
chore: Enabling JS editor for all users (#9074) 2021-11-12 12:11:00 +05:30
Nayan
b44f555a7f
fix: application edit date is updated when an user is added or removed from org (#8984)
Last edit time of an application was updated when a new user is added or existing user is removed from the corresponding organization.
2021-11-11 17:30:57 +06:00
Nidhi
c14b0ac1bf
fix: Update crud template for S3 to support content type (#9095)
* Updated Template

* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-11-10 19:26:49 +05:30
Nayan
ef4f5d9c47
fix: app is publicly accessible event if it's not public (#9035)
When a public app is edited by someone, isPublic=false is set to it even the app is not public. This PR fixes that issue.
2021-11-10 13:44:28 +00:00
Nidhi
9eec2a4173
fix: Updated Template for S3 to support content type changes (#9072)
* Updated Template

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-11-10 17:50:55 +05:30
Nidhi
54cc5b8ff4
fix: Add support for content type in create file for S3 plugin (#9021) 2021-11-10 07:44:36 +05:30
Anagh Hegde
2ad6a382ea
feat: checkout remote branch (#8827)
* Add API to checkout remote branch

* Create a new application on fetch

* Create a new application on checking out remote branch

* Add tests

* Change per review comments

* Changes per review comments
2021-11-09 14:04:00 +00:00
Trisha Anand
4380d38a84
chore: Removes incorrect trigger paths from list widget via database migrations (#8989)
* Migrations for updating dynamic trigger paths for list widget in the existing pages to remove incorrect trigger paths.

* Removed an unnecessary line

* Review comment

* If widgetType is null, then this would ensure that NPE is not thrown.
2021-11-09 16:02:47 +05:30
Sumit Kumar
3c8583210f
feat: remove region requirement from s3 plugin (#8829)
* Remove Region field from S3 datasource editor page for AWS S3, Upcloud, Digital Ocean Spaces, Dream Objects, Wasabi.
  * Use SDK provided property for AWS S3 to delegate region selection to the SDK.
  * Extract region info from endpoint URL for Upcloud, Digital Ocean Spaces, Dream Objects and Wasabi, since the SDK property does not work for these service providers.
* Removed some redundant checks from datasourceCreate that were already part of validateDatasource
* Fix show clause in list.json
2021-11-03 16:23:53 +05:30
Trisha Anand
9d97f2322f
Adding field evaluation version in application (#8993) 2021-11-03 15:38:48 +05:30
Nidhi
81f0bff6f3
fix: Make organization plugins unique (#8987) 2021-11-03 09:56:52 +00:00
Nayan
3e3f97f1ee
feat: [Feature] Add isConfigurable property in profile response for the super admins (#8616)
Added a new property to the response of `/me` API. This property will indicate whether super user can edit the configuration or not.
2021-11-03 11:19:05 +06:00
Nayan
4722ff153d
feat: [Feature] Add API to send test email (#8856)
Added an API for super users to send test email
2021-11-03 11:17:53 +06:00
Shrikant Sharat Kandula
d5ec98f7cb
Fix allowed domains breaking OAuth (#8953)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-11-02 10:57:41 +05:30
Shrikant Sharat Kandula
507ce6581b
Fixed migration causing OOM (#8952)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-11-01 18:09:37 +05:30
Nayan
8e568d6056
feat: [Feature] Add slug for applications and pages (#8860)
Generates and stores a slug from application name and page names when they are created or updated. Also adds a migration to set slug to existing applications and pages.
2021-11-01 14:18:21 +06:00
Nayan
5637b4dfa4
fix: [Bugfix] Delete comments when unpublished page is deleted (#8698)
When a page is deleted, the comment threads in that page should also be deleted and should not appear to user.
The Edit mode comments should not be visible to app viewers.
2021-11-01 14:17:42 +06:00
Nayan
2181f47632
fix: Update admin settings API for changes in UI (#8818)
Set a default name as Appsmith to new instances. Also adds super user's email to admin email configuration.
2021-11-01 14:16:56 +06:00
Rishabh Rathod
19be98bd46
Updated Template (#8920)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-10-29 15:36:31 +05:30
Anagh Hegde
b951d8db21
Get default branch from DB instead of remote to save time (#8844) 2021-10-29 09:32:02 +00:00
Anagh Hegde
ebb9665d42
fix: check for repoName while deleting apps (#8866)
* check for repoName while deleting apps

* Added tests
2021-10-29 07:21:31 +00:00
Nidhi
6b0ef6e236
fix: Added JS collection body to view mode (#8899) 2021-10-29 07:02:28 +00:00
Arpit Mohan
86ad475e30 Revert "chore: Updated Template (#8813)"
This reverts commit f72d6b5777.
2021-10-29 11:21:32 +05:30
Rishabh Rathod
f72d6b5777
chore: Updated Template (#8813)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2021-10-29 10:16:56 +05:30
Shrikant Sharat Kandula
10bff6d80e
Update identify data with role and goal (#8809) 2021-10-28 16:38:30 +05:30
balajisoundar
1b596be6f5
chore: Fix misc admin settings issues (#8838) 2021-10-28 10:17:02 +05:30
Anagh Hegde
338e8ba8d0
fix: git push relevent error messages (#8769)
* WIP

* Add relevant error messages for push action

* fix tests

* changes per review comments

* Add error message for the file system related error

* Fix test failures

* Fix test failures
2021-10-27 14:15:46 +00:00
Nidhi
295f8b9631
fix: Forking with JS collections (#8799) 2021-10-26 11:04:04 +05:30
Shrikant Sharat Kandula
c82bb751e1
Fix deleting datasources with deleted actions (#8627) 2021-10-26 06:20:59 +05:30
Trisha Anand
b57e0c245d
fix: Get buckets in S3 plugin during generate CRUD page (#8781)
* Fix: Generate page fix for S3 plugin

* Fixed the replacement of template variables in form data failure for S3
2021-10-25 22:38:22 +05:30
Shrikant Sharat Kandula
47511640e5
Don't hash identify data points on cloud (#8790) 2021-10-25 18:57:24 +05:30
Rafael Baldasso Audibert
0e22f26621
fix: Change "Allow Horizontal Scroll" text to "Allow scroll" (#8085)
* chore: Change "Allow Horizontal Scroll" to "Allow Scroll"

* chore: Hide option to choose scroll for pie chart

* fix: Fix prettier errors

* feat: Add migration to allowScroll for `CHART_WIDGET`s

Closes #4227

* fix: Fix chart widget prop recursively

Per https://github.com/appsmithorg/appsmith/pull/8085#discussion_r733442011
Closes #4227
2021-10-25 17:09:39 +05:30
Trisha Anand
0300fa9486
feat: Migrating S3 plugin to UQI framework (#8575) 2021-10-25 11:19:22 +05:30
Nayan
5fc00a6cd0
fix: check with url path when redirecting to default application url (#8207)
When deciding whether to redirect to default application or the redirect url provided during signup, it'll compare with url path now. Earlier it was considering any query params added to the redirect url.
2021-10-25 11:43:02 +06:00
Trisha Anand
4a11a10ee0
fix: on page load actions take into account widget dependencies as well to compute correct order of action computaion on page load (#7829) 2021-10-25 08:03:08 +05:30
Shrikant Sharat Kandula
9f770ae871
Include role in first_login event (#8654) 2021-10-23 07:55:30 +05:30
Nidhi
03a92776f7
fix: Refactor with escape sequences (#8713)
* fix: Refactor with escape sequences

* Remove comments
2021-10-22 16:09:53 +00:00
Anagh Hegde
4717b4bcf0
feat: git merge status (#8692)
* git merge status
2021-10-22 12:31:13 +00:00
Nikhil Nandagopal
122d897617
Updated S3 CRUD Template (#8722) 2021-10-22 11:33:27 +00:00
Nayan
98ca448f9f
feat: [Feature] Add API to download docker config (#8587)
Added API to download docker config for super admin users
2021-10-20 15:58:31 +06:00
Anagh Hegde
6faaa33936
feat: Git version control functionality with connect to remote, commit, push flows (#8403)
* core workflows of git - branch, clone, commit, pull, merge, status, log

* Rehydrate file system before merge operation

* Add logic to handle merge conflict for merge and pull flow

* Add defaultBranch to listBranch API

* Add Unit tests for git commands

* Upgrade JGit dependencies to fix the security issue

* Git command tests

* Revert unwanted changes and update delete application flow

* Disable git feature until the FE changes are merged

Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
2021-10-20 09:47:34 +00:00
Sumit Kumar
c9172f8079
fix: data migration to set default value for permanent url toggle where none exists (#8507)
* Recently a change was introduced to modify the default value of s3 plugin's permanent URL toggle from NO to YES. This created an issue with the older actions where the toggle didn't exist and hence no value was saved against its property. Hence, since the default is now ON and the older actions don't have any value saved, the action editor shows the toggle value as ON but behaves like the value is OFF. To fix this issue, this method adds URL toggle as NO where no toggle value exists.
2021-10-15 11:24:04 +05:30
Yyee
870dadd777
fix: Refresh current user in edit profile (#8267) 2021-10-15 11:07:27 +05:30
Nidhi
1cefa7e51b
fix: Expose actions with collections in view mode (#8509)
* fix: Expose actions with collections in view mode

* Dummy commit for tests to pass

* Test fixes
2021-10-14 06:53:46 +00:00
Sumit Kumar
d7411be855
fix: show hint message on using duplicate header or query parameters in API (#8263)
* show hint message on using duplicate headers or query parameters in API.
2021-10-13 18:02:16 +05:30
Nayan
c288df157b
Show profile picture from the uploaded photo id of the user (#8402)
Sends photoId in user profile response. Shows profile picture from the uploaded photo id instead of email address.
2021-10-11 18:28:08 +06:00
Shrikant Sharat Kandula
09c2875e4f
Server restart API, and restart detection API (#7480) 2021-10-11 16:29:39 +05:30
Nayan
72dd22d490
fix: added a check to address NPE in home page when user has no organization (#8259) 2021-10-08 19:27:16 +06:00
Shrikant Sharat Kandula
a4975c5bff
Add API for updating role and goal for users (#8242) 2021-10-08 09:40:19 +05:30
Shrikant Sharat Kandula
a13f674752
Make port customizable from env variable (#8288) 2021-10-07 17:02:49 +05:30
Nidhi
82dc82633f
fix: Make JS objects visible to anon users (#8260)
* Make JS objects visible to anon users

* Dummy commit
2021-10-07 00:30:16 +05:30
Nidhi
4498810cef
fix: Added graceful check for failure in mock data endpoint (#8211)
* fix: Added graceful check for failure in mock data endpoint

* Modified error type
2021-10-06 09:18:21 +05:30
Abhijeet
24c1fbee7d
test: Update TC to include Smart Substitution and prepared statement check for generate page (#7922)
* Added prepared statement and smart substitution checks, in TC for generate page

* Updated Template

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-10-05 14:10:56 +05:30
Shrikant Sharat Kandula
08a775d63d
chore: Fix role and goal in event data (#8180)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-10-05 01:24:54 +05:30
Shrikant Sharat Kandula
89cc2555ab
Fix role and goal saving before using (#8177) 2021-10-04 23:09:56 +05:30
Shrikant Sharat Kandula
edeec80d00
Fix role and goal usage and docker.env location (#8174) 2021-10-04 21:23:11 +05:30
albinAppsmith
31cdfe0fe5
feat: Appsmith design system changes (#8125)
Introducing a much improved design system with new components in the Appsmith Design System.
2021-10-04 21:04:37 +05:30
Abhijeet
bacf29848b
test: Update testcases to check forking app is possible for user even with VIEW permission (#8079) 2021-10-04 13:24:17 +05:30
Abhijeet
82fac6405e
fix: Exclude the deleted page in applicationPages for export application flow (#7967)
* Added check for applicationPages to include only if not deleted
2021-10-03 10:51:33 +00:00
Shrikant Sharat Kandula
cb4d059e5f
Effect the telemetry choice in welcome page (#7902)
Solves for two things:

1. From the welcome page signup, depending on telemetry being enabled or disabled, we report.
2. When telemetry is changed from welcome page (which, it obviously will), we make the change persistent by writing to the env file.
2021-10-02 11:45:17 +05:30
Nayan
a8ab1e4cb6
fix: update user names in notifications when users update their name (#8043)
Fix: update user names in notifications when users update their name
2021-10-02 00:42:50 +06:00
Nayan
12acbf4a55
feat: added API to get unread comment thread count in an application (#7975) 2021-10-02 00:42:11 +06:00
Abhijeet
49182e7060
chore: Update success asset urls for generate page (#7579)
* Update asset urls

* fix: use successImageUrl for CRUD success popup

* Increase delay to switch between GIF and image

* Use ASSETS_CDN_URL instead of S3_BUCKET_URL

Co-authored-by: Rishabh-Rathod <rishabh.rathod@appsmith.com>
2021-10-01 15:09:41 +00:00
Nidhi
60f53546d2
Refactor now uses FQN when available (#7964) 2021-10-01 15:09:27 +00:00
Nidhi
70c282da5a
fix: Refactor collection API (#7962)
* Refactor collection API

* Refactor collaction API
2021-10-01 15:08:56 +00:00
Nidhi
e4c1c2a9ca
Converting headers safely into jsonnode (#8021) 2021-09-30 16:08:40 +00:00
Nidhi
713ed76676
Fixed check for missing action collections (#8006) 2021-09-30 19:04:33 +05:30
Abhijeet
35442e2d42
fix: Update application permission for forking functionality, to enable templates forking (#8007) 2021-09-30 12:47:16 +00:00
Shrikant Sharat Kandula
4c1ed4a67e
Fix migration to not load full actions into memory (#8005) 2021-09-30 17:42:36 +05:30
Nidhi
a6a6c7e702
fix: Delete action collections on deleting page (#7957) 2021-09-30 05:59:40 +00:00
Nayan
81d78ca9e8
fix: Signposting when user signs up with oauth is not working (#7918)
Creates a default application when users signs up from oauth
2021-09-29 20:07:28 +06:00
Nayan
c3724d5df2
feat: Skip bot-comment when onboarding is skipped (#7816)
Backend changes to skip the bot comment and onboarding
2021-09-29 15:50:57 +06:00
Nidhi
883b0215a6
Changes for JS actions in the import/export feature (#7892) 2021-09-28 18:13:26 +05:30
Abhijeet
0729ab3211
fix: Display result in tabular format for action response in imported app for SQL datasource (#7889)
* Added pluginId to nested datasource object within actionDTO

* Added check in TC for plugin id
2021-09-28 16:03:56 +05:30
Nikhil Nandagopal
5c3e4ba715
fix: Update crud template (#7891)
* Delete CRUD-DB-Table-Template-Application.json

* Updated Template

* Update TC to replace selectedRow with triggeredRow as per the updated template

Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
2021-09-28 15:28:33 +05:30
Shrikant Sharat Kandula
f6d2e89ae3
fix: Actions not being deleted when app is deleted (#7880) 2021-09-28 13:28:50 +05:30
Sumit Kumar
a7dcfae491
- remove feature flag for snippet. (#7824) 2021-09-27 08:12:04 +05:30
Trisha Anand
eb0f88244a
Adding where key in generate CRUD application with google sheets for SelectQuery (#7812) 2021-09-24 12:37:42 +00:00
Nidhi
85f5382a31
fix: Modified unique index for plugin collection (#7804) 2021-09-24 11:17:46 +00:00
Nidhi
59ec853498
Fixed installation for multiple plugins into organizations (#7767) 2021-09-24 05:44:14 +00:00
Shrikant Sharat Kandula
d5262d14b3
Remove Spring startup banner (#7761) 2021-09-24 08:20:35 +05:30
Anagh Hegde
101b21b901
fix: Widget suggestion for firestore datasource (#7375)
* Add tests for ArrayList data type response

* Refactor WidgetSuggestion logic

* use getters and setters
2021-09-23 09:52:11 +00:00
Shrikant Sharat Kandula
0ded7a4c71
Announce that we are up! (#7735) 2021-09-23 09:54:05 +05:30
Nidhi
8b7f1a7f01
fix: Use populated actionDTO for json path keys in JS during refactor (#7650)
* Use populated actionDTO for json path keys in JS

* Review comment
2021-09-22 21:23:56 +05:30
Trisha Anand
2121050177
Adding migrations for dynamic binding path list for mongo actions post uqi migrations (#7718) 2021-09-22 14:13:25 +05:30
Abhijeet
391674fc75
fix: Update crud template to fix mongo queries after the page generation (#7657) 2021-09-21 21:55:25 +05:30
Nidhi
c3f4cdaa15
feat: Introducing SaaS integrations as a plugin (#7560)
* WIP client side changes

* Saas execution flow + scheduled import of remote plugins
2021-09-21 17:35:29 +05:30
Nayan
1296faef8e
feat: [Feature] Use photo asset id instead of email address for profile picture in comments (#7434)
* -set user photo id when adding a new comment thread

* -update user data when users remove their profile photo

* -updated photo id in comments when user changes or set a profile photo

* -remove photoid from thread, kept it in comment only

* -resized uploaded profile image

* -added test for delete profile photo

* -add test for the comment set user photo

* -check user change event handler is called in delete user photo

* -add test for checking user photo change event is triggered after upload photo

* -fixed tests due to changes

* -make profile pictures thumbnail only

* - used get photo by asset id API to show user photo in comment card
- set cache control header in get asset by id API

* - stop using email address to show user photo
2021-09-20 15:03:39 +06:00
Trisha Anand
98fd6205ff
Fixing NPE error (#7588) 2021-09-18 12:34:57 +05:30
Trisha Anand
936f014b3e
feat: Add UQI infrastructure to Mongo Plugin (#7238) 2021-09-17 12:22:22 +00:00
Nayan
624a8d1e9c
fix: on page load actions are disabled after fork app (#7490)
* fix: on page load actions are disabled after fork app
* -fix: change permission check during fetch application in fork app
2021-09-17 17:42:06 +06:00
Nayan
28adc4e928
feat: set modified by during create, clone, fork, import app (#7452) 2021-09-17 17:10:08 +06:00
Trisha Anand
60f85bd88b
fix: Add migrations for all google sheet actions to turn off smart substitution for existing actions (#7517) 2021-09-16 12:08:34 +00:00
Arpit Mohan
37e7a61792
chore: Minor changes for fixing some strings on the home page & action settings page (#7469) 2021-09-15 12:20:25 +00:00
Shrikant Sharat Kandula
851abd5a06
fix: Add missing variables in env file in config (#7100)
The env config API currently only changes values that are already defined in the env file. It is not capable of adding anything to the file.

This commit adds the capability to do so. However, since we don't want to let the client add just any variable, we've switched from a black list to a white list of env variables that can be managed by this API. If the requested variable is present in the whitelist, we add it, if its missing in the env file.
2021-09-15 17:03:47 +05:30
Shrikant Sharat Kandula
c509a640b7
feat: Add an API to get env values for superusers (#7043)
This commit adds the following API:

`/api/v1/admin/env` — Responds with the names and values of all environment variables currently configured, that are allowed for configuration from the UI. Some variables will be missing from this, ones that are not allowed to be edited from the configuration UI.

Doesn't take any query params. Only usable by the superuser.

Also added a `isSuperUser` boolean field to the response of `api/v1/users/me`, that will indicate whether the current user is a superuser or not.
2021-09-15 13:56:41 +05:30
Nikhil Nandagopal
01f01cd565
fix: Updated Template (#7447)
* Updated Template

* Updated Template

* Modified TC accoording to updated template

Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
2021-09-15 12:36:56 +05:30
Sumit Kumar
4d847336d0
fix: update on-page-load actions on action delete. (#7439)
* Currently, the list of actions to be run on page load is not updated when an action object gets deleted. Hence, sometimes, a previously deleted action may be set to run on page load which throws an error when the application tries to run it on page load.
* This PR updates the list of actions to be run on page load whenever any action gets deleted.
2021-09-14 14:46:24 +00:00
Nayan
d9a57b7b49
fix: set thread mode to comment mode in the create when creating a comment (#7303) 2021-09-13 22:18:34 +06:00
Nikhil Nandagopal
b949b7030f Updated Template 2021-09-10 23:42:49 +05:30
Nidhi
7ac1017b80
fix: Js editor view mode collections accessible to anonymous users (#7321)
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2021-09-09 23:26:02 +05:30
Trisha Anand
a272a0ec7a
feat: Add consumption of UQI UI templates (#7082)
* Same templates for mongo fetch

* WIP

* Working version

* Minor refactoring and addition of comments for understanding the code flow

* Minor fileName change

* Extra check added to only try to read options for command
2021-09-09 16:39:42 +00:00
Shrikant Sharat Kandula
9b98621010
Restore a few missing fields on appsmith.user object (#7295)
With latest update, the following fields are unavailable on the `appsmith.user` object:

- `accountNonExpired`
- `accountNonLocked`
- `credentialsNonExpired`
- `isAnonymous`
- `isEnabled`

These fields are necessary for building applications and many apps were relying on these, despite them not being listed in the documentation at <https://docs.appsmith.com/framework-reference/appsmith#user>.
2021-09-09 15:34:02 +05:30
Apeksha Bhosale
09eea59330
feat: JS Editor (#6003)
* Changes to add js plugin

* routes+reducer+create template

* added debugger to js editor page

* entity explorer changes

* create js function

* added copy, move and delete action

* added js plugin

* added existing js functions to data tree

* removed actionconfig for js collection

* new js function added to data tree and entity as well

* parsing flow added

* changes to data tree

* parse and update js functions

* small changes for def creator for js action

* create delete modified

* small changes for update

* update flow change

* entity properties added

* removed linting errors

* small changes in entity explorer

* changes for update

* move, copy implementation

* conflict resolved

* changes for dependecy map creation

* Only make the variables the binding paths

* Basic eval sync working

* Minor fixes

* removed unwanted code

* entity props and autocomplete

* saving in progress show

* redirection fix after delete js action

* removed unnecessary line

* Fixing merge conflict

* added sample body

* removed dummy data and added plugin Type

* few PR comments fixed

* automplete fix

* few more PR comments fix

* PR commnets fix

* move and copy api change

* js colleciton name refactor & 'move to page' changes & search

* view changes

* autocomplete added for js collections

* removing till async is implemented

* small changes

* separate js pane response view

* Executing functions

* js collection to js objects

* entity explorer issue and resolve action on page switch

* removed unused line

* small color fix

* js file icon added

* added js action to property pane

* Property pane changes for actions

* property pane changes for js functions

* showing syntax error for now

* actions sorted in response tab

* added js objects to slash and recent entitties

* enabling this to be used inside of function

* eval fix

* feature flag changes for entity explorer and property pane

* debugger changes

* copy bug fix

* small changes for eval

* debugger bug fix

* chnaged any to specific types

* error in console fix

* icons update

* fixed test case

* test case fix

* non empty check for functions

* evaluate test case fix

* added new icons

* text change

* updated time for debounce for trial

* after release mereg

* changed icon

* after merge

* PR comments simple

* fixed PR comments - redux form, settings remove

* js object interface changes

* name refactor

* export default change

* delete resolve actions chnage

* after merge

* adding execute fn as 3rd option and removed create new js function

* issue 7054 fixed - app crash

* execute function on response tab changes

* refactor function name part 1

* refactor of js function name

* try catch added refactor

* test fix

* not used line removed

* test cases locator fixed

Co-authored-by: Nidhi <nidhi.nair93@gmail.com>
Co-authored-by: hetunandu <hetu@appsmith.com>
2021-09-08 23:02:22 +05:30
Nayan
6247b6a3a5
feat: Generate and store ssh key to git meta data of application (#7184)
- Added new API that generates a new ssh key pair and stores that inside the git meta data of an application. The key is generated in open ssh format. The private key is stored as encrypted in DB.
2021-09-08 20:54:20 +06:00
Nidhi
a7239cfa5b
feat: Changes to add js plugin (#4861)
Adds server side changes for supporting JS editor
2021-09-08 19:17:30 +05:30
Nayan
61eaaf1aab
fix: stop creating private thread if someone tagged a user in their first comment (#7205) 2021-09-08 10:50:11 +06:00
Nayan
a17be566a9
feat: Removed unnecessary fields from exported application (#7198)
Removed unnecessary fields from exported application
2021-09-07 18:33:45 +06:00
Nikhil Nandagopal
1d2bcb277b Updated Template 2021-09-06 23:30:19 +05:30
Nikhil Nandagopal
e7b95d2fd9
fix: Updated Template (#7169)
* Updated Template

* Updated Template

* Updated Template
2021-09-06 22:28:48 +05:30
Anagh Hegde
31180a4b28
feat: API to save git config data (#6930)
* API to save git config data

* Store the git config data as global/default property in user data object

* Add API to fetch the config for the user
2021-09-06 19:50:12 +05:30
Abhijeet
168000be92
[skip_changelog] Feature/directory structure for version control (#6757)
* Insert git application metadata to application object, for git sync/version control feature there is a need to save the application in the structured format

* Added changelog to index application collection with git branch and remoteurl

* Rehydrate and dehydrate applications among different instances

* Added serailisation purpose while exporting the application to make distinction between version control and regular import-export flow 

* Git file operations moved to appsmith-git module

* Delete json reference from directory for deleted resource in DB

* Added git authentication in application metadata

* Replace String with Path to handle file path in git file structure
2021-09-06 18:18:18 +05:30
Rishabh Saxena
685aa3b98c
feat: make comments publicly available (#7143) 2021-09-06 18:04:40 +05:30
Nayan
c4a7c1fb01
feat: add last edit information to application (#6948)
Adds the last edit time and editor username to the application when there is a change in the application.
2021-09-06 16:17:02 +06:00
Rishabh Saxena
a2b38c86eb
feat: init bottom bar skeleton, add feature flag for git (#7105) 2021-09-06 14:59:35 +05:30
Shrikant Sharat Kandula
0a08f9b807
fix: Rename user company to user's useCase (#7093)
We're not going to be collecting the company name for the self-hosted installation, but instead we'll be collecting the use-case that is being solved with Appsmith.
2021-09-06 12:28:47 +05:30
Trisha Anand
7526129a3a
feat: Adding APPSMITH_PLUGIN_MAX_RESPONSE_SIZE which can be configured as an environment variable to increase plugin response size (currently only supported for Postgres Plugin) (#7126)
* Adding `APPSMITH_PLUGIN_MAX_RESPONSE_SIZE` which can be configured as an environment variable to increase plugin response size (currently only supported for Postgres Plugin)

* Updated error message + added the environment variable to the template docker env files for new installations
2021-09-05 15:38:36 +00:00
Nayan
b5529310d1
feat: Removed check on template organization ID when creating the default organization and application after signup (#7084) 2021-09-03 15:32:53 +06:00
Anagh Hegde
d4ee07ab58
Remove list widget from suggested widget on action execution (#7038) 2021-09-03 11:52:27 +05:30
Nayan
b98f646642
feat: Redirect after signup (#6962)
* WIP

* -redirect to newly created application after signup

* feat: create default application if no redirect url exists. also add a param to indicate first time user experience

* -updated function comment as per PR review

* -updated the create application using existing function

* -added check whether application is null when creating application page url

* -removed unnecessary refactoring

* -removed unused parameter from method
2021-09-02 12:25:39 +06:00
Abhijeet
3414195b69
[skip_changelog] Update error message for sign-in source capitalization issue for OAuth (#7004) 2021-08-31 16:13:21 +05:30
Abhijeet
85323b2de3
[skip_changelog] Show table schema alongwith table name for the generated CRUD page (#6992) 2021-08-31 13:59:02 +05:30
Abhijeet
ea8116863e
revert: "Add version check from import-export flow (#6552)" (#6935) 2021-08-27 18:46:13 +05:30
Abhijeet
e57755e426
Revert "[skip_changelog] Update error message for import flow (#6779)" (#6927)
This reverts commit bc55021994.
2021-08-27 17:04:31 +05:30
Anagh Hegde
078ad25613
feat: Create interface for git service and add all the required classes (#6903)
* Create interface for git service and add all the requireq classes

* Fix name of the service class

* Fix name of the service class as per review
2021-08-27 14:17:35 +05:30
Rishabh Rathod
dc86c9b82b
feat: Show Crud Info Modal data from backend (#6882)
CRUD Info modal which pops up on successful CRUD generation, will now have dynamic data for each CRUD template.

Modal success `message` and `Image` to explain the working of the CRUD template is fetched from the backend.

Co-authored-by: Abhijeet <ABHI.NAGARNAIK@GMAIL.COM>
2021-08-26 12:53:39 +05:30
Shrikant Sharat Kandula
e0273ecc03
Add form data support for superuser signup API (#6844)
The superuser signup api available at /users/super currently only supports JSON payload. This PR adds support for form-data payload at the same endpoint, and makes it consistent with the normal user's signup API endpoint.
2021-08-26 06:35:32 +05:30
Anagh Hegde
58fad5f3fb
feat: Add maven module for the git operations (#6825)
* Add appsmith-git maven module for all the git related operations
2021-08-25 21:30:29 +05:30
Nayan
b1885358cb
feat: add feature flag for multiplayer feature (#6878) 2021-08-25 13:03:35 +00:00
Sumit Kumar
163192d851
Feature flags snippet and linting features. (#6828)
* Introduce feature flags for snippets feature and linting feature.
2021-08-24 18:50:50 +05:30
Abhijeet
bc55021994
[skip_changelog] Update error message for import flow (#6779)
* Modified the error message for import version check, to make it more humane and actionable

* Update TC
2021-08-23 13:54:43 +05:30
Nayan
843666f1fc
[Feature] - Add lastDeployedAt date to application object (#6753)
* -add lastDeployedAt date to application object

* -skip setting published date when application is forked
2021-08-23 11:33:13 +06:00
Nayan
a5ec0add23
-allow login with case insensitive emails (#6712) 2021-08-22 18:48:53 +06:00
Shrikant Sharat Kandula
094b77832f
Accept richer inputs from welcome signup form (#6650)
* Accept richer inputs from welcome signup form

* Send subscribe event when user has approved it
2021-08-20 10:10:04 +05:30
Anagh Hegde
e08c5b83e4
Add errorType to Categorise Debugger Errors (#6413)
* Add errorType to response

* Fix Test Failures

* group the errors

* Add errorType to categorise the issue/error

* remove the helper class

* update changes as per review

* Update the logical groupings of errors

* Fix formatting issues

* Updated the error types

* Update error classification
2021-08-19 19:59:25 +05:30
Anagh Hegde
e76d8c2c15
Change the name of the mock datasource (#6498)
* Change the name of the mock datasource

* Remove the hardcoded value for Cloud services

* Handle index out of exception

* Add check if the response contains necessary credentials for mockdb

* Change as per review comments

* Fix cypress test failures

* minor changes to fix cypress test for mock data according to new changes

* updated mock data locator

* Update the mockdata source name

Co-authored-by: Pranav Kanade <pranav@appsmith.com>
2021-08-19 17:53:30 +05:30
Abhijeet
9677a4fb8f
[Skip_changelog] Enable S3 and GSheet from backend for generate CRUD page (#6706)
* Update appsmithVersion for static json file used in import application cypruss test
2021-08-19 12:04:14 +05:30
Nidhi
0cc738122a
Enable JS editor by email (#6701) 2021-08-19 09:43:32 +05:30
Abhijeet
7b98079ee8
Updated Template (#6688)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-08-18 16:59:45 +05:30
Nayan
919a420aa7
[Improvement]- Improve the password reset feature (#6545)
* -limit the rate for sending password reset requests

* -used encrypted token in password reset

* -add unit tests for the password reset issue

* -improved formatting

* -updated PR as per review comments

* -hanled IllegalStateException instead of Exception when parsing the encrypted token
2021-08-17 12:35:00 +00:00
Abhijeet
c3f7bea904
Add version check for import-export flow (#6552)
* Added version check

* Added error message for version check while importing the file

* Added TC to check version in exported file

* Added version in FE assets for cypruss test
2021-08-16 21:32:51 +05:30
Nayan
22e477da8f
- add page name in comment notification emails (#6608) 2021-08-16 18:40:31 +06:00
Nidhi
a0462a5697
Added user email to logging context (#6619) 2021-08-16 16:36:03 +05:30
Shrikant Sharat Kandula
e20d616c33
Env Manager API and super user signup API (#6473)
* Add API for env management and super user

* Add missing files

* Add API for signing up for super user

* Fix types in client code

* Add docs for env manager API

* Minor refactoring

* Remove unused updates to app startup

* Better error logging when unable to write file

Co-authored-by: Nidhi <nidhi@appsmith.com>

* Don't cache the user count (duh!)

Co-authored-by: Nidhi <nidhi@appsmith.com>
2021-08-14 07:01:54 +05:30
Shrikant Sharat Kandula
0f41886ce7
Fix NPE when Referer header is missing (#6601) 2021-08-13 22:49:09 +05:30
Abhijeet
a1398ad9b4
[skip_changelog] Check datasource validity before creating a CRUD page (#6562)
* Added check for valid datasource before generating a page

* Sanitise column names for binding in widgets

* Refactor

* Update TC
2021-08-13 11:19:06 +05:30
Nayan
c3b44aa3b3
Bugfix: Create notification when comment added, deleted and thread resolved, deleted (#6495)
* bugfix: notification not created if user is mentioned in the first comment of a thread

* -add notification event type in comment notifications
-show different message for create thread and create comment in UI

* -send notification when comment is deleted

* -send notification when comment thread is deleted
2021-08-13 10:58:42 +06:00
Abhijeet
1d0f5011ec
Update CRUD template
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-08-12 19:17:20 +05:30
Arpit Mohan
be675fbc6b
Adding the email rollout strategy to feature flag (#6541)
This PR adds the email based rollout strategy to features. We can now define a list of domain names in the init-flags.yml file and define the domains for which the feature will be active.

Also added tests to assert the functionality for this flag flipping strategy.
2021-08-12 04:57:45 +00:00
Nikhil Nandagopal
d6e5c0d19e Updated Template 2021-08-11 17:20:22 +05:30
Sumit Kumar
15061765da
Encrypt attributes (#6508)
* encrypt attributes
2021-08-11 11:43:57 +05:30
Anagh Hegde
e2284e4199
Add null check for the nested data structure (#6479)
* Add null check for the nested data structure

* Add unit test for the null nested data
2021-08-09 19:24:19 +05:30
Abhijeet
eb7dd49457
[skip_changelog] Form login disabled after user uses OAuth login method (#6425)
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2021-08-09 12:50:06 +05:30
Abhijeet
87beed34d6
[Bugfix] Empty object creation in published pages for application object fixed 2021-08-09 11:43:51 +05:30
Abhijeet
786f7f8ec9
Update CRUD template For S3 page (#6426)
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-08-06 12:50:42 +05:30
Anagh Hegde
42c2d1f708
Fix binding query for the nested data responses (#6372)
* Fix binding query for the nested data responses

* Fix formatting issues and add comments

* Updated comments

* remove code duplications
2021-08-04 15:23:33 +05:30
Nayan
0d106a5c9d
Improvement: Add limit on password length in user signup (#6312)
* -add max password validation in FE and password validation in BE for signup

* -added unit test for password length limit

* - set max password length to 48
- add password length check in reset password

* -removed password limit check from login
2021-08-04 15:33:33 +06:00
Anagh Hegde
528716cc7a
Fix authentication issue while creating mockdata (#6294)
* Re set password to avoid double encryption while creating suffix datasource

* Add test to query on mockdata source

* Check the Authentication type before setting the password
2021-08-03 21:17:58 +05:30
Abhijeet
365c6e3f39
Added null check to verify empty layout in generate CRUD page flow (#6359) 2021-08-03 19:28:36 +05:30
Abhijeet
60cbaad9bd
Add list buckets API to S3 (#6334)
* Add list buckets action method to S3

* Added TC for list bucket method
2021-08-03 18:04:47 +05:30
Abhijeet
7052e97547
Added instance Id in analytics datapoint (#6252) 2021-08-03 12:24:21 +05:30
Abhijeet
70cf1e39b8
Snowflake get structure error resolved for columns query (#6316)
* Table name reference copied from templates body to avoid misconfiguration in action body
2021-08-02 19:03:28 +05:30
Arpit Mohan
538fe8ea00 Merge branch 'release' of github.com:appsmithorg/appsmith into release 2021-08-02 14:42:58 +05:30
Arpit Mohan
c466056223 Fixing bug where the comment feature flag was disabled for all users 2021-08-02 14:42:43 +05:30
Anagh Hegde
9dbb16747e
Add analytics event for mock-data creation (#6136)
* Add analytics event for mockdata creation

* Use the correct name for the mockdatasource

* Added FE analytics for mock datasource

* Changes per review

* Remove the method call

* Fix indentation issue

Co-authored-by: Pranav Kanade <pranav@appsmith.com>
2021-08-02 08:30:56 +05:30
Nayan
183cc97b50
Fix: Mark comment threads as viewed when they are resolved (#6251)
* -log widget type in analytics service when new thread created
-set viewed=true for resolved threads

* fixed typo

* fix the test case when there is not widget type
2021-08-02 00:12:41 +06:00
Shrikant Sharat Kandula
1c70a104a6
Fix NPE when Segment key not available correctly (#6244) 2021-07-30 11:36:42 +05:30
Arpit Mohan
8dd41ab947
Adding expiry of 30 days to session cookies (#6224)
Fixes #5872

Adding an expiry of 30 days to the cookie to ensure that browsers don't delete the cookie when the browser session is closed.
2021-07-29 18:13:22 +05:30
Abhijeet
c8928d34ed
Remove autogenerate column from insert query for generate CRUD page from DB table (#6183)
* Removed autogenerated column reference from InsertQuery

* Disable page generation flow for layout with widgets

* Updated Template

* TCs modify for updated template application

* Allow column with only String datatype as a search column in SelectQuery

* Remove AtomicRef as not needed

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-07-28 13:14:04 +05:30
Abhijeet
8aebeb50dd
Add analytics event for self-hosted instances (#6198)
* Enable analytics event to get triggered for self-hosted instances

* Add conditional logic for analyticsRunner method
2021-07-28 12:15:48 +05:30
Nidhi
2cb1aa3de1
Added validation for refactor name (#6165) 2021-07-28 11:19:23 +05:30
Nayan
8b1c5f486d
[Feature] Add filter in get comment threads (#6122)
* -added filter by resolved state in get comment thread API

* -add aggregation and lookup to fetch comment threads

* -added unit test for the repository aggregation method

* -reverted the aggregation lookup

* -add unit test for get all thread

* -removed unused method

* -resolved merge conflicts

* -skip hardcoded property value in query
2021-07-26 17:14:47 +00:00
Nayan
667179d5a1
Stop creating bot comment thread when user is app viewer (#6111)
* -stop creating bot comment thread when user is app viewer

* -added comments to the method
2021-07-26 15:28:49 +06:00
Snyk bot
decd171b8f
fix: app/server/appsmith-server/pom.xml to reduce vulnerabilities (#5163)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-1009832
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-1296829
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-1290497

Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2021-07-26 08:39:13 +00:00
Arpit Mohan
a99bb17c1a
Feature flags on the server (#5926) 2021-07-26 12:31:26 +05:30
Abhijeet
102e36ce95
Bugfix for generate page from db table, Analytics event after the successful CRUD page creation (#6087)
* Analytics datapoint after the successful page generation

* S3 bucket referenced from plugin specified template
2021-07-23 20:09:02 +05:30
Nayan
2c437a41e6
[Bugfix] Mark a comment thread as unread when there is a new comment in the thread (#6100)
* -mark thread as unread and unresolved when new comments added

* -added test
2021-07-23 19:30:36 +06:00
Anagh Hegde
cef530e835
Add binding query to the suggested widget to improve the experience (#6016)
* Add binding query to the suggested widget to improve the experience

* Fix test failures

* Add comments and change as per review

* Move the query template to enum class

* Change Test cases as per review

* Remove unused methods from the test class

* Remove commented code

* Use proper attributes in binding query

* Refactor suggestWidget method to support node

* Add unit tests
2021-07-23 14:29:27 +05:30
Anagh Hegde
c82c518f60
[Bug] - Add check for duplicate name issue while creating mock data set (#6039)
* Add check for duplicate name issue while creating mock data set

* Fix Test failures
2021-07-23 13:34:03 +05:30
Abhijeet
9633d1e1c3
Add autogenerate field in datasource structure for each column (#6018)
* Added field to autogenerate values in DB column

* Added comment and refactor

* Autogenerate field update according to names instead of type for ArangoDB
2021-07-23 09:00:32 +05:30
Snyk bot
d8dcdb8323
fix: app/server/appsmith-server/pom.xml to reduce vulnerabilities (#6062)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
2021-07-22 23:23:45 +05:30
Abhijeet
a6c357ac16
Removed support for S3 and GSheets for generate CRUD page (#6076)
* Removed support for S3 and GSheets for now as FE code does not have support for these plugins yet

* Commented TCs for S3 and GSheets
2021-07-22 19:12:32 +05:30
Nikhil Nandagopal
ee1c624426 Updated Template 2021-07-22 15:24:05 +05:30
Nikhil Nandagopal
fe71345768 Updated Template 2021-07-22 15:21:54 +05:30
Nikhil Nandagopal
5cc21dbe1d Updated Template 2021-07-22 15:19:39 +05:30
Abhijeet
886ed672ca
Extend backend support for S3 and Google Sheets plugin for generating page from DB table feature (#5997)
* Comments update

* S3 plugin support added

* Support for GSheet

* GSheet and S3 support, TCs update

* TC added for MongoDB datasource

* ilike opertor for SQL fixed

* Resolve merge conflicts

* Seperate template page for postgresql and other SQL datasources as there are minor changes in action bodies

* Added ListFiles query as on page load action, Insert all the columns from user's table in SelectWidget

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-07-22 14:24:22 +05:30
Bhavin K
7259d1e908
Bug/mustache binding extra space (#5587)
Table data was not populating when extra space inside the mustache binding, This is now fixed for list and table widget

* removed return statements from computed values

* list widget responce update

* table data handled return, added migration

* removed unused function

* updatetd rowBinding string generator

* fix failing cypress test

* fix cypress tests
2021-07-22 14:13:58 +05:30
Abhijeet
597a53c4d5
[Bug] Fix for immutable map in analytics service (#6051)
* Updates are made on local Map to avoid ImmutableCollection issue in analytics service
2021-07-21 17:39:53 +05:30
Nayan
5970d06164
[Improvement] Update the positioning parameters for bot threads (#6036)
* -updated the position field for comment threads

* -use default origin header when origin header not present in comment email
2021-07-21 15:24:39 +06:00
Nayan
5261f782df
Fixed comment missing issue when user role is changed (#5898)
* -fixed comment missing issue when user role is changed

* WIP: add test for policy utils

* -added test for policy utils comment permission when users are added or removed

* -removed unused code

* -removed public access modifier for an internal function

* -add test to verify comment thread policy updated when user role changed in organization

* -add tests for add user and remove user from organization to test comment thread policies
2021-07-21 12:30:34 +06:00
Arpit Mohan
9f29dd028d
Improving error message for invalid entities (#5977)
Also removing the toast message for successful action runs. With the debugger, this is no longer required.
2021-07-20 11:07:20 +05:30
Anagh Hegde
ed7e4457fe
Bug - Fix page order sorting (#5971)
* Use the order from Application object

* Fix the bug in test cases
2021-07-20 09:09:20 +05:30
Nayan
6efe78479f
[Enhancement] Add link to unsubscribe from email notification for a comment thread (#5769)
* -added API to and template for unsubscribe  comment thread

* -changed public API url to make it sepratate from client public pages
-included the unsubscribe link to email body

* -made unsubscribe email notification API to private

* -added unsubscribe page

* -removed unused code

* Update app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/Comments/UnsubscribeEmail_spec.js

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

* Update app/client/src/pages/common/UnsubscribeEmail.tsx

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

* Update app/client/src/pages/common/UnsubscribeEmail.tsx

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

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java

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

* -updated text as per lint error

* -updated text as per lint error

* -moved unsubscribe screen texts to messages.ts

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2021-07-20 00:14:38 +06:00
Rishabh Saxena
25a6fd2240
Fixes related to the comments feature (#5904) 2021-07-19 20:58:41 +05:30
Nayan
5185a0af5c
Log analytics event when comment created (#5953)
* -log analytics event when comment created

* -mocked analytics for comment tests

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

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

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-07-19 20:45:37 +06:00
Anagh Hegde
d5d6c3fa9c
Feature/page order API refactor (#5799)
* Refactor Page order API - Instead of the order filed use the Order persistency in Array offered by Mongo

* Add migration script to remove the order filed from the Application Pages

* Change unit tests as per the new implementation

* Fix indentation issues

* Compute pages based on the view mode

* Removed order field in response and changed the page order API response to List of pages instead of the application object

* Remove the Order filed from the Response class

* Use the $push instead of $addToSet to maintain order of pages in array
2021-07-19 15:12:29 +05:30
Abhijeet
db0445c64a
Fix failing server testcases (#5948)
* Add constructor in AnalyticsService
2021-07-19 13:04:59 +05:30
Abhijeet
bf9257d543
Refactor analytics events to encrypt or remove sensitive information (#5920)
* Applied encryption for self-hosted instances username field, removed sensitive fields from request

* Request field added for Appsmith cloud instance

* Config variables moved to a central file
2021-07-18 15:18:11 +05:30
Nayan
ac654d754f
Fix datetime parsing error in notifications (#5893)
* -fix datetime parser exception in comment thread notifications

* -resolved merge conflicts
2021-07-17 16:26:30 +06:00
Abhijeet
c5a909ddc8
Google sheet APIs for getting all the spreadsheet, getting all sheets within spreadsheet and column headers (#5875)
* API to run DB query using plugin specified templates

* Included get spreadsheet metadata in get info method

* Added TCs for checking Spreadsheet info response

* Added error message for invalid datasources

* Authentication check for datasource modified to AuthenticationStatus field
2021-07-16 16:15:29 +05:30
Anagh Hegde
3a4de769ee
Call the WidgetSuggestion method before processing data types. (#5907) 2021-07-16 15:40:27 +05:30
Nayan
8fcbb6e4c1
Add a bot thread when someone adds first comment or tags someone is the comment for the first time (#5521)
* resolved conflicts

* -fixed some issues in PR

* -used sequence in generating thread number

* -refactored the create thread method

* -refactored comment service

* -add bot reply to the first comment thread of an user

* -added a new bot thread when user resolves the first bot thread

* -handle the case when user data can be absent

* -add organization id and widget type to comment and comment threads

* -resolved conflicts

* -mark appsmith bot username as a tagged user in the bot comment

* -turn a private thread to a public thread when someone is tagged in it

* -updated as per the review comments

* -fixed compile error in unit test

* -updated as per PR review comments

* -removed commented code
2021-07-15 23:45:08 +06:00
Anagh Hegde
f169c8c5a0
Add login mode to track for analytics purpose (#5870) 2021-07-15 14:36:57 +05:30
Anagh Hegde
99a06728d4
Suggest List of possible widgets and add exception handling (#5800)
* Add try catch block to handle the data conversion exception

* Suggest widget only in edit mode

* Add JsonNodeType to the widget suggestion logic

* Use ClassCastException instead of generic exception

* add tests for the array data type

* Suggest list of possible widgets instead of one

* Use constant in if condition to avoid possible NPE
Fix typo
2021-07-14 22:25:13 +05:30
Nikhil Nandagopal
ce38354b41 Updated Template 2021-07-14 17:40:45 +05:30
Nidhi
193f20ad7a
Redirecting to view mode of datasource after authorization (#5758)
* view mode true

* removed new query btn from view mode for google sheet datasource

Co-authored-by: Pranav Kanade <pranav@appsmith.com>
2021-07-09 15:13:54 +05:30
Nayan
45198c7d68
Increased maximum image size to be uploaded as profile picture (#5641)
* -increased max image size to upload as profile picture

* -removed unnecessary changes

* -show message on maximum allowed file size
2021-07-09 15:38:14 +06:00
Nikhil Nandagopal
4ffeca4a56 Updated Template 2021-07-08 17:26:49 +05:30
Rishabh Rathod
c27974b2a2
Replace pluginName with packageName in mockDB creation (#5720)
* replace pluginName with packageName in mockDB creation

* Replace pluginName with packageName

Co-authored-by: Anagh Hegde <anagh@appsmith.com>
2021-07-08 16:03:41 +05:30
Nikhil Nandagopal
6bcb7c2f62 Updated Template 2021-07-08 14:40:50 +05:30
Shrikant Sharat Kandula
37db1ef376
Fix new user event being fired on every login (#5675) 2021-07-08 13:51:00 +05:30
Nikhil Nandagopal
3ad73cd2c7 Updated Template 2021-07-08 12:01:12 +05:30
Nikhil Nandagopal
fb35594bf2 Updated Template 2021-07-08 11:59:20 +05:30
Anagh Hegde
0154017836
Refactor Get mock-data set API (#5620)
* Call cloud services to fetch mock datasets

* Call cloud services to fetch mock datasets

* Change the MockData Config,

* Remove unused import statements and fix small indentation issues

* 1. Moved the mock data creation and fetching to a separate class
2. Added plugin type to mockdata class
3. Used pluginName to identify the db type
4. Removed the block call mock data creating method
5. Added unit tests for the mockdata

* 1. Removed unused field from contract and
2. Updated the url to cloud service

* 1. renamed the field of mockdata contract
2. Updated the test cases

* using new mock datasources apis

* 1. Added the Cloud Service release end point to env variable

Co-authored-by: Pranav Kanade <pranav@appsmith.com>
2021-07-08 11:29:11 +05:30
Abhijeet
07944f214b
Provide API for MongoDB datasource to generate page from DB table feature (#5590)
* Template application updated to include separate page for MongoDB as a datasource

* Support for mongoDB as datasource added

* Added comments

Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
2021-07-08 07:18:23 +05:30
Nayan
500efb0dd7
Updated plugin logos from png to svg (#5671)
* -updated svg logo for plugins

* -added svg logo for ArangoDB plugin
-used MongockTemplate instead of MongoTemplate in the db migration
2021-07-07 20:02:59 +06:00
Aswath K
2c6e8a388e
Shows 'last saved' time on hovering over the 'saved' icon (#5092) 2021-07-07 18:17:01 +05:30
Abhijeet
de511e47f6
Bugfix OAuth2.0 datasource authentication for import export application feature (#5658) 2021-07-07 17:49:16 +05:30
Nayan
eb557035b2
Added new API to get unread comment thread count (#5429)
* -added new API to get unread comment thread count

* -changed query to get unread comments so that it only searches where user has permission

* -added unit test for unread comment thread count

* -improved formatting

* -updated as per PR review
2021-07-07 13:00:33 +06:00
Abhijeet
17006ffe0e
Minimise DB calls to throw duplicate app name error message (#5625)
* Minimise DB calls to throw duplicate error message for updating application name
2021-07-06 22:20:47 +05:30
Trisha Anand
d1ef21dce3
Reliable change application access from public to private & vice versa (#5530)
* Changing application public/private view can no longer be cancelled (for example by client timeout, etc.)

* Update test to only read the datasource used in the application

* Incorporated review comment

* Comment update
2021-07-06 21:49:35 +05:30
Sumit Kumar
d68ca405a8
Feature: integrate ArangoDB plugin (#5518)
* integrate arangoDB plugin.

Co-authored-by: Ming Fang <mingfang@mac.com>
Co-authored-by: Automated Github Action <automated@github.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
2021-07-06 18:40:19 +05:30
Anagh Hegde
027603697a
Suggest widget after executing Action (#5574)
* Add widget suggestion to query execution flow

* Change the logic for Chart widget suggestion

* Add tests for the all the suggested widgets

* Added enum class to store widget types
2021-07-06 18:15:48 +05:30
Nayan
13fec4e30e
Update email notification template when there is comment (#5392)
* WIP: updated the email template

* -updated the comment link in email as per the user role

* -rebased from release

* Update app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/EmailEventHandler.java

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

* -updated the template as per review comment

* -removed unused email template file

* -fixed compile error

* -checked application policy instead of role when sending email for comment

* -minor changes as per PR review comment

Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
2021-06-30 20:46:56 +06:00
Nikhil Nandagopal
ed40980f2d
Update CRUD-DB-Table-Template-Application.json 2021-06-30 11:24:37 +05:30
Anagh Hegde
40d147d5b5
Feature/editor simplify - API to work with mock data sets (#5421)
* Added an API to get list of mock datsets
Removed the flow of

* Removed the auto populate of mock datasets flow when the user sign up first time

* Fixed indentation issues

* Instead of sending empty datasource, change template value to empty

* Add only the configs to response instead of entire mongo doc

* Add API to create mock data set
2021-06-29 20:17:00 +05:30
Nikhil Nandagopal
1112c20f7c Updated Template 2021-06-29 17:20:53 +05:30
Nikhil Nandagopal
95b41f36d3 Updated Template 2021-06-29 16:19:46 +05:30
Nikhil Nandagopal
8c2f5f50ce Updated Template 2021-06-29 13:10:04 +05:30
Nikhil Nandagopal
82fbf1c95d Updated Template 2021-06-29 12:18:38 +05:30
Nikhil Nandagopal
4c3f63305d Updated Template 2021-06-29 12:16:11 +05:30
Trisha Anand
02e5445731
[Mongo Plugin] Raw is now a command option instead of Form vs Raw (#5446)
* Raw is now a command option instead of Form vs Raw

* Added database migration for migration raw input type to be of raw command type

* Fixed test case failure

* Minor cleanup
2021-06-29 11:13:17 +05:30
Nayan
36c399ac4f
Fix the comment missing issue when new users added to organization (#5314)
* -Add the newly added user to existing comment threads

* -update PR as per review comment

* -updated the PR as per review
2021-06-28 14:50:39 +06:00
Abhijeet
6ec6f9578c
API for generating a page with UI based on the structure of a given database table (#5269)
* Keymapping, Clone actions from template application, Used exported application JSON file as template app

* Delete references of widgets from action config if extra widgets not required

* Separate API added when pageId is not present with the client

* Added TCs

* Update in regex, enable reqArgsConstructor, separate DTO for CRUD page
2021-06-24 14:58:57 +05:30
Nayan
9a247f3e78
Fix bug where some fields are missing for notifications from the API (#5336)
* -set createdAt and type fields in notification
-add threadId in response for comment

* -fixed bug with unread notification count
2021-06-24 14:35:30 +06:00
Rishabh Saxena
29a6136380
Set mode for comments (#5372) 2021-06-24 12:51:01 +05:30
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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