zowe · t1m0thyj · Aug 15, 2023 · Jun 14, 2023 · Jun 16, 2023 · Jun 13, 2023
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.10.0-SNAPSHOT",
+  "version": "2.9.3-SNAPSHOT",
   "command": {
     "version": {
       "forcePublish": true,

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "vscode": "^1.53.2"
   },
   "dependencies": {
-    "@zowe/cli": "7.16.2",
+    "@zowe/cli": "7.16.6",
     "vscode-nls": "4.1.2"
   },
   "devDependencies": {
@@ -46,11 +46,6 @@
     "vscode-test": "^1.4.0",
     "yarn": "1.22.19"
   },
-  "resolutions": {
-    "**/json5": "^2.2.2",
-    "**/optionator": "^0.9.3",
-    "**/semver": "^7.5.2"
-  },
   "scripts": {
     "clean": "yarn workspaces run clean",
     "fresh-clone": "yarn workspaces run fresh-clone && rimraf node_modules",

diff --git a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md
@@ -14,6 +14,18 @@ All notable changes to the "eslint-plugin-zowe-explorer" package will be documen
 
 ### Bug fixes
 
+## `2.9.2`
+
+### New features and enhancements
+
+### Bug fixes
+
+## `2.9.1`
+
+### New features and enhancements
+
+### Bug fixes
+
 ## `2.9.0`
 
 ### New features and enhancements

diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md
@@ -12,6 +12,12 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 ### Bug fixes
 
+## `2.9.2`
+
+### New features and enhancements
+
+### Bug fixes
+
 ## `2.9.1`
 
 ### New features and enhancements

diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json
@@ -16,7 +16,7 @@
     "@types/semver": "^7.5.0"
   },
   "dependencies": {
-    "@zowe/cli": "^7.16.2",
+    "@zowe/cli": "^7.16.6",
     "semver": "^7.5.3"
   },
   "scripts": {

diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md
@@ -10,6 +10,12 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum
 
 ### Bug fixes
 
+## `2.9.2`
+
+### New features and enhancements
+
+### Bug fixes
+
 ## `2.9.1`
 
 ### Bug fixes

diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md
@@ -14,6 +14,17 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 ### Bug fixes
 
+## `2.9.2`
+
+### New features and enhancements
+
+### Bug fixes
+
+- Added jobs not found message when no results are returned from filter [#2362](https://github.com/zowe/vscode-extension-for-zowe/issues/2362)
+- Fixed loop when user selects Cancel on the Check Credentials message. [#2262](https://github.com/zowe/vscode-extension-for-zowe/issues/2262)
+- Fixed issue where job session nodes were not adding new job nodes when refreshed. [#2370](https://github.com/zowe/vscode-extension-for-zowe/issues/2370)
+- Fixed error when listing data set members that include control characters in the name.
+
 ## `2.9.1`
 
 ### Bug fixes

diff --git a/packages/zowe-explorer/README.md b/packages/zowe-explorer/README.md
@@ -5,6 +5,10 @@
 [![codecov](https://codecov.io/gh/zowe/vscode-extension-for-zowe/branch/main/graph/badge.svg)](https://codecov.io/gh/zowe/vscode-extension-for-zowe)
 [![slack](https://img.shields.io/badge/chat-on%20Slack-blue)](https://slack.openmainframeproject.org/)
 
+> ## With the removal of keytar shim from VS Code we will be replacing `node-keytar` with `@zowe/secrets-for-zowe-sdk` in our v2.10.0 release to avoid user interruptions
+>
+> ## v3 Pre-release coming soon with the removal of v1 profile support. Extenders, keep an eye on [changes affecting extenders](https://github.com/zowe/vscode-extension-for-zowe/wiki/Changes-Affecting-Extenders) for the full list of changes
+
 ## Introduction
 
 [Zowe Explorer](https://github.com/zowe/community#zowe-explorer) is a sub-project of Zowe, focusing on modernizing the mainframe experience. [Zowe](https://www.zowe.org/) is a project hosted by the [Open Mainframe Project](https://www.openmainframeproject.org/), a [Linux Foundation](https://www.linuxfoundation.org/) project.

diff --git a/packages/zowe-explorer/__tests__/__theia__/extension.theia.test.ts b/packages/zowe-explorer/__tests__/__theia__/extension.theia.test.ts
@@ -49,7 +49,7 @@ describe("Locate Tree Nodes", () => {
     afterEach(screenshotIfFailed(driverFirefox));
 
     it("should open Zowe Explorer and find the Favorites node", async () => {
-        const favoriteLink = await driverFirefox.getFavouritesNode();
+        const favoriteLink = await driverFirefox.getFavoritesNode();
         expect(favoriteLink).to.equal("Favorites");
     }).timeout(TIMEOUT);
 
@@ -186,7 +186,7 @@ describe("Test Adding and Removing Favorites", () => {
         await driverChrome.sleepTime(SHORTSLEEPTIME);
         await driverChrome.clickOnFavoriteTabInDatasets();
         await driverChrome.sleepTime(SHORTSLEEPTIME);
-        const favoriteProfile = await driverChrome.getFavoritePrfileNameFromDatasets();
+        const favoriteProfile = await driverChrome.getFavoriteProfileNameFromDatasets();
         expect(favoriteProfile).to.equal("TestSeleniumProfile");
     });
 
@@ -206,7 +206,7 @@ describe("Test Adding and Removing Favorites", () => {
         await driverChrome.sleepTime(SHORTSLEEPTIME);
         await driverChrome.clickOnFavoriteTabInUss();
         await driverChrome.sleepTime(SHORTSLEEPTIME);
-        const favoriteProfile = await driverChrome.getFavoritePrfileNameFromUss();
+        const favoriteProfile = await driverChrome.getFavoriteProfileNameFromUss();
         expect(favoriteProfile).to.equal("TestSeleniumProfile");
     });
 
@@ -226,7 +226,7 @@ describe("Test Adding and Removing Favorites", () => {
         await driverChrome.sleepTime(SHORTSLEEPTIME);
         await driverChrome.clickOnFavoriteTabInJobs();
         await driverChrome.sleepTime(SHORTSLEEPTIME);
-        const favoriteProfile = await driverChrome.getFavoritePrfileNameFromJobs();
+        const favoriteProfile = await driverChrome.getFavoriteProfileNameFromJobs();
         expect(favoriteProfile).to.equal("TestSeleniumProfile");
     });
 

diff --git a/packages/zowe-explorer/__tests__/__theia__/theia/Locators.ts b/packages/zowe-explorer/__tests__/__theia__/theia/Locators.ts
@@ -11,7 +11,6 @@
 
 export const TheiaLocator = {
     theiaUrl: "http://localhost:3000",
-
     zoweExplorerxId: "shell-tab-plugin-view-container:zowe",
 };
 
@@ -21,16 +20,14 @@ export const DatasetsLocators = {
     datasetsPanelId: "plugin-view:zowe.ds.explorer",
     datasetsAddSessionId: "zowe.ds.addSession-as-tabbar-toolbar-item",
     emptyInputBoxXpath: "//*[@class='input empty']",
-    createNewConnectionListXpath: "//*[@class='monaco-list-row'][1]",
+    createNewConnectionListXpath: "//*[@class='monaco-list-row focused'][1]",
     inputBoxXpath: "//*[@class='input']",
-    defaultDatasetsProfileId: "/iDefaultProfile",
-    secondDatasetProfileId: "/iTestSeleniumProfile",
-    favoriteTabId: "/iFavorites",
-    favoriteProfileInDatasetId: "/iFavorites/iTestSeleniumProfile",
+    defaultDatasetsProfileXpath: "(//div[contains(@id,'DefaultProfile')])[1]",
+    secondDatasetProfileXpath: "(//div[contains(@id,'TestSeleniumProfile')])[1]",
+    favoriteTabXpath: "(//div[contains(@id,'Favorites')])[1]",
+    favoriteProfileInDatasetXpath: "(//div[contains(@id,'Favorites') and contains(@id,'TestSeleniumProfile')])",
     addToFavoriteOptionXpath: "//li[@data-command='zowe.ds.saveSearch']",
-    searchSymbolInFavoriteXpath: "//*[@id='/iFavorites/iTestSeleniumProfile/i']",
     removeFavoriteProfileFromDatasetsOptionXpath: "//li[@data-command='zowe.ds.removeFavProfile']",
-    secondDatasetProfileBeforeDeletingId: "/iTestSeleniumProfile",
     deleteProfileFromDatasetsXpath: "(//li[@data-command='zowe.ds.deleteProfile'])",
 };
 
@@ -40,15 +37,13 @@ export const UssLocators = {
     ussPanelId: "plugin-view:zowe.uss.explorer",
     ussAddSessionId: "zowe.uss.addSession-as-tabbar-toolbar-item",
     emptyInputBoxXpath: "//*[@class='input empty']",
-    defaultUssProfileXpath: "(//div[@id='/iDefaultProfile'])[2]",
-    secondUssProfileXpath: "(//div[@id='/iTestSeleniumProfile'])[2]",
-    favoriteTabXpath: "(//div[@id='/iFavorites'])[2]",
-    favoriteProfileInUssXpath: "(//div[@id='/iFavorites/iTestSeleniumProfile'])",
+    defaultUssProfileXpath: "(//div[contains(@id,'DefaultProfile')])[2]",
+    secondUssProfileXpath: "(//div[contains(@id,'TestSeleniumProfile')])[2]",
+    favoriteTabXpath: "(//div[contains(@id,'Favorites')])[2]",
+    favoriteProfileInUssXpath: "(//div[contains(@id,'Favorites') and contains(@id,'TestSeleniumProfile')])",
     addToFavoriteOptionXpath: "//li[@data-command='zowe.uss.addFavorite']",
-    favoriteProfileInUssBeforeRemovingXpath: "(//div[@id='/iFavorites/iTestSeleniumProfile'])",
     removeFavoriteProfileFromUssOptionXpath: "//li[@data-command='zowe.uss.removeFavProfile']",
     hideProfileFromUssOptionXpath: "//li[@data-command='zowe.uss.removeSession']",
-    searchSymbolInFavoriteXpath: "//*[@id='/iFavorites/iTestSeleniumProfile/i']",
 };
 
 export const JobsLocators = {
@@ -57,18 +52,14 @@ export const JobsLocators = {
     jobsPanelId: "zowe.jobs.explorer",
     jobsAddSessionId: "zowe.jobs.addJobsSession-as-tabbar-toolbar-item",
     emptyInputBoxXpath: "//*[@class='input empty']",
-    defaultJobsProfileXpath: "(//div[@id='/iDefaultProfile'])[3]",
-    secondJobsProfileXpath: "(//div[@id='/iTestSeleniumProfile'])[3]",
-    favoriteTabXpath: "(//div[@id='/iFavorites'])[3]",
-    favoriteTabAfterRefreshXpath: "(//div[@id='/iFavorites'])[2]",
-    favoriteProfileInJobsXpath: "(//div[@id='/iFavorites/iTestSeleniumProfile'])",
-    favoriteprofile: "(//div[@id='/iFavorites/iTestSeleniumProfile'])",
+    defaultJobsProfileXpath: "(//div[contains(@id,'DefaultProfile')])[3]",
+    secondJobsProfileXpath: "(//div[contains(@id,'TestSeleniumProfile')])[3]",
+    favoriteTabXpath: "(//div[contains(@id,'Favorites')])[3]",
+    favoriteProfileInJobsXpath: "(//div[contains(@id,'Favorites') and contains(@id,'TestSeleniumProfile')])",
     addToFavoriteOptionXpath: "//li[@data-command='zowe.jobs.addFavorite']",
-    favoriteProfileInJobsBeforeRemovingXpath: "//div[@id='/iFavorites/iTestSeleniumProfile/iPrefix:*']",
     removeFavoriteProfileFromJobsOptionXpath: "//li[@data-command='zowe.jobs.removeFavProfile']",
     hideProfileFromJobsOptionXpath: "//li[@data-command='zowe.jobs.removeJobsSession']",
-    secondJobsProfileIdBeforeHidingXpath: "(//div[@id='/iTestSeleniumProfile'])[2]",
-    favoriteprofilexpath: "//div[@id='/iFavorites/iTestSeleniumProfile']",
+    secondJobsProfileBeforeHidingXpath: "(//div[contains(@id,'TestSeleniumProfile')])[2]",
 };
 
 export const TheiaNotificationMessages = {

diff --git a/packages/zowe-explorer/__tests__/__theia__/theia/extension.theiaChrome.ts b/packages/zowe-explorer/__tests__/__theia__/theia/extension.theiaChrome.ts
@@ -43,7 +43,7 @@ export async function clickOnZoweExplorer() {
 }
 
 export async function clickOnFavoriteTabInDatasets() {
-    await driverChrome.wait(until.elementLocated(By.id(DatasetsLocators.favoriteTabId)), WAITTIME).click();
+    await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.favoriteTabXpath)), WAITTIME).click();
 }
 
 export async function clickOnFavoriteTabInUss() {
@@ -54,10 +54,6 @@ export async function clickOnFavoriteTabInJobs() {
     await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.favoriteTabXpath)), WAITTIME).click();
 }
 
-export async function clickOnFavoriteTabInJobsAfterRefresh() {
-    await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.favoriteTabAfterRefreshXpath)), WAITTIME).click();
-}
-
 export async function clickOnDatasetsTab() {
     await driverChrome.findElement(By.xpath(DatasetsLocators.datasetTabXpath)).click();
 }
@@ -74,22 +70,24 @@ export async function clickOnJobsTab() {
     await driverChrome.findElement(By.id(JobsLocators.jobTabId)).click();
 }
 
-export async function getFavoritePrfileNameFromDatasets() {
-    const favoriteProfile = await driverChrome.wait(until.elementLocated(By.id(DatasetsLocators.favoriteProfileInDatasetId)), WAITTIME).getText();
+export async function getFavoriteProfileNameFromDatasets() {
+    const favoriteProfile = await driverChrome
+        .wait(until.elementLocated(By.xpath(DatasetsLocators.favoriteProfileInDatasetXpath)), WAITTIME)
+        .getText();
     return favoriteProfile;
 }
 
-export async function getFavoritePrfileNameFromUss() {
+export async function getFavoriteProfileNameFromUss() {
     const favoriteProfile = await driverChrome.wait(until.elementLocated(By.xpath(UssLocators.favoriteProfileInUssXpath)), WAITTIME).getText();
     return favoriteProfile;
 }
 
-export async function getFavoritePrfileNameFromJobs() {
+export async function getFavoriteProfileNameFromJobs() {
     return driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.favoriteProfileInJobsXpath)), WAITTIME).getText();
 }
 
 export async function removeFavoriteProfileFromDatasets() {
-    const removeFromFavorite = await driverChrome.wait(until.elementLocated(By.id(DatasetsLocators.favoriteProfileInDatasetId)), WAITTIME);
+    const removeFromFavorite = await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.favoriteProfileInDatasetXpath)), WAITTIME);
     await driverChrome.actions().click(removeFromFavorite, Button.RIGHT).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
     await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.removeFavoriteProfileFromDatasetsOptionXpath)), WAITTIME).click();
@@ -98,7 +96,7 @@ export async function removeFavoriteProfileFromDatasets() {
 }
 
 export async function removeFavoriteProfileFromUss() {
-    const removeFromFavorite = await driverChrome.wait(until.elementLocated(By.xpath(UssLocators.favoriteProfileInUssBeforeRemovingXpath)), WAITTIME);
+    const removeFromFavorite = await driverChrome.wait(until.elementLocated(By.xpath(UssLocators.favoriteProfileInUssXpath)), WAITTIME);
     await driverChrome.actions().click(removeFromFavorite, Button.RIGHT).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
     await driverChrome.wait(until.elementLocated(By.xpath(UssLocators.removeFavoriteProfileFromUssOptionXpath)), WAITTIME).click();
@@ -107,7 +105,7 @@ export async function removeFavoriteProfileFromUss() {
 }
 
 export async function removeFavoriteProfileFromJobs() {
-    const removeFromFavorite = await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.favoriteprofile)), WAITTIME);
+    const removeFromFavorite = await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.favoriteProfileInJobsXpath)), WAITTIME);
     await driverChrome.actions().click(removeFromFavorite, Button.RIGHT).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
     await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.removeFavoriteProfileFromJobsOptionXpath)), WAITTIME).click();
