feat: Introduce integrated terminal

packages/zowe-explorer-api/__tests__/__unit__/profiles/ZoweExplorerZosmfApi.unit.test.ts

@@ -675,12 +675,6 @@ describe("ZosmfCommandApi", () => {
             args: ["command", { account: "ACCT#" }],
             transform: (args) => [args[1].account, ...args],
         },
-        {
-            name: "issueTsoCmdWithParms",
-            spy: jest.spyOn(zostso.IssueTso, "issueTsoCmd"),
-            args: ["command"],
-            transform: (args) => [...args, { addressSpaceOptions: undefined }],
-        },
         {
             name: "issueMvsCommand",
             spy: jest.spyOn(zosconsole.IssueCommand, "issue"),

packages/zowe-explorer-api/src/extend/MainframeInteraction.ts

@@ -505,19 +505,8 @@ export namespace MainframeInteraction {
          * @param {zostso.IStartTsoParms} parms
          * @returns {Promise<zostso.IIssueResponse>}
          * @memberof ICommand
-         * @deprecated Please use `issueTsoCmdWithParms`
          */
-        issueTsoCommandWithParms?(command: string, parms?: zostso.IStartTsoParms): Promise<zostso.IIssueResponse>;
-
-        /**
-         * Issues a TSO Command without the need for account information
-         *
-         * @param {string} command
-         * @param {zostso.IStartTsoParms} parms
-         * @returns {Promise<zostso.IIssueResponse>}
-         * @memberof ICommand
-         */
-        issueTsoCmdWithParms?(command: string, parms?: zostso.IStartTsoParms): Promise<zostso.IIssueResponse>;
+        issueTsoCommandWithParms?(command: string, parms?: zostso.IStartTsoParms, useNewTsoApis?: boolean): Promise<zostso.IIssueResponse>;
 
         /**
          * Issues a MVS Command and returns a Console Command API response.

packages/zowe-explorer-api/src/profiles/ZoweExplorerZosmfApi.ts

@@ -452,15 +452,15 @@
      * An implementation of the Zowe Explorer Command API interface for zOSMF.
      */
     export class CommandApi extends CommonApi implements MainframeInteraction.ICommand {
-        public issueTsoCommandWithParms(command: string, parms: zostso.IStartTsoParms): Promise<zostso.IIssueResponse> {
+        public issueTsoCommandWithParms(command: string, parms: zostso.IStartTsoParms, useNewTsoApis?: boolean): Promise<zostso.IIssueResponse> {
+            if (useNewTsoApis) {
+                return zostso.IssueTso.issueTsoCmd(this.getSession(), command, { addressSpaceOptions: parms });
+            }
+
             // eslint-disable-next-line deprecation/deprecation
             return zostso.IssueTso.issueTsoCommand(this.getSession(), parms.account, command, parms);
         }
 
-        public issueTsoCmdWithParms(command: string, parms: zostso.IStartTsoParms): Promise<zostso.IIssueResponse> {
-            return zostso.IssueTso.issueTsoCmd(this.getSession(), command, { addressSpaceOptions: parms });
-        }
-
         public issueMvsCommand(command: string, consoleName?: string): Promise<zosconsole.IConsoleResponse> {
             return zosconsole.IssueCommand.issue(this.getSession(), { command, consoleName, processResponses: true });
         }
@@ -478,11 +478,11 @@
                     true
                 );
             } else {
                 await zosuss.Shell.executeSsh(
                     sshSession,
                     command,
                     (data: string) => {
                         stdout += data;
                     },
                     true
                 );

packages/zowe-explorer-api/src/tree/ZoweTreeNode.ts

@@ -12,6 +12,7 @@
 import * as vscode from "vscode";
 import * as imperative from "@zowe/imperative";
 import { IZoweTreeNode } from "./IZoweTreeNode";
+import type { BaseProvider } from "../fs/BaseProvider";
 
 /**
  * Common implementation of functions and methods associated with the
@@ -98,8 +99,9 @@ export class ZoweTreeNode extends vscode.TreeItem {
      * Sets the imperative.IProfileLoaded profile for this node to the one chosen in parameters.
      *
      * @param {imperative.IProfileLoaded} aProfile The profile you will set the node to use
+     * @param {BaseProfider} _fsProvider An unused FS Provider
      */
-    public setProfileToChoice(aProfile: imperative.IProfileLoaded): void {
+    public setProfileToChoice(aProfile: imperative.IProfileLoaded, _fsProvider?: BaseProvider): void {
         // Don't reassign profile if its already defined, as we want to keep the reference valid for other nodes and filesystems
         this.profile = Object.assign(this.profile ?? {}, aProfile);
     }

packages/zowe-explorer/__tests__/__unit__/commands/UnixCommandHandler.unit.test.ts

@@ -190,7 +190,7 @@ describe("UnixCommand Actions Unit Testing", () => {
                 checkCurrentProfile: jest.fn(() => {
                     return profilesForValidation;
                 }),
-                profileValidationHelper: jest.fn().mockReturnValue("active"), //.mockImplementation((prof, fun) => fun(prof)),
+                profileValidationHelper: jest.fn().mockReturnValue("active"),
                 validateProfiles: jest.fn(),
                 getBaseProfile: jest.fn(),
                 validProfile: Validation.ValidationType.VALID,

packages/zowe-explorer/__tests__/__unit__/commands/ZoweCommandProvider.unit.test.ts

@@ -17,7 +17,6 @@ import { Profiles } from "../../../src/configuration/Profiles";
 import { ZoweDatasetNode } from "../../../src/trees/dataset/ZoweDatasetNode";
 import { SharedContext } from "../../../src/trees/shared/SharedContext";
 import { createIJobFile } from "../../__mocks__/mockCreators/jobs";
-import { AuthUtils } from "../../../src/utils/AuthUtils";
 import { ZoweLogger } from "../../../src/tools/ZoweLogger";
 import { SettingsConfig } from "../../../src/configuration/SettingsConfig";
 import { Constants } from "../../../src/configuration/Constants";

packages/zowe-explorer/l10n/bundle.l10n.json

@@ -161,7 +161,6 @@
   "Certificate Key for Authentication.": "Certificate Key for Authentication.",
   "Certificate Keys": "Certificate Keys",
   "Select Certificate Key": "Select Certificate Key",
-  "Update Credentials": "Update Credentials",
   "Required parameter 'host' must not be blank.": "Required parameter 'host' must not be blank.",
   "Your connection is no longer active for profile '{0}'. Please log in to an authentication service to restore the connection./Profile name": {
     "message": "Your connection is no longer active for profile '{0}'. Please log in to an authentication service to restore the connection.",
@@ -684,7 +683,6 @@
   "Save as User setting": "Save as User setting",
   "Save as Workspace setting": "Save as Workspace setting",
   "Failed to list datasets": "Failed to list datasets",
-  "Failed to list dataset members": "Failed to list dataset members",
   "Failed to read {0}/File path": {
     "message": "Failed to read {0}",
     "comment": [
@@ -920,6 +918,7 @@
   },
   "Add Credentials": "Add Credentials",
   "Add username and password for basic authentication": "Add username and password for basic authentication",
+  "Update Credentials": "Update Credentials",
   "Update stored username and password": "Update stored username and password",
   "Disable Profile Validation": "Disable Profile Validation",
   "Disable validation of server check for profile": "Disable validation of server check for profile",

packages/zowe-explorer/l10n/poeditor.json

@@ -324,7 +324,7 @@
     "Toggle if Unix Commands persist locally": ""
   },
   "zowe.commands.alwaysEdit": {
-    "Allow editing of commands before submitting": ""
+    "Allow commands to eb edited before submitting": ""
   },
   "zowe.commands.useIntegratedTerminals": {
     "Allow commands to be executed using integrated terminals": ""
@@ -535,7 +535,6 @@
   "Certificate Key for Authentication.": "",
   "Certificate Keys": "",
   "Select Certificate Key": "",
-  "Update Credentials": "",
   "Required parameter 'host' must not be blank.": "",
   "Your connection is no longer active for profile '{0}'. Please log in to an authentication service to restore the connection.": "",
   "Use the search button to list USS files": "",
@@ -744,7 +743,6 @@
   "Save as User setting": "",
   "Save as Workspace setting": "",
   "Failed to list datasets": "",
-  "Failed to list dataset members": "",
   "Failed to read {0}": "",
   "Saving data set...": "",
   "Failed to save {0}": "",
@@ -831,6 +829,7 @@
   "Insufficient write permissions for {0} in local storage.": "",
   "Add Credentials": "",
   "Add username and password for basic authentication": "",
+  "Update Credentials": "",
   "Update stored username and password": "",
   "Disable Profile Validation": "",
   "Disable validation of server check for profile": "",

packages/zowe-explorer/package.nls.json

@@ -107,7 +107,7 @@
   "zowe.commands.mvs.history": "Toggle if MVS Commands persist locally",
   "zowe.commands.tso.history": "Toggle if TSO Commands persist locally",
   "zowe.commands.uss.history": "Toggle if Unix Commands persist locally",
-  "zowe.commands.alwaysEdit": "Allow editing of commands before submitting",
+  "zowe.commands.alwaysEdit": "Allow commands to eb edited before submitting",
   "zowe.commands.useIntegratedTerminals": "Allow commands to be executed using integrated terminals",
   "zowe.automaticProfileValidation": "Allow automatic validation of profiles.",
   "zowe.pollInterval.info": "Default interval (in milliseconds) when polling spool files.",

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

@@ -40,14 +40,13 @@
         return this.instance;
     }
 
-    public readonly controller: AbortController = new AbortController();
     public readonly dialogs: ICommandProviderDialogs = {
         commandSubmitted: vscode.l10n.t("MVS command submitted."),
         defaultText: `$(plus) ${vscode.l10n.t("Create a new MVS command")}`,
         selectProfile: vscode.l10n.t("Select the profile to use to submit the MVS command"),
         searchCommand: vscode.l10n.t("Enter or update the MVS command"),
         writeCommand: (options) =>
             vscode.l10n.t({
                 message: "Select an MVS command to run against {0} (An option to edit will follow)",
                 args: options,
                 comment: ["Host name"],
@@ -104,9 +103,9 @@
                     }
                     await this.issueCommand(profile, command ?? "");
                 }
             } else {
                 Gui.errorMessage(vscode.l10n.t("Profile is invalid"));
                 return;
             }
         } catch (error) {
             if (error.toString().includes("non-existing")) {

packages/zowe-explorer/src/commands/TsoCommandHandler.ts

@@ -44,14 +44,13 @@
     public history: ZowePersistentFilters;
     private static instance: TsoCommandHandler;
 
-    public readonly controller: AbortController = new AbortController();
     public readonly dialogs: ICommandProviderDialogs = {
         commandSubmitted: vscode.l10n.t("TSO command submitted."),
         defaultText: `$(plus) ${vscode.l10n.t("Create a new TSO command")}`,
         selectProfile: vscode.l10n.t("Select the profile to use to submit the TSO command"),
         searchCommand: vscode.l10n.t("Enter or update the TSO command"),
         writeCommand: (options) =>
             vscode.l10n.t({
                 message: "Select a TSO command to run against {0} (An option to edit will follow)",
                 args: options,
                 comment: ["Host name"],
@@ -113,9 +112,9 @@
                     }
                     await this.issueCommand(profile, command ?? "");
                 }
             } else {
                 Gui.errorMessage(vscode.l10n.t("Profile is invalid"));
                 return;
             }
         } catch (error) {
             if (error.toString().includes("non-existing")) {
@@ -155,7 +154,7 @@
      */
     private async getTsoParams(): Promise<zostso.IStartTsoParms> {
         ZoweLogger.trace("TsoCommandHandler.getTsoParams called.");
         const profileInfo = await this.profileInstance.getProfileInfo();
         let tsoParms: zostso.IStartTsoParms = {};
 
         // Keys in the IStartTsoParms interface
@@ -164,7 +163,7 @@
         const profiles = profileInfo.getAllProfiles("tso");
         let tsoProfile: imperative.IProfileLoaded;
         if (profiles.length > 0) {
             tsoProfile = await this.selectServiceProfile(profiles.map((p) => imperative.ProfileInfo.profAttrsToProfLoaded(p)));
             if (tsoProfile != null) {
                 const prof = profileInfo.mergeArgsForProfile(tsoProfile.profile as imperative.IProfAttrs);
                 iStartTso.forEach((p) => (tsoProfile.profile[p] = prof.knownArgs.find((a) => a.argName === p)?.argValue));
@@ -189,7 +188,7 @@
             };
             tsoParms.account = await Gui.showInputBox(InputBoxOptions);
             if (!tsoParms.account) {
                 ZoweLogger.info(this.operationCancelled);
                 return;
             }
         }

packages/zowe-explorer/src/commands/UnixCommandHandler.ts

@@ -68,14 +68,13 @@
     public sshProfile: imperative.IProfileLoaded;
     public isSshRequiredForProf: boolean = false;
 
-    public readonly controller: AbortController = new AbortController();
     public readonly dialogs: ICommandProviderDialogs = {
         commandSubmitted: vscode.l10n.t("Unix command submitted."),
         defaultText: vscode.l10n.t("$(plus) Create a new Unix command"),
         selectProfile: vscode.l10n.t("Select the profile to use to submit the Unix command"),
         searchCommand: vscode.l10n.t("Enter or update the Unix command"),
         writeCommand: (options) =>
             vscode.l10n.t({
                 message: "Select a Unix command to run against {0} (An option to edit will follow)",
                 args: options,
                 comment: ["Current work directory"],
@@ -138,14 +137,14 @@
 
             await this.profileInstance.checkCurrentProfile(this.nodeProfile);
             if (this.profileInstance.validProfile === Validation.ValidationType.INVALID) {
                 Gui.errorMessage(vscode.l10n.t("Profile is invalid"));
                 return;
             }
 
             if (this.isSshRequiredForProf) {
                 await this.getSshProfile();
                 if (!this.sshProfile) {
                     return;
                 }
                 const cmdArgs: imperative.ICommandArguments = this.getSshCmdArgs(this.sshProfile.profile);
                 // create the SSH session
@@ -155,14 +154,14 @@
 
                 const profileStatus = await this.profileInstance.profileValidationHelper(
                     this.sshProfile,
                     async (prof: imperative.IProfileLoaded, type: string): Promise<string> => {
                         if (type !== "ssh" || prof.profile.host !== this.sshSession.ISshSession.hostname) return "unverified";
                         return (await zosuss.Shell.isConnectionValid(this.sshSession)) ? "active" : "inactive";
                     }
                 );
 
                 if (!this.sshSession || profileStatus !== "active") {
                     this.nodeProfile = undefined;
                     ZoweLogger.error(this.unixCmdMsgs.sshSessionErrorMsg);
                     Gui.errorMessage(this.unixCmdMsgs.sshSessionErrorMsg);
                     return;
@@ -200,7 +199,7 @@
                     })
                 );
             } else {
                 await AuthUtils.errorHandling(error, { apiType: ZoweExplorerApiType.Command, profile: this.nodeProfile });
             }
         }
     }
@@ -214,7 +213,7 @@
         }
         this.sshProfile = await this.selectServiceProfile(profiles);
         if (!this.sshProfile) {
             return;
         }
         if (!(this.sshProfile.profile.host && this.sshProfile.profile.port)) {
             const currentProfile = await this.profileInstance.getProfileFromConfig(this.sshProfile.name);

packages/zowe-explorer/src/commands/ZoweCommandProvider.ts

@@ -55,7 +55,6 @@
 
     public abstract formatCommandLine(command: string, profile: imperative.IProfileLoaded): string;
     public abstract runCommand(profile: imperative.IProfileLoaded, command: string): Promise<string>;
-    public abstract controller: AbortController;
 
     public async issueCommand(profile: imperative.IProfileLoaded, command: string): Promise<void> {
         ZoweLogger.trace("ZoweCommandProvider.issueCommand called.");
@@ -87,8 +86,8 @@
                                 if (error.causeErrors) {
                                     try {
                                         const causeErrorsJson = JSON.parse(error.causeErrors);
                                         formattedError += "\n" + imperative.TextUtils.chalk.bold.yellow(responseTitle);
                                         formattedError += imperative.TextUtils.prettyJson(causeErrorsJson, undefined, false, "");
                                     } catch (parseErr) {
                                         // causeErrors was not JSON.
                                         const causeErrString: string = error.causeErrors.toString();
@@ -108,10 +107,10 @@
 
                                 return formattedError;
                             }
                             return error.message;
                         }
                     },
-                    this.controller,
+                    new AbortController(),
                     {
                         message: vscode.l10n.t({
                             message: "Welcome to the integrated terminal for: {0}",
@@ -120,7 +119,7 @@
                         }),
                         history: [...this.history.getSearchHistory()].reverse(),
                         startup: command,
                         formatCommandLine: (cmd: string) => this.formatCommandLine(cmd, profile),
                     }
                 );
                 this.terminal = vscode.window.createTerminal({ name: `(${profile.name}) ${this.terminalName}`, pty: this.pseudoTerminal });