fix: fix git sync related bugs for Custom JS Lib feature by sumitsum · Pull Request #19352 · appsmithorg/appsmith

sumitsum · 2022-12-30T10:10:02Z

Description

Fix git import / export / status related bugs. Please check out this issue for more details : [Bug]: [CustomJSLib] Fix git sync related bugs on the server side #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 #17895

Issues raised during QA

fix: fix git sync related bugs for Custom JS Lib feature #19352 (comment)

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

vercel · 2022-12-30T10:10:05Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment

Name	Status	Preview	Updated
appsmith	⬜️ Ignored (Inspect)		Jan 10, 2023 at 4:53AM (UTC)

…o fix/19038_fix_git_related_issues_in_custom_js_lib_3

remove feature flag usage from server side

AnaghHegde

All the changes done to ImportExportServiceV2 needs to copied to ImportExportService. The export and import by file is still using the same service. I am afraid we don't have any other way till we finish this up. Apologies for the inconvenience.

…o fix/19038_fix_git_related_issues_in_custom_js_lib_3

sumitsum · 2023-01-04T07:41:14Z

/ok-to-test sha=18ea7b2

ramsaptami · 2023-01-09T09:10:16Z

Related test cases will be scripted by Arun post implementing front-end changes for change log
Git related scenarios have been tested and verified.
CC: @sumitsum @arunvjn

AnaghHegde · 2023-01-09T10:10:02Z

@ramsaptami I don't see the git discard scenario covered in the test plan. Can we ensure that git discard is also handled correctly?

…o fix/19038_fix_git_related_issues_in_custom_js_lib_3

…ttps://github.com/appsmithorg/appsmith into fix/19038_fix_git_related_issues_in_custom_js_lib_3

sumitsum · 2023-01-09T10:41:44Z

/ok-to-test sha=eae0aa0

github-actions · 2023-01-09T10:42:12Z

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/3872992378.
Workflow: Appsmith External Integration Test Workflow.
Commit: eae0aa0.
PR: 19352.
Perf tests will be available at https://app.appsmith.com/app/performance-infra-dashboard/pr-details-638dd7cd2913ba43778b915e?pr=19352&runId=3872992378_1

sumitsum · 2023-01-09T11:02:59Z

/ok-to-test sha=58482db

github-actions · 2023-01-09T11:03:25Z

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/3873138452.
Workflow: Appsmith External Integration Test Workflow.
Commit: 58482db.
PR: 19352.
Perf tests will be available at https://app.appsmith.com/app/performance-infra-dashboard/pr-details-638dd7cd2913ba43778b915e?pr=19352&runId=3873138452_1

ramsaptami · 2023-01-09T11:21:43Z

@AnaghHegde Yep, will add those in. Thanks for reviewing!

fix JUnit TC

sumitsum · 2023-01-10T04:58:50Z

/ok-to-test sha=4dddfdd

github-actions · 2023-01-10T04:59:17Z

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/3880345837.
Workflow: Appsmith External Integration Test Workflow.
Commit: 4dddfdd.
PR: 19352.
Perf tests will be available at https://app.appsmith.com/app/performance-infra-dashboard/pr-details-638dd7cd2913ba43778b915e?pr=19352&runId=3880345837_1

github-actions · 2023-01-10T05:58:34Z

The following are new failures, please fix them before merging the PR cypress/integration/Smoke_TestSuite/ServerSideTests/JsFunctionExecution/JSFunctionExecution_spec.ts

github-actions · 2023-01-10T07:11:12Z

The following are new failures, please fix them before merging the PR cypress/integration/Smoke_TestSuite/ServerSideTests/JsFunctionExecution/JSFunctionExecution_spec.ts

sidhantgoel

Looks good, 1 question, 1 change request

Rhitottam · 2023-01-10T13:51:05Z

/perf-test

github-actions · 2023-01-10T13:51:32Z

Tests running at: https://github.com/appsmithorg/appsmith/actions/runs/3883973779.
Workflow: Performance Tests Workflow.
Commit: ``.
PR: 19352.
Perf tests will be available at https://app.appsmith.com/app/performance-infra-dashboard/pr-details-638dd7cd2913ba43778b915e?pr=19352&runId=3883973779_1

fix git sync related bugs

c489a2f

sumitsum marked this pull request as draft December 30, 2022 10:10

sumitsum added 2 commits December 30, 2022 15:42

