diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index 7d14f6c256..2105c0c082 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -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` @@ -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` diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json index 2ed544e403..fc09da9108 100644 --- a/packages/zowe-explorer/package.json +++ b/packages/zowe-explorer/package.json @@ -764,7 +764,7 @@ }, { "command": "zowe.jobs.filterJobs", - "title": "Filter Jobs", + "title": "%jobs.filterBy%", "category": "Zowe Explorer", "icon": "$(list-filter)" }, @@ -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", @@ -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", diff --git a/packages/zowe-explorer/package.nls.json b/packages/zowe-explorer/package.nls.json index 6a134177fa..a24276b142 100644 --- a/packages/zowe-explorer/package.nls.json +++ b/packages/zowe-explorer/package.nls.json @@ -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}",