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(v3): Port jobs context menu changes from 2689 #2743

Merged
merged 4 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/zowe-explorer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
### Bug fixes

- Fixed default behavior of "Create a new Team Configuration File" to create a Project Config instead of Project User Config. [#2684](https://github.com/zowe/vscode-extension-for-zowe/issues/2684)
- Adjusted order of 'Manage Profile' and 'Edit History' in the jobs tree's context menu to match the other trees. [#2670](https://github.com/zowe/vscode-extension-for-zowe/issues/2670)

## `3.0.0-next.202402142205`

Expand All @@ -23,7 +24,6 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
### Bug fixes

- Updated dependencies for technical currency purposes.
- Adjusted order of 'Manage Profile' and 'Edit History' in the jobs tree's context menu to match the other trees. [#2670](https://github.com/zowe/vscode-extension-for-zowe/issues/2670)
- Fixed issue where spools with duplicate DD names would overwrite each other causing less spools in job output view [#2315](https://github.com/zowe/vscode-extension-for-zowe/issues/2315)

## `3.0.0-next.202402071248`
Expand Down
30 changes: 10 additions & 20 deletions packages/zowe-explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@
},
{
"command": "zowe.jobs.filterJobs",
"title": "Filter Jobs",
"title": "%jobs.filterBy%",
"category": "Zowe Explorer",
"icon": "$(list-filter)"
},
Expand Down Expand Up @@ -1331,11 +1331,6 @@
"command": "zowe.jobs.addFavorite",
"group": "002_zowe_jobsWorkspace@0"
},
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^(?!.*_fav.*)server.*/ && !listMultiSelection",
"command": "zowe.jobs.filterJobs",
"group": "002_zowe_jobsProfileModification@99"
},
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^job.*_fav.*/",
"command": "zowe.jobs.removeFavorite",
Expand Down Expand Up @@ -1379,37 +1374,32 @@
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^(?!.*_fav.*)job.*/",
"command": "zowe.jobs.deleteJob",
"group": "099_zowe_jobsModification"
"group": "097_zowe_jobsModification"
},
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^job.*/",
"command": "zowe.jobs.cancelJob",
"group": "099_zowe_jobsModification"
"group": "097_zowe_jobsModification"
},
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^(?!.*_fav.*)server.*/ && !listMultiSelection",
"command": "zowe.jobs.sortBy",
"group": "099_zowe_jobsSort"
"command": "zowe.jobs.filterJobs",
"group": "098_zowe_jobsSort@0"
},
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^(?!.*_fav.*)server.*/ && !listMultiSelection",
"command": "zowe.editHistory",
"group": "100_zowe_editHistory@100"
"command": "zowe.jobs.sortBy",
"group": "098_zowe_jobsSort@1"
},
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^(?!.*_fav.*)server.*/ && !listMultiSelection",
"command": "zowe.profileManagement",
"group": "100_zowe_jobsProfileAuthentication@99"
},
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^(?!.*_fav.*)server.*/ && !listMultiSelection",
"command": "zowe.jobs.editSession",
"group": "099_zowe_jobsProfileModification@0"
"group": "099_zowe_jobsProfileAuthentication"
},
{
"when": "view == zowe.jobs.explorer && viewItem =~ /^(?!.*_fav.*)server.*/ && !listMultiSelection",
"command": "zowe.jobs.deleteProfile",
"group": "099_zowe_jobsProfileModification@99"
"command": "zowe.editHistory",
"group": "100_zowe_editHistory"
},
{
"when": "viewItem =~ /^(textFile|member.*|ds.*)/ && !listMultiSelection",
Expand Down
1 change: 1 addition & 0 deletions packages/zowe-explorer/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
"copyFile": "Copy",
"pasteFile": "Paste",
"jobs.sortBy": "Sort jobs...",
"jobs.filterBy": "Filter jobs...",
"ds.allPdsSort": "all PDS members in {0}",
"ds.singlePdsSort": "the PDS members in {0}",
"ds.selectFilterOpt": "Set a filter for {0}",
Expand Down
Loading