@@ -116,7 +114,7 @@ export async function removeFavoriteProfileFromJobs() {
 }
 
 export async function addProfileToFavoritesInDatasets() {
-    const addTofavorite = await driverChrome.wait(until.elementLocated(By.id(DatasetsLocators.secondDatasetProfileId)), WAITTIME);
+    const addTofavorite = await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.secondDatasetProfileXpath)), WAITTIME);
     await driverChrome.actions().click(addTofavorite, Button.RIGHT).perform();
     await driverChrome.sleep(SHORTSLEEPTIME);
     await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.addToFavoriteOptionXpath)), WAITTIME).click();
@@ -144,7 +142,7 @@ export async function hideProfileInUss() {
 }
 
 export async function hideProfileInJobs() {
-    const hideProfileFromJobs = await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.secondJobsProfileIdBeforeHidingXpath)), WAITTIME);
+    const hideProfileFromJobs = await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.secondJobsProfileBeforeHidingXpath)), WAITTIME);
     await driverChrome.actions().click(hideProfileFromJobs, Button.RIGHT).perform();
     await driverChrome.wait(until.elementLocated(By.xpath(JobsLocators.hideProfileFromJobsOptionXpath)), WAITTIME).click();
 }
@@ -160,7 +158,7 @@ export async function verifyProfileIsHideInUss() {
 
 export async function verifyProfileIsHideInJobs() {
     const hideProfileFromJobs = await driverChrome
-        .findElements(By.xpath(JobsLocators.secondJobsProfileIdBeforeHidingXpath))
+        .findElements(By.xpath(JobsLocators.secondJobsProfileBeforeHidingXpath))
         .then((found) => !!found.length);
     if (!hideProfileFromJobs) {
         return true;
@@ -170,7 +168,7 @@ export async function verifyProfileIsHideInJobs() {
 }
 
 export async function deleteDefaultProfileInDatasets() {
-    const profileName = await driverChrome.wait(until.elementLocated(By.id(DatasetsLocators.defaultDatasetsProfileId)), WAITTIME);
+    const profileName = await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.defaultDatasetsProfileXpath)), WAITTIME);
     await driverChrome.actions().click(profileName, Button.RIGHT).perform();
     await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.deleteProfileFromDatasetsXpath)), WAITTIME).click();
     await driverChrome.sleep(SHORTSLEEPTIME);
