zowe · zFernand0 · Sep 5, 2024 · May 3, 2024 · May 7, 2024 · May 8, 2024
diff --git a/packages/zowe-explorer-api/src/vscode/ui/index.ts b/packages/zowe-explorer-api/src/vscode/ui/index.ts
@@ -14,3 +14,4 @@ export * from "./utils/TableMediator";
 export * from "./TableView";
 export * from "./TableViewProvider";
 export * from "./WebView";
+export * as HTMLTemplate from "./utils/HTMLTemplate";
diff --git a/packages/zowe-explorer-api/src/vscode/ui/utils/HTMLTemplate.ts b/packages/zowe-explorer-api/src/vscode/ui/utils/HTMLTemplate.ts
@@ -14,17 +14,17 @@
 /**
  * HTML template that is compiled with Mustache to load a WebView instance at runtime.
  */
-const HTMLTemplate: string = `
+const HTMLTemplate: string = /*html*/ `
 <!DOCTYPE html>
 <html lang="en">
     <head>
         <meta charset="UTF-8">
         <title>{{ title }}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <meta 
-            http-equiv="Content-Security-Policy" 
-            content="default-src 'none'; font-src data: {{ cspSource }}; img-src data: vscode-resource: https:; script-src {{#unsafeEval}}'unsafe-eval'{{/unsafeEval}} 'nonce-{{ nonce }}';
-            style-src {{ cspSource }} vscode-resource: 'unsafe-inline' http: https: data:;"
+        <meta
+            http-equiv="Content-Security-Policy"
+            content="default-src 'none'; font-src data: https:; img-src data: vscode-resource: https:; script-src 'nonce-{{ nonce }}';
+            style-src vscode-resource: 'unsafe-inline' http: https: data:;"
         />
         <base href="{{ uris.resource.build }}">
         {{#uris.resource.css}}
@@ -33,9 +33,11 @@ const HTMLTemplate: string = `
         {{#uris.resource.codicons}}
         <link type="text/css" rel="stylesheet" href="{{ uris.resource.codicons }}" />
         {{/uris.resource.codicons}}
+        {{{ style }}}
     </head>
     <body>
         <noscript>You'll need to enable JavaScript to run this app.</noscript>
+        {{{ startup }}}
         <div id="webviewRoot"></div>
         <script type="module" nonce="{{ nonce }}" src="{{ uris.resource.script }}" />
     </body>

diff --git a/packages/zowe-explorer/__tests__/__mocks__/@zowe/zos-console-for-zowe-sdk.ts b/packages/zowe-explorer/__tests__/__mocks__/@zowe/zos-console-for-zowe-sdk.ts
@@ -0,0 +1,12 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ */
+
+export interface IIssueParms {}
diff --git a/packages/zowe-explorer/__tests__/__mocks__/mockCreators/api.ts b/packages/zowe-explorer/__tests__/__mocks__/mockCreators/api.ts
@@ -38,3 +38,12 @@ export function bindUssApi(api: MainframeInteraction.IUss) {
     getUssApiMock.mockReturnValue(api);
     ZoweExplorerApiRegister.getUssApi = getUssApiMock.bind(ZoweExplorerApiRegister);
 }
+
+export function createCommandApi(profile: imperative.IProfileLoaded) {
+    return ZoweExplorerApiRegister.getCommandApi(profile);
+}
+export function bindCommandApi(api: MainframeInteraction.IJes) {
+    const getCommandApiMock = jest.fn();
+    getCommandApiMock.mockReturnValue(api);
+    ZoweExplorerApiRegister.getCommandApi = getCommandApiMock.bind(ZoweExplorerApiRegister);
+}
diff --git a/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts
@@ -39,8 +39,8 @@ jest.mock("fs-extra");
 jest.mock("util");
 jest.mock("isbinaryfile");
 
-function createGlobalMocks() {
-    const mockReadProfilesFromDisk = jest.fn();
+async function createGlobalMocks() {
+    const mockReadProfilesFromDisk = jest.fn().mockReturnValue(Promise.resolve());
     const globalMocks = {
         mockLoadNamedProfile: jest.fn(),
         mockMkdirSync: jest.fn(),
@@ -50,6 +50,8 @@ function createGlobalMocks() {
         mockCreateTreeView: jest.fn().mockReturnValue({ onDidCollapseElement: jest.fn() }),
         mockExecuteCommand: jest.fn(),
         mockRegisterCommand: jest.fn(),
+        mockRegisterWebviewViewProvider: jest.fn(),
+        mockOnDidCloseTextDocument: jest.fn(),
         mockOnDidSaveTextDocument: jest.fn(),
         mockOnDidChangeSelection: jest.fn(),
         mockOnDidChangeConfiguration: jest.fn(),
@@ -257,6 +259,10 @@ function createGlobalMocks() {
         value: globalMocks.mockRegisterCommand,
         configurable: true,
     });
+    Object.defineProperty(vscode.window, "registerWebviewViewProvider", {
+        value: globalMocks.mockRegisterWebviewViewProvider,
+        configurable: true,
+    });
     Object.defineProperty(vscode.commands, "executeCommand", {
         value: globalMocks.mockExecuteCommand,
         configurable: true,

diff --git a/packages/zowe-explorer/__tests__/__unit__/trees/job/JobActions.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/trees/job/JobActions.unit.test.ts
@@ -23,7 +23,7 @@ import {
     createInstanceOfProfile,
 } from "../../../__mocks__/mockCreators/shared";
 import { createIJobFile, createIJobObject, createJobNode, createJobSessionNode, createJobsTree } from "../../../__mocks__/mockCreators/jobs";
-import { createJesApi, bindJesApi } from "../../../__mocks__/mockCreators/api";
+import { createJesApi, bindJesApi, createCommandApi, bindCommandApi } from "../../../__mocks__/mockCreators/api";
 import { createDatasetSessionNode, createDatasetTree } from "../../../__mocks__/mockCreators/datasets";
 import { Constants } from "../../../../src/configuration/Constants";
 import { Profiles } from "../../../../src/configuration/Profiles";
@@ -74,6 +74,7 @@ function createGlobalMocks() {
         mockJobArray: [],
         testJobsTree: null as any,
         jesApi: null as any,
+        commandApi: null as any,
         mockProfileInstance: null,
     };
     newMocks.mockProfileInstance = createInstanceOfProfile(newMocks.imperativeProfile);
@@ -82,6 +83,8 @@ function createGlobalMocks() {
     newMocks.mockJobArray = [newMocks.JobNode1, newMocks.JobNode2, newMocks.JobNode3] as any;
     newMocks.jesApi = createJesApi(newMocks.imperativeProfile);
     bindJesApi(newMocks.jesApi);
+    newMocks.commandApi = createCommandApi(newMocks.imperativeProfile);
+    bindCommandApi(newMocks.commandApi);
     Object.defineProperty(vscode.workspace, "getConfiguration", {
         value: jest.fn().mockImplementation(() => new Map([["zowe.jobs.confirmSubmission", false]])),
         configurable: true,
@@ -93,7 +96,6 @@ function createGlobalMocks() {
     Object.defineProperty(Gui, "showOpenDialog", { value: jest.fn(), configurable: true });
     Object.defineProperty(LocalFileManagement, "getDefaultUri", { value: jest.fn(), configurable: true });
     Object.defineProperty(vscode.window, "showWarningMessage", { value: jest.fn(), configurable: true });
-    Object.defineProperty(zosconsole.IssueCommand, "issueSimple", { value: jest.fn(), configurable: true });
     Object.defineProperty(vscode.window, "showOpenDialog", { value: jest.fn(), configurable: true });
     Object.defineProperty(zosjobs.CancelJobs, "cancelJobForJob", { value: jest.fn(), configurable: true });
     Object.defineProperty(zosjobs.GetJobs, "getJclForJob", { value: jest.fn(), configurable: true });
@@ -199,7 +201,7 @@ describe("Jobs Actions Unit Tests - Function stopCommand", () => {
             job: blockMocks.iJob,
         });
 
-        mocked(zosconsole.IssueCommand.issueSimple).mockResolvedValueOnce({
+        jest.spyOn(blockMocks.commandApi, "issueMvsCommand").mockResolvedValueOnce({
             success: false,
             zosmfResponse: [],
             commandResponse: "fake response",
@@ -216,7 +218,7 @@ describe("Jobs Actions Unit Tests - Function stopCommand", () => {
             session: blockMocks.session,
             profile: blockMocks.imperativeProfile,
         });
-        mocked(zosconsole.IssueCommand.issueSimple).mockResolvedValueOnce({
+        jest.spyOn(blockMocks.commandApi, "issueMvsCommand").mockResolvedValueOnce({
             success: false,
             zosmfResponse: [],
             commandResponse: "fake response",
@@ -238,7 +240,7 @@ describe("Jobs Actions Unit Tests - Function modifyCommand", () => {
         });
 
         mocked(vscode.window.showInputBox).mockResolvedValue("modify");
-        mocked(zosconsole.IssueCommand.issueSimple).mockResolvedValueOnce({
+        jest.spyOn(blockMocks.commandApi, "issueMvsCommand").mockResolvedValueOnce({
             success: false,
             zosmfResponse: [],
             commandResponse: "fake response",
@@ -256,7 +258,7 @@ describe("Jobs Actions Unit Tests - Function modifyCommand", () => {
             profile: blockMocks.imperativeProfile,
         });
         mocked(vscode.window.showInputBox).mockResolvedValue("modify");
-        mocked(zosconsole.IssueCommand.issueSimple).mockResolvedValueOnce({
+        jest.spyOn(blockMocks.commandApi, "issueMvsCommand").mockResolvedValueOnce({
             success: false,
             zosmfResponse: [],
             commandResponse: "fake response",

diff --git a/packages/zowe-explorer/__tests__/__unit__/zosconsole/ZosConsolePanel.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/zosconsole/ZosConsolePanel.unit.test.ts
@@ -0,0 +1,48 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ */
+
+import { createInstanceOfProfile, createIProfile } from "../../__mocks__/mockCreators/shared";
+import { ZosConsoleViewProvider } from "../../../src/zosconsole/ZosConsolePanel";
+import { Profiles } from "../../../src/configuration/Profiles";
+import * as vscode from "vscode";
+
+describe("ZosConsoleViewProvider", () => {
+    function createGlobalMocks(): any {
+        const newMocks = {
+            imperativeProfile: createIProfile(),
+            profileInstance: null,
+            testWebView: {},
+        };
+        newMocks.testWebView = {
+            webview: {
+                postMessage: jest.fn(),
+                asWebviewUri: jest.fn(),
+                onDidReceiveMessage: jest.fn(),
+            },
+        };
+        newMocks.profileInstance = createInstanceOfProfile(newMocks.imperativeProfile);
+        Object.defineProperty(Profiles, "getInstance", {
+            value: jest.fn().mockReturnValue(newMocks.profileInstance),
+            configurable: true,
+        });
+        Object.defineProperty(vscode.Uri, "joinPath", { value: jest.fn(), configurable: true });
+
+        return newMocks;
+    }
+    describe("resolveWebviewView", () => {
+        it("should submit command", () => {
+            const globalMocks = createGlobalMocks();
+            const myconsole = new ZosConsoleViewProvider({} as any);
+            myconsole.resolveWebviewView(globalMocks.testWebView, {} as any, { isCancellationRequested: false } as any);
+            expect(globalMocks.testWebView.webview.onDidReceiveMessage).toBeCalled();
+        });
+    });
+});
diff --git a/packages/zowe-explorer/l10n/poeditor.json b/packages/zowe-explorer/l10n/poeditor.json
@@ -11,9 +11,15 @@
   "viewsContainers.panel.tableView": {
     "Zowe Resources": ""
   },
+  "zowe.zosconsole": {
+    "Zowe Explorer z/OS Console": ""
+  },
   "zowe.resources.name": {
     "Zowe Resources": ""
   },
+  "zosconsole": {
+    "z/OS Console": ""
+  },
   "zowe.placeholderCommand": {
     "Placeholder": ""
   },

diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json
@@ -46,6 +46,11 @@
           "id": "zowe-panel",
           "icon": "resources/zowe.svg",
           "title": "%viewsContainers.panel.tableView%"
+        },
+        {
+          "id": "zowezosconsole",
+          "title": "%zowe.zosconsole%",
+          "icon": ""
         }
       ]
     },
@@ -70,6 +75,13 @@
           "id": "zowe-resources",
           "name": "%zowe.resources.name%"
         }
+      ],
+      "zowezosconsole": [
+        {
+          "id": "zosconsole",
+          "name": "%zosconsole%",
+          "type": "webview"
+        }
       ]
     },
     "keybindings": [
@@ -1841,6 +1853,7 @@
     "@zowe/zos-jobs-for-zowe-sdk": "8.0.0-next.202408291544",
     "@zowe/zosmf-for-zowe-sdk": "8.0.0-next.202408291544",
     "@zowe/zowe-explorer-api": "3.0.0-next-SNAPSHOT",
+    "@vscode/codicons": "^0.0.35",
     "dayjs": "^1.11.10",
     "fs-extra": "8.0.1",
     "isbinaryfile": "4.0.4",

diff --git a/packages/zowe-explorer/package.nls.json b/packages/zowe-explorer/package.nls.json
@@ -3,7 +3,9 @@
   "description": "VS Code extension, powered by Zowe CLI, that streamlines interaction with mainframe data sets, USS files, and jobs",
   "viewsContainers.activitybar": "Zowe Explorer",
   "viewsContainers.panel.tableView": "Zowe Resources",
+  "zowe.zosconsole": "Zowe Explorer z/OS Console",
   "zowe.resources.name": "Zowe Resources",
+  "zosconsole": "z/OS Console",
   "zowe.placeholderCommand": "Placeholder",
   "zowe.promptCredentials": "Update Credentials",
   "zowe.profileManagement": "Manage Profile",

diff --git a/packages/zowe-explorer/src/extension.ts b/packages/zowe-explorer/src/extension.ts
@@ -49,6 +49,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<ZoweEx
         }
     );
     SharedInit.registerCommonCommands(context, providers);
+    SharedInit.registerZosConsoleView(context);
     SharedInit.registerRefreshCommand(context, activate, deactivate);
     ZoweExplorerExtender.createInstance(providers.ds, providers.uss, providers.job);
 

diff --git a/packages/zowe-explorer/src/trees/shared/SharedInit.ts b/packages/zowe-explorer/src/trees/shared/SharedInit.ts
@@ -45,6 +45,7 @@ import { SharedUtils } from "./SharedUtils";
 import { SharedContext } from "./SharedContext";
 import { TreeViewUtils } from "../../utils/TreeViewUtils";
 import { CertificateWizard } from "../../utils/CertificateWizard";
+import { ZosConsoleViewProvider } from "../../zosconsole/ZosConsolePanel";
 
 export class SharedInit {
     public static registerRefreshCommand(
@@ -423,6 +424,15 @@ export class SharedInit {
         ZoweLogger.zeOutputChannel = await LoggerUtils.initVscLogger(context, logsPath);
     }
 
+    /**
+     *
+     * @param context @deprecated
+     */
+    public static registerZosConsoleView(context: vscode.ExtensionContext): void {
+        const provider = new ZosConsoleViewProvider(context.extensionUri);
+        context.subscriptions.push(vscode.window.registerWebviewViewProvider(ZosConsoleViewProvider.viewType, provider));
+    }
+
     /**
      * Initialize Zowe Explorer UI functions
      * Function can only run one time during runtime, otherwise it will immediately return