Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ZE activation and commands failing when team config contains JSON error #3075

Merged
merged 3 commits into from
Aug 29, 2024

Conversation

t1m0thyj
Copy link
Member

Proposed changes

Fixes #3074

Release Notes

Milestone: 2.18.0

Changelog: Fixed JSON errors being ignored when zowe.config.json files change on disk and are reloaded

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (non-breaking change which adds or improves functionality)
  • Breaking change (a change that would cause existing functionality to not work as expected)
  • Documentation (Markdown, README updates)
  • Other (please specify above in "Proposed changes" section)

Checklist

General

  • I have read the CONTRIBUTOR GUIDANCE wiki
  • All PR dependencies have been merged and published (if applicable)
  • A GIF or screenshot is included in the PR for visual changes
  • The pre-publish command has been executed:
    • v2 and below: yarn workspace vscode-extension-for-zowe vscode:prepublish
    • v3: pnpm --filter vscode-extension-for-zowe vscode:prepublish

Code coverage

  • There is coverage for the code that I have added
  • I have added new test cases and they are passing
  • I have manually tested the changes

Deployment

  • I have added developer documentation (if applicable)
  • Documentation should be added to Zowe Docs
    • If you're an outside contributor, please post in the #zowe-doc Slack channel to coordinate documentation.
    • Otherwise, please check with the rest of the squad about any needed documentation before merging.
  • These changes may need ported to the appropriate branches (list here):

Further comments

@t1m0thyj t1m0thyj added this to the v2.18.0 milestone Aug 28, 2024
@t1m0thyj t1m0thyj added the needs-ported Apply to issues or PRs that need ported label Aug 28, 2024
Copy link

codecov bot commented Aug 28, 2024

Codecov Report

Attention: Patch coverage is 92.68293% with 3 lines in your changes missing coverage. Please review.

Project coverage is 93.32%. Comparing base (a377226) to head (843049f).
Report is 6 commits behind head on main.

Files with missing lines Patch % Lines
packages/zowe-explorer/src/Profiles.ts 91.17% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3075      +/-   ##
==========================================
- Coverage   93.36%   93.32%   -0.04%     
==========================================
  Files         105      105              
  Lines       11050    11076      +26     
  Branches     2422     2404      -18     
==========================================
+ Hits        10317    10337      +20     
- Misses        732      738       +6     
  Partials        1        1              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@JillieBeanSim JillieBeanSim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for jumping on this so quickly @t1m0thyj
I do still experience issue 1, I do get the popup after saving a config with invalid JSON but if I close that pop up and close the file then try to do filter search I only get the parsing error without option to open config.
Screenshot 2024-08-28 at 10 47 14 AM

@t1m0thyj
Copy link
Member Author

Thanks for jumping on this so quickly @t1m0thyj I do still experience issue 1, I do get the popup after saving a config with invalid JSON but if I close that pop up and close the file then try to do filter search I only get the parsing error without option to open config. Screenshot 2024-08-28 at 10 47 14 AM

Good catch @JillieBeanSim - should be fixed in 03c1774 😁

@JillieBeanSim JillieBeanSim self-requested a review August 28, 2024 17:36
JillieBeanSim
JillieBeanSim previously approved these changes Aug 28, 2024
Copy link
Contributor

@JillieBeanSim JillieBeanSim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! thanks @t1m0thyj

traeok

This comment was marked as outdated.

@traeok traeok dismissed their stale review August 28, 2024 18:47

Was a one-off error; discussed offline

Copy link

Copy link
Member

@traeok traeok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for the fix and for updating the "Show Config" logic to point out the error in the editor, I'm sure users will appreciate that 😋

Copy link
Contributor

@adam-wolfe adam-wolfe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @t1m0thyj

@traeok traeok merged commit dbf9a74 into main Aug 29, 2024
20 checks passed
@traeok traeok deleted the fix/show-config-error-2 branch August 29, 2024 15:10
@t1m0thyj t1m0thyj removed the needs-ported Apply to issues or PRs that need ported label Sep 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

ZE activation and commands fail when team config contains JSON error
4 participants