@@ -181,7 +179,7 @@ export async function deleteDefaultProfileInDatasets() {
 }
 
 export async function deleteProfileInDatasets() {
-    const favprofile = await driverChrome.wait(until.elementLocated(By.id(DatasetsLocators.secondDatasetProfileBeforeDeletingId)), WAITTIME);
+    const favprofile = await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.secondDatasetProfileXpath)), WAITTIME);
     await driverChrome.actions().click(favprofile, Button.RIGHT).perform();
     await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.deleteProfileFromDatasetsXpath)), WAITTIME).click();
     await driverChrome.sleep(SHORTSLEEPTIME);
@@ -192,7 +190,7 @@ export async function deleteProfileInDatasets() {
 }
 
 export async function verifyRemovedFavoriteProfileInDatasets() {
-    const favoriteProfile = await driverChrome.findElements(By.id(DatasetsLocators.favoriteProfileInDatasetId)).then((found) => !!found.length);
+    const favoriteProfile = await driverChrome.findElements(By.xpath(DatasetsLocators.favoriteProfileInDatasetXpath)).then((found) => !!found.length);
     if (!favoriteProfile) {
         return true;
     } else {
@@ -219,7 +217,7 @@ export async function verifyRemovedFavoriteProfileInJobs() {
 }
 
 export async function verifyRemovedDefaultProfileInDataSet() {
-    const defaultProfile = await driverChrome.findElements(By.id(DatasetsLocators.defaultDatasetsProfileId)).then((found) => !!found.length);
+    const defaultProfile = await driverChrome.findElements(By.xpath(DatasetsLocators.defaultDatasetsProfileXpath)).then((found) => !!found.length);
     if (!defaultProfile) {
         return true;
     } else {
@@ -228,7 +226,7 @@ export async function verifyRemovedDefaultProfileInDataSet() {
 }
 
 export async function verifyRemovedOtherProfileInDataSet() {
-    const defaultProfile = await driverChrome.findElements(By.id(DatasetsLocators.secondDatasetProfileId)).then((found) => !!found.length);
+    const defaultProfile = await driverChrome.findElements(By.xpath(DatasetsLocators.secondDatasetProfileXpath)).then((found) => !!found.length);
     if (!defaultProfile) {
         return true;
     } else {
@@ -319,11 +317,11 @@ export async function clickOnAddSessionInDatasets() {
 }
 
 export async function getDatasetsDefaultProfilename() {
-    const datasetProfile = await driverChrome.wait(until.elementLocated(By.id(DatasetsLocators.defaultDatasetsProfileId)), WAITTIME).getText();
+    const datasetProfile = await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.defaultDatasetsProfileXpath)), WAITTIME).getText();
     return datasetProfile;
 }
 
 export async function getDatasetsProfilename() {
-    const datasetProfile = await driverChrome.wait(until.elementLocated(By.id(DatasetsLocators.secondDatasetProfileId)), WAITTIME).getText();
+    const datasetProfile = await driverChrome.wait(until.elementLocated(By.xpath(DatasetsLocators.secondDatasetProfileXpath)), WAITTIME).getText();
     return datasetProfile;
 }