fix: Reconnect failure error after fork application (#24683)

## Description
After forking an application, the reconnect modal appears. In the
reconnect modal, it's not possible to reauthorize the google sheets
plugin. This PR fixes the problem.

#### PR fixes following issue(s)
Fixes #24566
> 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
- Bug fix (non-breaking change which fixes an issue)

## Testing

#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [x] Manual
- [x] 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
- [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:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [x] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
This commit is contained in:
Nayan 2023-06-23 11:54:02 +06:00 committed by GitHub
parent 1434fb930c
commit 9e37b8b194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions

View File

@ -69,12 +69,7 @@ public class DatasourceStorageDTO implements Forkable<DatasourceStorageDTO> {
}
if (!Boolean.TRUE.equals(forkWithConfiguration)) {
DatasourceConfiguration dsConfig = new DatasourceConfiguration();
dsConfig.setAuthentication(null);
if (newDatasourceStorageDTO.getDatasourceConfiguration() != null) {
dsConfig.setConnection(newDatasourceStorageDTO.getDatasourceConfiguration().getConnection());
}
newDatasourceStorageDTO.setDatasourceConfiguration(dsConfig);
newDatasourceStorageDTO.setDatasourceConfiguration(null);
}
/*

View File

@ -1282,11 +1282,11 @@ public class ForkExamplesWorkspaceServiceTests {
final Datasource ds1 = data.datasources.stream().filter(ds -> ds.getName().equals("datasource 1")).findFirst().get();
DatasourceStorageDTO storage1 = ds1.getDatasourceStorages().get(data.defaultEnvironmentId);
assertThat(storage1.getDatasourceConfiguration().getAuthentication()).isNull();
assertThat(storage1.getDatasourceConfiguration()).isNull();
final Datasource ds2 = data.datasources.stream().filter(ds -> ds.getName().equals("datasource 2")).findFirst().get();
DatasourceStorageDTO storage2 = ds2.getDatasourceStorages().get(data.defaultEnvironmentId);
assertThat(storage2.getDatasourceConfiguration().getAuthentication()).isNull();
assertThat(storage2.getDatasourceConfiguration()).isNull();
assertThat(getUnpublishedActionName(data.actions)).containsExactlyInAnyOrder(
"action1",