Merge pull request #1251 from zowe/v1.13.1

v1.13.1

.github/actions/common.js

@@ -55,7 +55,7 @@ const publishProject = (checkVersion, publishSpecificProject) => {
             console.log(execSync(`yarn package`, { cwd: packagePath }).toString());
             core.setOutput("archive", versionName);
 
-            publishSpecificProject(topPackageJson.version, core.getInput("token"), packagePath);
+            publishSpecificProject(versionName, core.getInput("token"), packagePath);
 
             let changelog = execSync(
                 "awk -v ver=" +

.github/actions/deploy-npm-package/index.js

@@ -25,11 +25,11 @@ const checkVersion = (packageJson, version) => {
 };
 
 // NPM package specific publishing steps
-const publishSpecificProject = (version, token, packagePath) => {
+const publishSpecificProject = (versionName, token, packagePath) => {
     console.log(execSync(`echo registry=https://registry.npmjs.org/ > .npmrc`, { cwd: packagePath }).toString());
     console.log(execSync(`echo //registry.npmjs.org/:_authToken=${token} >> .npmrc`, { cwd: packagePath }).toString());
 
-    console.log(`Publishing version ${version}`);
+    console.log(`Publishing: ${versionName}`);
     console.log(execSync(`npm publish --access public`, { cwd: packagePath }).toString());
 };
 

.github/actions/deploy-vscode-extension/index.js

@@ -27,9 +27,12 @@ const checkVersion = (packageJson, version) => {
 };
 
 // VSCE specific steps for publishing an extension
-const publishSpecificProject = (version, token, packagePath) => {
-    console.log(`Publishing version ${version}`);
-    console.log(execSync(`vsce publish --yarn -p ${token}`, { cwd: packagePath }).toString());
+// VSCE token contains two values: "<VSCode Marketplace token> <Open VSX token>"
+// ex: "s0m3-V3ry-L0ng-T0k3n an0th3r-L0ng-T0k3n"
+const publishSpecificProject = (versionName, token, packagePath) => {
+    console.log(`Publishing: ${versionName}`);
+    console.log(execSync(`vsce publish --yarn -p ${token.split(" ")[0]}`, { cwd: packagePath }).toString());
+    console.log(execSync(`ovsx publish ${versionName}.vsix -p ${token.split(" ")[1]}`, { cwd: "dist" }).toString());
 };
 
 // Call common function to deploy the extension

.github/workflows/deployment.yml

@@ -10,7 +10,7 @@ on:
     inputs:
       version:
         description: Version to be published
-        default: v1.13.0
+        default: v1.13.1
         required: false
       # create_release:
       #   description: Create the release even if publishing already happened
@@ -78,7 +78,7 @@ jobs:
           git config --global user.email "zowe.robot@gmail.com"
 
       - name: Install CLIs for Workflow use
-        run: npm install -g vsce yarn
+        run: npm install -g vsce yarn ovsx
 
       # Avoid adding node_modules to each .github/actions folder
       - name: Install Internal Dependencies for Actions to Work
@@ -101,7 +101,7 @@ jobs:
         with:
           name: ${{ fromJson(steps.get_ze_name.outputs.package_nls).displayName }}
           package: packages/zowe-explorer
-          token: ${{ secrets.VSCODE_PUBLISHER_TOKEN }}
+          token: ${{ secrets.VSCODE_PUBLISHER_TOKEN }} ${{ secrets.VSCODE_ZOWE_ROBOT_PUBLISH_TOKEN }}
 
       - name: Get the FTP Extension package.json
         run: "echo ::set-output name=package::$(cat packages/zowe-explorer-ftp-extension/package.json)"
@@ -113,7 +113,7 @@ jobs:
         with:
           name: ${{ fromJson(steps.get_ftp_name.outputs.package).displayName }}
           package: packages/zowe-explorer-ftp-extension
-          token: ${{ secrets.VSCODE_PUBLISHER_TOKEN }}
+          token: ${{ secrets.VSCODE_PUBLISHER_TOKEN }} ${{ secrets.VSCODE_ZOWE_ROBOT_PUBLISH_TOKEN }}
 
       - name: Get the NPM API package.json
         run: "echo ::set-output name=package::$(cat packages/zowe-explorer-api/package.json)"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zowe-explorer",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Monorepo for the Zowe Explorer project.",
   "publisher": "Zowe",
   "author": "Zowe",

packages/eslint-plugin-zowe-explorer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-zowe-explorer",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Custom ESLint Rules for ZOWE Explorer",
   "keywords": [
     "eslint",

packages/zowe-explorer-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/zowe-explorer-api",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Extensibility API for Zowe Explorer.",
   "publisher": "Zowe",
   "author": "Zowe",

packages/zowe-explorer-ftp-extension/README.md

@@ -12,6 +12,29 @@ Enhancements:
 
 For more information, see [Changelog](https://github.com/zowe/vscode-extension-for-zowe/blob/master/packages/zowe-explorer-ftp-extension/CHANGELOG.md).
 
+## Prerequisites
+
+Host-side prerequisites:
+
+- Obtain remote access to z/OS FTP service.
+
+  **Follow these steps:**
+
+  1. Connect to z/OS with the FTP client.
+  1. Run the following command in the FTP client:
+
+     ```bash
+     rstat
+     ```
+
+  1. Ensure that the `JESINTERFACELevel` option is set to `2`.
+
+Client-side prerequisites:
+
+- Install the following prerequisites on your local machine:
+  1. [Zowe CLI](https://docs.zowe.org/stable/user-guide/cli-installcli.html)
+  1. [z/OS FTP Plug-in for Zowe CLI](https://github.com/zowe/zowe-cli-ftp-plugin#install-the-zos-ftp-plug-in)
+
 ## Installation
 
 1. Install this VS Code extension from the [Microsoft](https://marketplace.visualstudio.com/items?itemName=Zowe.zowe-explorer-ftp-extension) or [Open VSX](https://open-vsx.org/extension/Zowe/zowe-explorer-ftp-extension) marketplace.

packages/zowe-explorer-ftp-extension/package.json

@@ -5,7 +5,7 @@
   "author": "Zowe",
   "license": "EPL-2.0",
   "description": "Adds zFTP support to Zowe Explorer demonstrating how to extend the Zowe Explorer using its extensibility API.",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "icon": "resources/zowe_ftp_logo.png",
   "repository": {
     "url": "https://github.com/zowe/vscode-extension-for-zowe"
@@ -45,7 +45,7 @@
     "vscode": "^1.43.0"
   },
   "dependencies": {
-    "@zowe/zowe-explorer-api": "1.13.0",
+    "@zowe/zowe-explorer-api": "1.13.1",
     "@zowe/zos-ftp-for-zowe-cli": "1.4.0",
     "tmp": "0.2.1"
   },

packages/zowe-explorer/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to the "vscode-extension-for-zowe" extension will be documented in this file.
 
+## `1.13.1`
+
+- Updated the dialog text for issuing MVS commands. Now the text of the function is `Zowe: Issue MVS Command` [#1230](https://github.com/zowe/vscode-extension-for-zowe/pull/1230). Thanks @JillieBeanSim
+- Added the prompt for credentials when issuing MVS commands, using the right click action, against profiles with missing credentials [#1231](https://github.com/zowe/vscode-extension-for-zowe/pull/1231). Thanks @JillieBeanSim
+- Added the Prerequisites section to the Zowe Explorer Extension for FTP ReadMe [#1246](https://github.com/zowe/vscode-extension-for-zowe/pull/1246). Thanks @lauren-li
+- Added Open VSX to the deployment pipeline [#1240](https://github.com/zowe/vscode-extension-for-zowe/pull/1240). Thanks @zFernand0
+
 ## `1.13.0`
 
 - Added the monorepo landing Readme that contains the high-level overview of the repository folders such as `packages` folder, instructions on how to contribute to the project and links to Medium articles providing additional useful information about Zowe Explorer and Zowe [#1199](https://github.com/zowe/vscode-extension-for-zowe/pull/1199). Thanks @IgorCATech

packages/zowe-explorer/README.md

@@ -23,29 +23,25 @@ More information:
 
 ## Contents
 
-- [What's new in Zowe Explorer 1.13.0](#whats-new-in-zowe-explorer-1.13.0)
+- [What's new in Zowe Explorer 1.13.1](#whats-new-in-zowe-explorer-1.13.1)
 - [Prerequisites](#prerequisites)
 - [Getting Started](#getting-started)
 - [Sample Use Cases](#sample-use-cases)
 - [Credentials Security](#credentials-security)
 - [Usage Tips](#usage-tips)
 - [Extending Zowe Explorer](#extending-zowe-explorer)
 
-## What's new in Zowe Explorer 1.13.0
+## What's new in Zowe Explorer 1.13.1
 
 Enhancements:
 
-- Added the monorepo landing Readme that contains the high-level overview of the repository folders such as `packages` folder, instructions on how to contribute to the project and links to Medium articles providing additional useful information about Zowe Explorer and Zowe.
-- Added the pre-filled and pre-selected filename of the copied member to the entry field while performing the paste member action.
-- Added the multiple deletion of jobs feature. You can now select and delete multiple jobs.
+- Updated the dialog text for issuing MVS commands. Now the text of the function is `Zowe: Issue MVS Command`.
+- Added the Prerequisites section to the Zowe Explorer extension for FTP ReadMe.
+- Added Open VSX to the deployment pipeline.
 
 Bug fixes:
 
-- Fixed the issue that prevented the list of recently opened files from being displayed upon request. You can access a list of recently opened files by pressing the Ctrl+Alt+R (Windows) or Command+Option+R (Mac) key combination.
-- Fixed the issue that prevented file picker from functioning. The file picker feature lets you filter your datasets in the tree by pressing the Ctrl+Alt+P (Windows) or Command+Option+P (Mac) key combination.
-- Fixed the issue that caused the content from a previously filtered USS directory instead of the currently filtered USS directory to be served.
-- Added the previously selected `RejectUnauthorized` value to the placeholder text of the entry field while updating an existing profile. In addition, the value is highlighted and shown at the top of the selection list.
-- Improved error handling for the data set copy/paste member, migrate, and recall functions.
+- Added the prompt for credentials when issuing MVS commands, using the right click action, against profiles with missing credentials.
 
 For more information, see [Changelog](https://marketplace.visualstudio.com/items/Zowe.vscode-extension-for-zowe/changelog).
 

packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts

@@ -188,7 +188,6 @@ async function createGlobalMocks() {
             "zowe.setJobSpool",
             "zowe.jobs.search",
             "zowe.jobs.editSession",
-            "zowe.issueTsoCmd",
             "zowe.issueMvsCmd",
             "zowe.jobs.addFavorite",
             "zowe.jobs.removeFavorite",

packages/zowe-explorer/i18n/sample/package.i18n.json

@@ -71,7 +71,6 @@
   "Zowe-Default-Commands-Persistent-Favorites": "Toggle if Commands persist locally",
   "Zowe-Environment": "Environment where the extension is running, default is VSCode",
   "Zowe-Automatic-Validation": "Allow automatic validation of profiles.",
-  "issueTsoCmd": "Zowe: Issue TSO Command...",
   "deleteProfile": "Delete Profile",
   "cmd.deleteProfile": "Zowe: Delete a Profile Permanently...",
   "renameDataSet": "Rename Data Set",

packages/zowe-explorer/i18n/sample/src/command/MvsCommandHandler.i18n.json

@@ -4,12 +4,12 @@
   "issueMvsCommand.undefined.profilename": "Operation Cancelled",
   "issueMvsCommand.noProfilesLoaded": "No profiles available",
   "issueMvsCommand.checkProfile": "Profile is invalid",
-  "issueMvsCommand.command.hostname": "Select a command to run immediately against ",
+  "issueMvsCommand.command.hostname": "Select an MVS command to run immediately against ",
   "issueMvsCommand.command.edit": " (An option to edit will follow)",
   "issueMvsCommand.options.noselection": "No selection made.",
-  "issueMvsCommand.command.hostnameAlt": "Select a command to run against ",
-  "issueMvsCommand.command": "Enter or update the command",
+  "issueMvsCommand.command.hostnameAlt": "Select an MVS command to run against ",
+  "issueMvsCommand.command": "Enter or update the MVS command",
   "issueMvsCommand.enter.command": "No command entered.",
   "issueMvsCommand.command.submitted": "MVS command submitted.",
-  "command.option.prompt.search": "Create a new Command"
+  "command.option.prompt.search": "Create a new MVS Command"
 }

packages/zowe-explorer/package.json

@@ -2,7 +2,7 @@
   "name": "vscode-extension-for-zowe",
   "displayName": "%displayName%",
   "description": "%description%",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "publisher": "Zowe",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -478,11 +478,13 @@
       },
       {
         "command": "zowe.runModifyCommand",
-        "title": "%runModifyCommand%"
+        "title": "%runModifyCommand%",
+        "category": "Zowe"
       },
       {
         "command": "zowe.runStopCommand",
-        "title": "%runStopCommand%"
+        "title": "%runStopCommand%",
+        "category": "Zowe"
       },
       {
         "command": "zowe.setOwner",
@@ -548,13 +550,10 @@
         "command": "zowe.setJobSpool",
         "title": "%setJobSpool%"
       },
-      {
-        "command": "zowe.issueTsoCmd",
-        "title": "%issueTsoCmd%"
-      },
       {
         "command": "zowe.issueMvsCmd",
-        "title": "%issueMvsCmd%"
+        "title": "%issueMvsCmd%",
+        "category": "Zowe"
       },
       {
         "command": "zowe.jobs.search",
@@ -1263,10 +1262,6 @@
         {
           "command": "zowe.jobs.deleteProfile",
           "when": "never"
-        },
-        {
-          "command": "zowe.issueMvsCmd",
-          "when": "never"
         }
       ]
     },
@@ -1452,7 +1447,7 @@
     "@types/promise-queue": "^2.2.0",
     "@types/selenium-webdriver": "^3.0.4",
     "@types/yargs": "^11.0.0",
-    "eslint-plugin-zowe-explorer": "1.13.0",
+    "eslint-plugin-zowe-explorer": "1.13.1",
     "@typescript-eslint/eslint-plugin": "^2.31.0",
     "@typescript-eslint/parser": "^2.31.0",
     "eslint": "^6.8.0",
@@ -1492,7 +1487,7 @@
     "webpack-cli": "^3.3.11"
   },
   "dependencies": {
-    "@zowe/zowe-explorer-api": "1.13.0",
+    "@zowe/zowe-explorer-api": "1.13.1",
     "fs-extra": "8.0.1",
     "isbinaryfile": "4.0.4",
     "js-yaml": "3.13.1",

packages/zowe-explorer/package.nls.json

@@ -71,7 +71,6 @@
   "Zowe-Default-Commands-Persistent-Favorites": "Toggle if Commands persist locally",
   "Zowe-Environment": "Environment where the extension is running, default is VSCode",
   "Zowe-Automatic-Validation": "Allow automatic validation of profiles.",
-  "issueTsoCmd": "Zowe: Issue TSO Command...",
   "deleteProfile": "Delete Profile",
   "cmd.deleteProfile": "Zowe: Delete a Profile Permanently...",
   "renameDataSet": "Rename Data Set",

packages/zowe-explorer/src/command/MvsCommandHandler.ts

@@ -50,7 +50,7 @@ export class MvsCommandHandler {
     private static readonly totalFilters: number = 10;
     private static readonly persistenceSchema: string = "Zowe Commands: History";
     private static readonly defaultDialogText: string =
-        "\uFF0B " + localize("command.option.prompt.search", "Create a new Command");
+        "\uFF0B " + localize("command.option.prompt.search", "Create a new MVS Command");
     private static instance: MvsCommandHandler;
 
     private history: PersistentFilters;
@@ -71,6 +71,13 @@ export class MvsCommandHandler {
      */
     public async issueMvsCommand(session?: Session, command?: string, node?: IZoweTreeNode) {
         let zosmfProfile: IProfileLoaded;
+        if (node && !session) {
+            await Profiles.getInstance().checkCurrentProfile(node.getProfile());
+            session = await ZoweExplorerApiRegister.getMvsApi(node.getProfile()).getSession();
+            if (!session) {
+                return;
+            }
+        }
         if (!session) {
             const profiles = Profiles.getInstance();
             const allProfiles: IProfileLoaded[] = profiles.allProfiles;
@@ -143,7 +150,7 @@ export class MvsCommandHandler {
             if (globals.ISTHEIA) {
                 const options1: vscode.QuickPickOptions = {
                     placeHolder:
-                        localize("issueMvsCommand.command.hostname", "Select a command to run against ") +
+                        localize("issueMvsCommand.command.hostname", "Select an MVS command to run against ") +
                         hostname +
                         (alwaysEdit
                             ? localize("issueMvsCommand.command.edit", " (An option to edit will follow)")
@@ -161,11 +168,13 @@ export class MvsCommandHandler {
             } else {
                 const quickpick = vscode.window.createQuickPick();
                 quickpick.placeholder = alwaysEdit
-                    ? localize("issueMvsCommand.command.hostnameAlt", "Select a command to run against ") +
+                    ? localize("issueMvsCommand.command.hostnameAlt", "Select an MVS command to run against ") +
                       hostname +
                       localize("issueMvsCommand.command.edit", " (An option to edit will follow)")
-                    : localize("issueMvsCommand.command.hostname", "Select a command to run immediately against ") +
-                      hostname;
+                    : localize(
+                          "issueMvsCommand.command.hostname",
+                          "Select an MVS command to run immediately against "
+                      ) + hostname;
 
                 quickpick.items = [createPick, ...items];
                 quickpick.ignoreFocusOut = true;
@@ -190,7 +199,7 @@ export class MvsCommandHandler {
         if (!response || alwaysEdit) {
             // manually entering a search
             const options2: vscode.InputBoxOptions = {
-                prompt: localize("issueMvsCommand.command", "Enter or update the command"),
+                prompt: localize("issueMvsCommand.command", "Enter or update the MVS command"),
                 value: response,
                 valueSelection: response ? [response.length, response.length] : undefined,
             };

packages/zowe-explorer/src/extension.ts

@@ -378,10 +378,14 @@ function initJobsProvider(context: vscode.ExtensionContext, jobsProvider: IZoweT
     vscode.commands.registerCommand("zowe.jobs.editSession", async (node) =>
         jobsProvider.editSession(node, jobsProvider)
     );
-    vscode.commands.registerCommand("zowe.issueTsoCmd", async () => MvsCommandHandler.getInstance().issueMvsCommand());
-    vscode.commands.registerCommand("zowe.issueMvsCmd", async (node, command) =>
-        MvsCommandHandler.getInstance().issueMvsCommand(node.session, command, node)
-    );
+    // vscode.commands.registerCommand("zowe.issueTsoCmd", async () => MvsCommandHandler.getInstance().issueMvsCommand());
+    vscode.commands.registerCommand("zowe.issueMvsCmd", async (node?, command?) => {
+        if (node) {
+            MvsCommandHandler.getInstance().issueMvsCommand(node.session, command, node);
+        } else {
+            MvsCommandHandler.getInstance().issueMvsCommand();
+        }
+    });
     vscode.commands.registerCommand("zowe.jobs.addFavorite", async (node) => jobsProvider.addFavorite(node));
     vscode.commands.registerCommand("zowe.jobs.removeFavorite", async (node) => jobsProvider.removeFavorite(node));
     vscode.commands.registerCommand("zowe.jobs.saveSearch", async (node) => jobsProvider.saveSearch(node));

packages/zowe-explorer/src/globals.ts

@@ -29,7 +29,7 @@ export let USS_DIR;
 export let DS_DIR;
 export let ISTHEIA: boolean = false; // set during activate
 export let LOG: Logger;
-export const COMMAND_COUNT = 93;
+export const COMMAND_COUNT = 92;
 export const CONTEXT_PREFIX = "_";
 export const FAV_SUFFIX = CONTEXT_PREFIX + "fav";
 export const FAV_PROFILE_CONTEXT = "profile_fav";