Fix Etag Mismatch auto saving

[JillieBeanSim]

Proposed changes

fix for #2277

Remove duplicate code and updated the handling of dirty file when etag mismatch error for MVS and z/OS UNIX files by marking file unsaved before pulling the latest changes to the local file then use the vscode built in command workspace.files.action.compareWithSaved.

This PR was originally based against maintenance so will also bring in the commits for 2.8.2 fix & release

Fixed the error returned by FTP ext to trigger the diff editor with mismatch etag.

Release Notes

Milestone: 2.9.0

Changelog:
ZE: Fixed an issue with mismatch etag error returned not triggering the diff editor and possible loss of data due to the issue. #2277
zFTP: - Fixed an issue with mismatch etag, correcting error message sent to Zowe Explorer to trigger diff editor. #2277

Types of changes

What types of changes does your code introduce to Zowe Explorer?
Put an x in the boxes that apply

• Bugfix (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)
• Updates to Documentation or Tests (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This checklist will be used as reference for both the contributor and the reviewer

• I have read the CONTRIBUTOR GUIDANCE wiki
• PR title follows Conventional Commits Guidelines
• PR Description is included
• gif or screenshot is included if visual changes are made
• yarn workspace vscode-extension-for-zowe vscode:prepublish has been executed
• All checks have passed (DCO, Jenkins and Code Coverage)
• I have added unit test and it is passing
• I have added integration test and it is passing
• There is coverage for the code that I have added
• I have tested it manually and there are no regressions found
• I have added necessary documentation (if appropriate)
• Any PR dependencies have been merged and published (if appropriate)

Further comments

Theia:

zFTP:

[codecov]

Codecov Report

Patch coverage: 84.84% and project coverage change: +0.14 🎉

Comparison is base (155ee55) 91.90% compared to head (c7f1d14) 92.05%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2316      +/-   ##
==========================================
+ Coverage   91.90%   92.05%   +0.14%     
==========================================
  Files          90       90              
  Lines        9242     9222      -20     
  Branches     1908     1906       -2     
==========================================
- Hits         8494     8489       -5     
+ Misses        747      732      -15     
  Partials        1        1              

Impacted Files	Coverage Δ
...xplorer-ftp-extension/src/ZoweExplorerFtpMvsApi.ts	83.48% <0.00%> (-0.38%)	⬇️
...xplorer-ftp-extension/src/ZoweExplorerFtpUssApi.ts	87.41% <0.00%> (+0.57%)	⬆️
packages/zowe-explorer/src/shared/context.ts	94.68% <50.00%> (-0.98%)	⬇️
packages/zowe-explorer/src/dataset/actions.ts	94.25% <100.00%> (+0.58%)	⬆️
packages/zowe-explorer/src/shared/utils.ts	95.42% <100.00%> (+0.55%)	⬆️
packages/zowe-explorer/src/uss/actions.ts	93.50% <100.00%> (+2.66%)	⬆️
packages/zowe-explorer/src/utils/SettingsConfig.ts	100.00% <100.00%> (+0.97%)	⬆️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

[traeok]

LGTM, thanks @JillieBeanSim 🙂 just had a question regarding implementation for putContents

[traeok]

I noticed that the MVS API returns an unsuccessful result without throwing an error, but the USS API throws an error. I see that we are catching errors when calling this function, but should we maintain the same behavior/return value for when save conflicts appear in putContents across all FTP APIs?

[JillieBeanSim]

Hey @traeok the FTP extension is just following the same protocol used with zosmf, I did notice USS and MVS are handled differently but that is how zowe cli was returning these and Zowe Explorer was built around that

[rudyflores]

Tested this and it seems to be handling the conflicts and displaying the diff view on VS Code to handle saving mismatches, thanks @JillieBeanSim !

[zFernand0]

I'm consistently getting the error that this PR fixes:

• feat(trees): make IDs more specific for root element #2325

will re-review after that one

Changes LGTM though.

there will be a very small conflict with this other PR:

• Enhance throw error in zowe ftp extension #2321

[sonarcloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

[zFernand0]

LGTM! 😋
now we get the compare button for both FTP and ZE 🥳