From f589ceacd66c584a9dbb3123c12b8c0c97272d80 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:34:59 -0400 Subject: [PATCH 1/4] remove extRefresh command from VSC command pallete Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../__tests__/__unit__/extension.unit.test.ts | 1 - .../trees/shared/SharedInit.unit.test.ts | 38 ------------------- packages/zowe-explorer/l10n/poeditor.json | 3 -- packages/zowe-explorer/package.json | 14 ------- packages/zowe-explorer/package.nls.json | 1 - .../src/configuration/Constants.ts | 2 +- packages/zowe-explorer/src/extension.ts | 1 - .../src/trees/shared/SharedInit.ts | 22 ----------- 8 files changed, 1 insertion(+), 81 deletions(-) diff --git a/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts index 98683ba35c..42634d45cc 100644 --- a/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts @@ -242,7 +242,6 @@ async function createGlobalMocks() { "zowe.compareWithSelectedReadOnly", "zowe.compareFileStarted", "zowe.placeholderCommand", - "zowe.extRefresh", ], }; diff --git a/packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts index 63de0a6311..843398d7a3 100644 --- a/packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts @@ -319,44 +319,6 @@ describe("Test src/shared/extension", () => { processSubscriptions(commands, test); }); - describe("registerRefreshCommand", () => { - const context: any = { subscriptions: [] }; - const activate = jest.fn(); - const deactivate = jest.fn(); - const dispose = jest.fn(); - let extRefreshCallback; - const spyExecuteCommand = jest.fn(); - - beforeAll(() => { - Object.defineProperty(vscode.commands, "registerCommand", { - value: (_: string, fun: () => void) => { - extRefreshCallback = fun; - return { dispose }; - }, - }); - Object.defineProperty(vscode.commands, "executeCommand", { value: spyExecuteCommand }); - SharedInit.registerRefreshCommand(context, activate, deactivate); - }); - - beforeEach(() => { - jest.clearAllMocks(); - }); - - afterAll(() => { - jest.restoreAllMocks(); - }); - - it("Test assuming we are unable to dispose of the subscription", async () => { - const testError = new Error("test"); - dispose.mockRejectedValue(testError); - await extRefreshCallback(); - expect(spyExecuteCommand).not.toHaveBeenCalled(); - expect(deactivate).toHaveBeenCalled(); - expect(ZoweLogger.error).toHaveBeenCalledWith(testError); - expect(dispose).toHaveBeenCalled(); - expect(activate).toHaveBeenCalled(); - }); - }); describe("watchConfigProfile", () => { let context: any; diff --git a/packages/zowe-explorer/l10n/poeditor.json b/packages/zowe-explorer/l10n/poeditor.json index 9363299157..d98a3e670d 100644 --- a/packages/zowe-explorer/l10n/poeditor.json +++ b/packages/zowe-explorer/l10n/poeditor.json @@ -29,9 +29,6 @@ "zowe.profileManagement": { "Manage Profile": "" }, - "zowe.extRefresh": { - "Refresh Zowe Explorer": "" - }, "zowe.editHistory": { "Edit History": "" }, diff --git a/packages/zowe-explorer/package.json b/packages/zowe-explorer/package.json index 185a1461cd..9d85457140 100644 --- a/packages/zowe-explorer/package.json +++ b/packages/zowe-explorer/package.json @@ -111,11 +111,6 @@ "key": "delete", "when": "focusedView == zowe.uss.explorer" }, - { - "command": "zowe.extRefresh", - "key": "ctrl+alt+z", - "mac": "cmd+alt+z" - }, { "command": "zowe.editHistory", "key": "ctrl+alt+y", @@ -168,15 +163,6 @@ "title": "%zowe.profileManagement%", "category": "Zowe Explorer" }, - { - "command": "zowe.extRefresh", - "title": "%zowe.extRefresh%", - "category": "Zowe Explorer", - "icon": { - "light": "./resources/light/refresh.svg", - "dark": "./resources/dark/refresh.svg" - } - }, { "command": "zowe.editHistory", "title": "%zowe.editHistory%", diff --git a/packages/zowe-explorer/package.nls.json b/packages/zowe-explorer/package.nls.json index fe569e4476..b21aa2e228 100644 --- a/packages/zowe-explorer/package.nls.json +++ b/packages/zowe-explorer/package.nls.json @@ -9,7 +9,6 @@ "zowe.placeholderCommand": "Placeholder", "zowe.promptCredentials": "Update Credentials", "zowe.profileManagement": "Manage Profile", - "zowe.extRefresh": "Refresh Zowe Explorer", "zowe.editHistory": "Edit History", "zowe.ds.explorer": "Data Sets", "zowe.uss.explorer": "Unix System Services (USS)", diff --git a/packages/zowe-explorer/src/configuration/Constants.ts b/packages/zowe-explorer/src/configuration/Constants.ts index 590773222f..f2643a3504 100644 --- a/packages/zowe-explorer/src/configuration/Constants.ts +++ b/packages/zowe-explorer/src/configuration/Constants.ts @@ -17,7 +17,7 @@ import type { Profiles } from "./Profiles"; export class Constants { public static CONFIG_PATH: string; - public static readonly COMMAND_COUNT = 100; + public static readonly COMMAND_COUNT = 99; public static readonly MAX_SEARCH_HISTORY = 5; public static readonly MAX_FILE_HISTORY = 10; public static readonly MS_PER_SEC = 1000; diff --git a/packages/zowe-explorer/src/extension.ts b/packages/zowe-explorer/src/extension.ts index d4e39adac3..0eceaab8d0 100644 --- a/packages/zowe-explorer/src/extension.ts +++ b/packages/zowe-explorer/src/extension.ts @@ -50,7 +50,6 @@ export async function activate(context: vscode.ExtensionContext): Promise Promise, - deactivate: () => Promise - ): void { - ZoweLogger.trace("shared.init.registerRefreshCommand called."); - // set a command to silently reload extension - context.subscriptions.push( - vscode.commands.registerCommand("zowe.extRefresh", async () => { - await deactivate(); - for (const sub of context.subscriptions) { - try { - await sub.dispose(); - } catch (e) { - ZoweLogger.error(e); - } - } - await activate(context); - }) - ); - } - public static registerCommonCommands(context: vscode.ExtensionContext, providers: Definitions.IZoweProviders): void { ZoweLogger.trace("shared.init.registerCommonCommands called."); From 86096c634ef244e9c063b90508e638e5936dc8c6 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:44:35 -0400 Subject: [PATCH 2/4] log FTP activation instead of pop up message Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer-ftp-extension/src/extension.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zowe-explorer-ftp-extension/src/extension.ts b/packages/zowe-explorer-ftp-extension/src/extension.ts index ba46231d73..83316c24e0 100644 --- a/packages/zowe-explorer-ftp-extension/src/extension.ts +++ b/packages/zowe-explorer-ftp-extension/src/extension.ts @@ -44,7 +44,7 @@ async function registerFtpApis(): Promise { await zoweExplorerApi.getExplorerExtenderApi().initForZowe(pType, schema); await zoweExplorerApi.getExplorerExtenderApi().reloadProfiles(pType); - await Gui.showMessage("Zowe Explorer was modified for FTP support.", { logger: globals.LOGGER }); + globals.LOGGER.logImperativeMessage("Zowe Explorer was modified for FTP support.", MessageSeverity.INFO); return true; } From 8e2d1e5f91ecc49d82714f6441d683f15520b536 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:55:02 -0400 Subject: [PATCH 3/4] add CHANGELOGs Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer-ftp-extension/CHANGELOG.md | 2 ++ packages/zowe-explorer/CHANGELOG.md | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md index b4f8a16022..0d4ec87979 100644 --- a/packages/zowe-explorer-ftp-extension/CHANGELOG.md +++ b/packages/zowe-explorer-ftp-extension/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum ### Bug fixes +- Removed popup notification of successful registration with Zowe Explorer and log the success instead. [#2862](https://github.com/zowe/zowe-explorer-vscode/issues/2862) + ## `3.0.0-next.202409132122` ### New features and enhancements diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index aade4fd1aa..80cfc95dbb 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -14,6 +14,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen - Fix issue with extender profiles not being included in fresh team configuration file. [#3122](https://github.com/zowe/zowe-explorer-vscode/issues/3122) - Fixed issue where file extensions were removed from data sets, causing language detection to sometimes fail for Zowe Explorer extenders. [#3121](https://github.com/zowe/zowe-explorer-vscode/issues/3121) - Fixed an issue where copying and pasting a file/folder in the USS tree would fail abruptly, displaying an error. [#3128](https://github.com/zowe/zowe-explorer-vscode/issues/3128) +- Removal of broken VSC command to `Zowe Explorer: Refresh Zowe Explorer`, use VS Code's `Extensions: Refresh` command instead. [#3100](https://github.com/zowe/zowe-explorer-vscode/issues/3100) ## `3.0.0-next.202409132122` From b24a800be0715d06f35dca1d8d27e873a1a190f5 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:29:52 -0400 Subject: [PATCH 4/4] remove unused import Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../__tests__/__unit__/trees/shared/SharedInit.unit.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts b/packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts index 843398d7a3..7a54f6aaa8 100644 --- a/packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts +++ b/packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts @@ -18,7 +18,6 @@ import { Constants } from "../../../../src/configuration/Constants"; import { Profiles } from "../../../../src/configuration/Profiles"; import { SharedActions } from "../../../../src/trees/shared/SharedActions"; import { LocalFileManagement } from "../../../../src/management/LocalFileManagement"; -import { ZoweLogger } from "../../../../src/tools/ZoweLogger"; import { ZoweExplorerApiRegister } from "../../../../src/extending/ZoweExplorerApiRegister"; import { SharedInit } from "../../../../src/trees/shared/SharedInit"; import { TsoCommandHandler } from "../../../../src/commands/TsoCommandHandler";