Update main branch with changes from 2.15.2

.github/workflows/zowe-explorer-ci.yml

@@ -24,7 +24,7 @@ jobs:
       # Continue to run tests on the other systems if one fails
       fail-fast: false
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x]
         # order operating systems from best to worst
         os: [windows-latest, ubuntu-latest, macos-latest]
 

.github/workflows/zowe-explorer-ftp-ci.yml

@@ -24,7 +24,7 @@ jobs:
       # Continue to run tests on the other systems if one fails
       fail-fast: false
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [16.x, 18.x]
         # order operating systems from best to worst
         os: [windows-latest, ubuntu-latest, macos-latest]
 

package.json

@@ -16,7 +16,7 @@
     "vscode": "^1.53.2"
   },
   "dependencies": {
-    "@zowe/cli": "7.23.3",
+    "@zowe/cli": "7.23.6",
     "vscode-nls": "4.1.2"
   },
   "devDependencies": {

packages/eslint-plugin-zowe-explorer/CHANGELOG.md

@@ -6,6 +6,18 @@ All notable changes to the "eslint-plugin-zowe-explorer" package will be documen
 
 ### Bug fixes
 
+## `2.15.2`
+
+### New features and enhancements
+
+### Bug fixes
+
+## `2.15.1`
+
+### New features and enhancements
+
+### Bug fixes
+
 ## `2.15.0`
 
 ## `2.14.1`

packages/zowe-explorer-api/CHANGELOG.md

@@ -17,6 +17,22 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 ### Bug fixes
 
+## `2.15.2`
+
+### New features and enhancements
+
+- Added optional method `getDsDocumentFilePath` to `IZoweDatasetTreeNode` interface to make it easier for extenders to get the local file path of a data set node. [#2760](https://github.com/zowe/vscode-extension-for-zowe/pull/2760)
+
+### Bug fixes
+
+- Fixed an issue where the `ProfilesCache` class would retain old service profiles, even if they were removed from the team config. [#2395](https://github.com/zowe/zowe-explorer-vscode/issues/2395)
+
+## `2.15.1`
+
+### Bug fixes
+
+- Fixed TypeError encountered in the `ProfilesCache.checkMergingConfigAllProfiles` function when merging profiles. [#2771](https://github.com/zowe/vscode-extension-for-zowe/pull/2771)
+
 ## `2.15.0`
 
 ### Bug fixes

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

@@ -298,6 +298,20 @@ describe("ProfilesCache", () => {
             expect(profCache.getAllTypes().length).toEqual(0);
             expect(mockLogError).toHaveBeenCalledWith(fakeError);
         });
+
+        it("should clear the profilesByType and defaultProfileByType maps before reloading profiles", async () => {
+            const profCache = new ProfilesCache({ ...fakeLogger, error: mockLogError } as unknown as zowe.imperative.Logger);
+            const profInfoMock = jest.spyOn(profCache, "getProfileInfo").mockRejectedValueOnce("some error");
+            const errorMock = jest.spyOn((profCache as any).log, "error").mockImplementation();
+            (profCache as any).profilesByType["test-type"] = { name: "someProf" as any };
+            (profCache as any).defaultProfileByType["test-type"] = { name: "someProf" as any };
+            await profCache.refresh();
+            expect((profCache as any).profilesByType.size).toBe(0);
+            expect((profCache as any).defaultProfileByType.size).toBe(0);
+            expect(errorMock).toHaveBeenCalledWith("some error");
+            profInfoMock.mockRestore();
+            errorMock.mockRestore();
+        });
     });
 
     describe("validateAndParseUrl", () => {

packages/zowe-explorer-api/package.json

@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@types/vscode": "^1.53.2",
-    "@zowe/cli": "7.23.3",
+    "@zowe/cli": "7.23.6",
     "@zowe/secrets-for-zowe-sdk": "7.18.6",
     "handlebars": "^4.7.7",
     "semver": "^7.5.3"

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

@@ -194,6 +194,8 @@ export class ProfilesCache {
     public async refresh(apiRegister?: ZoweExplorerApi.IApiRegisterClient): Promise<void> {
         this.allProfiles = [];
         this.allTypes = [];
+        this.profilesByType.clear();
+        this.defaultProfileByType.clear();
         let mProfileInfo: zowe.imperative.ProfileInfo;
         try {
             mProfileInfo = await this.getProfileInfo();
@@ -481,40 +483,18 @@ export class ProfilesCache {
 
     // used by refresh to check correct merging of allProfiles
     protected checkMergingConfigAllProfiles(): void {
-        const baseProfile = this.defaultProfileByType.get("base");
-        const allProfiles: zowe.imperative.IProfileLoaded[] = [];
-        this.allTypes.forEach((type) => {
-            try {
-                const allProfilesByType: zowe.imperative.IProfileLoaded[] = [];
-                const profByType = this.profilesByType.get(type);
-                profByType.forEach((profile) => {
-                    if (this.shouldRemoveTokenFromProfile(profile, baseProfile)) {
-                        profile.profile.tokenType = undefined;
-                        profile.profile.tokenValue = undefined;
-                        // update default profile of type if changed
-                        if (profile.name === this.defaultProfileByType.get(type).name) {
-                            this.defaultProfileByType.set(type, profile);
-                        }
-                    }
-                    allProfiles.push(profile);
-                    allProfilesByType.push(profile);
-                });
-                this.profilesByType.set(type, allProfilesByType);
-            } catch (error) {
-                // do nothing, skip if profile type is not included in config file
-                this.log.debug(error as string);
-            }
-        });
-        this.allProfiles = [];
-        this.allProfiles.push(...allProfiles);
+        for (const profs of this.profilesByType.values()) {
+            profs.forEach((profile) => {
+                this.checkMergingConfigSingleProfile(profile);
+            });
+        }
     }
 
     // check correct merging of a single profile
     protected checkMergingConfigSingleProfile(profile: zowe.imperative.IProfileLoaded): zowe.imperative.IProfileLoaded {
         const baseProfile = this.defaultProfileByType.get("base");
         if (this.shouldRemoveTokenFromProfile(profile, baseProfile)) {
-            profile.profile.tokenType = undefined;
-            profile.profile.tokenValue = undefined;
+            profile.profile.tokenType = profile.profile.tokenValue = undefined;
         }
         return profile;
     }

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

@@ -212,6 +212,11 @@ export interface IZoweDatasetTreeNode extends IZoweTreeNode {
      * @param datasetFileProvider the tree provider
      */
     openDs?(download: boolean, previewFile: boolean, datasetFileProvider: IZoweTree<IZoweDatasetTreeNode>): Promise<void>;
+    /**
+     * Returns the local file path for the ZoweDatasetNode
+     *
+     */
+    getDsDocumentFilePath?(): string;
     /**
      * Sets the codepage value for the file
      *

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

@@ -6,6 +6,18 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
 
 ### Bug fixes
 
+## `2.15.2`
+
+### New features and enhancements
+
+### Bug fixes
+
+## `2.15.1`
+
+### New features and enhancements
+
+### Bug fixes
+
 ## `2.15.0`
 
 ## `2.14.1`

packages/zowe-explorer/CHANGELOG.md

@@ -12,6 +12,23 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 ### Bug fixes
 
+## `2.15.2`
+
+### New features and enhancements
+
+### Bug fixes
+
+- Fixed issue where files left open in prior VS Code session cannot be uploaded to mainframe after window is reloaded. [#2758](https://github.com/zowe/vscode-extension-for-zowe/issues/2758)
+- Fixed issue where saving changes to favorited data set or USS file could fail. [#2801](https://github.com/zowe/vscode-extension-for-zowe/pull/2801)
+
+## `2.15.1`
+
+### New features and enhancements
+
+### Bug fixes
+
+- Fixed issue where VS Code quick pick separators were used in environments that did not support the feature. [#2771](https://github.com/zowe/vscode-extension-for-zowe/pull/2771)
+
 ## `2.15.0`
 
 ### New features and enhancements

packages/zowe-explorer/__mocks__/mockCreators/uss.ts

@@ -51,13 +51,13 @@ export function createUSSTree(favoriteNodes: ZoweUSSNode[], sessionNodes: ZoweUS
 
 export function createUSSNode(session, profile) {
     const parentNode = new ZoweUSSNode({
-        label: "parentNode",
+        label: "usstest",
         collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
         session,
         profile,
     });
     const ussNode = new ZoweUSSNode({
-        label: "usstest",
+        label: "testDir",
         collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
         parentNode,
         session,
@@ -66,7 +66,8 @@ export function createUSSNode(session, profile) {
     parentNode.contextValue = globals.USS_SESSION_CONTEXT;
     ussNode.contextValue = globals.USS_DIR_CONTEXT;
     parentNode.fullPath = "/u/myuser";
-    ussNode.fullPath = "/u/myuser/usstest";
+    ussNode.fullPath = "/u/myuser/testDir";
+    parentNode.children.push(ussNode);
     return ussNode;
 }
 
@@ -88,25 +89,23 @@ export function createUSSSessionNode(session: imperative.Session, profile: imper
     return zoweUSSNode;
 }
 
-// This is NOT a favorite equivalent of the node created by createdUSSNode.
-// This is a favorited textfile node. createUSSNode creates a USS session node.
 export function createFavoriteUSSNode(session, profile) {
     const parentNode = new ZoweUSSNode({
-        label: "parentNode",
+        label: "usstest",
         collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
         session,
         profile,
     });
     const ussNodeF = new ZoweUSSNode({
-        label: "usstest",
+        label: "testDir",
         collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
         parentNode,
         session,
         profile,
     });
     parentNode.contextValue = globals.FAV_PROFILE_CONTEXT;
-    ussNodeF.contextValue = globals.USS_TEXT_FILE_CONTEXT + globals.FAV_SUFFIX;
-    ussNodeF.fullPath = "/u/myuser/usstest";
-    ussNodeF.tooltip = "/u/myuser/usstest";
+    ussNodeF.contextValue = globals.USS_DIR_CONTEXT + globals.FAV_SUFFIX;
+    ussNodeF.fullPath = ussNodeF.tooltip = "/u/myuser/testDir";
+    parentNode.children.push(ussNodeF);
     return ussNodeF;
 }

packages/zowe-explorer/__mocks__/vscode.ts

@@ -636,6 +636,8 @@ export namespace workspace {
      */
     export let rootPath: string | undefined;
 
+    export let textDocuments: string[] = [];
+
     /**
      * A workspace folder is one of potentially many roots opened by the editor. All workspace folders
      * are equal which means there is no notion of an active or master workspace folder.
@@ -728,3 +730,18 @@ export namespace env {
         },
     };
 }
+
+export const version = "1.53.2";
+
+export namespace languages {
+    export function createDiagnosticCollection(name: string): any {}
+}
+
+export class Diagnostic {}
+
+export enum DiagnosticSeverity {
+    Error = 0,
+    Warning = 1,
+    Information = 2,
+    Hint = 3,
+}

packages/zowe-explorer/__tests__/__unit__/dataset/DatasetTree.unit.test.ts

@@ -55,6 +55,7 @@ import { TreeProviders } from "../../../src/shared/TreeProviders";
 import { join } from "path";
 import { mocked } from "../../../__mocks__/mockUtils";
 import * as sharedUtils from "../../../src/shared/utils";
+import { LocalFileManagement } from "../../../src/utils/LocalFileManagement";
 
 jest.mock("fs");
 jest.mock("util");
@@ -168,6 +169,9 @@ function createGlobalMocks() {
     Object.defineProperty(ZoweLogger, "warn", { value: jest.fn(), configurable: true });
     Object.defineProperty(ZoweLogger, "info", { value: jest.fn(), configurable: true });
     Object.defineProperty(ZoweLogger, "trace", { value: jest.fn(), configurable: true });
+    jest.spyOn(LocalFileManagement, "storeFileInfo").mockImplementation();
+    jest.spyOn(LocalFileManagement, "deleteFileInfo").mockImplementation();
+    jest.spyOn(LocalFileManagement, "removeRecoveredFile").mockImplementation();
 
     return globalMocks;
 }
@@ -3358,11 +3362,11 @@ describe("Dataset Tree Unit Tests - Sorting and Filtering operations", () => {
     });
 
     describe("onDidCloseTextDocument", () => {
-        it("sets the entry in openFiles record to null if Data Set URI is valid", () => {
-            const doc = { uri: { fsPath: join(globals.DS_DIR, "lpar", "SOME.PS") } } as vscode.TextDocument;
+        it("sets the entry in openFiles record to null if Data Set URI is valid", async () => {
+            const doc = { isClosed: true, isDirty: false, uri: { fsPath: join(globals.DS_DIR, "lpar", "SOME.PS") } } as vscode.TextDocument;
 
             jest.spyOn(TreeProviders, "ds", "get").mockReturnValue(tree);
-            DatasetTree.onDidCloseTextDocument(doc);
+            await DatasetTree.onDidCloseTextDocument(doc);
             expect(tree.openFiles[doc.uri.fsPath]).toBeNull();
         });
     });

packages/zowe-explorer/__tests__/__unit__/dataset/ZoweDatasetNode.unit.test.ts

@@ -28,6 +28,7 @@ import * as fs from "fs";
 import * as sharedUtils from "../../../src/shared/utils";
 import { Profiles } from "../../../src/Profiles";
 import { ZoweLogger } from "../../../src/utils/LoggerUtils";
+import { LocalFileManagement } from "../../../src/utils/LocalFileManagement";
 
 // Missing the definition of path module, because I need the original logic for tests
 jest.mock("fs");
@@ -59,6 +60,7 @@ function createGlobalMocks() {
         configurable: true,
     });
     Object.defineProperty(vscode.workspace, "openTextDocument", { value: jest.fn(), configurable: true });
+    jest.spyOn(LocalFileManagement, "storeFileInfo").mockImplementation();
 
     return newMocks;
 }