cleanup

361633d

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

b1cb69e

…o fix/19038_fix_git_related_issues_in_custom_js_lib_3

vercel bot deployed to Preview December 30, 2022 11:25 View deployment

sumitsum added 2 commits January 2, 2023 17:16

add JUnit TCs

caf737e

remove feature flag usage from server side

remove unused import

a01ce1a

sumitsum marked this pull request as ready for review January 2, 2023 11:52

sumitsum requested a review from AnaghHegde January 2, 2023 11:52

sumitsum changed the title ~~fix git sync related bugs~~ fix: fix git sync related bugs for Custom JS Lib feature Jan 2, 2023

github-actions bot added Bug Something isn't working and removed Bug Something isn't working labels Jan 2, 2023

add modified count

deb88de

AnaghHegde suggested changes Jan 3, 2023

View reviewed changes

Comment thread app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java

Comment thread app/server/appsmith-git/src/main/java/com/appsmith/git/helpers/FileUtilsImpl.java Outdated

sumitsum added 5 commits January 3, 2023 11:12

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

de5af4b

…o fix/19038_fix_git_related_issues_in_custom_js_lib_3

update modified count

92106b1

update comment

4c58f56

refactor code to use pre-defined helper method

0b6f549

remove unwanted change that crept in

adb5918

sumitsum requested a review from AnaghHegde January 3, 2023 07:59

AnaghHegde previously approved these changes Jan 3, 2023

View reviewed changes

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

18ea7b2

…o fix/19038_fix_git_related_issues_in_custom_js_lib_3

ramsaptami added the skip-testPlan label Jan 9, 2023

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

9e4d580

…o fix/19038_fix_git_related_issues_in_custom_js_lib_3

sumitsum dismissed AnaghHegde’s stale review via 9e4d580 January 9, 2023 10:23

sumitsum added 4 commits January 9, 2023 15:55

Merge branch 'release' of https://github.com/appsmithorg/appsmith int…

fe4da86

…o fix/19038_fix_git_related_issues_in_custom_js_lib_3

Merge branch 'fix/19038_fix_git_related_issues_in_custom_js_lib_3' of h…

0e261c8

…ttps://github.com/appsmithorg/appsmith into fix/19038_fix_git_related_issues_in_custom_js_lib_3

update merge conflict resolution

b5f785c

remove extra newline

eae0aa0

sumitsum requested a review from AnaghHegde January 9, 2023 10:41

replace then with flatMap

58482db

code refactor

4dddfdd

fix JUnit TC

sidhantgoel suggested changes Jan 10, 2023

View reviewed changes

Comment thread app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/GitStatusDTO.java

Comment thread ...r/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImplV2.java

sumitsum requested a review from sidhantgoel January 10, 2023 11:44

sidhantgoel approved these changes Jan 10, 2023

View reviewed changes

abhvsn approved these changes Jan 10, 2023

View reviewed changes

sumitsum self-assigned this Jan 10, 2023

mohanarpit merged commit d33d35f into release Jan 10, 2023

mohanarpit deleted the fix/19038_fix_git_related_issues_in_custom_js_lib_3 branch January 10, 2023 13:56

Conversation

sumitsum commented Dec 30, 2022 • edited by ramsaptami Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of change

How Has This Been Tested?

Checklist:

Dev activity

QA activity:

Uh oh!

vercel bot commented Dec 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AnaghHegde left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

sumitsum commented Jan 4, 2023

Uh oh!

ramsaptami commented Jan 9, 2023

Uh oh!

AnaghHegde commented Jan 9, 2023

Uh oh!

sumitsum commented Jan 9, 2023

Uh oh!

github-actions bot commented Jan 9, 2023

Uh oh!

sumitsum commented Jan 9, 2023

Uh oh!

github-actions bot commented Jan 9, 2023

Uh oh!

ramsaptami commented Jan 9, 2023

Uh oh!

sumitsum commented Jan 10, 2023

Uh oh!

github-actions bot commented Jan 10, 2023

Uh oh!

github-actions bot commented Jan 10, 2023

Uh oh!

github-actions bot commented Jan 10, 2023

Uh oh!

sidhantgoel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Rhitottam commented Jan 10, 2023

Uh oh!

github-actions bot commented Jan 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

sumitsum commented Dec 30, 2022 •

edited by ramsaptami

Loading

vercel bot commented Dec 30, 2022 •

edited

Loading