chore: revise extension install UX

Author: FluoriteCafe-work

src/upgrade/upgradeManager.ts

@@ -11,7 +11,7 @@ import { Commands } from "../commands";
 import notificationManager from "./display/notificationManager";
 import { Settings } from "../settings";
 import assessmentManager from "./assessmentManager";
-import { checkOrInstallExtension } from "./utility";
+import { checkOrPromptToInstallAppModExtension } from "./utility";
 
 const DEFAULT_UPGRADE_PROMPT = "Upgrade Java project dependency to latest version.";
 
@@ -24,14 +24,22 @@ class UpgradeManager {
     public static initialize(context: ExtensionContext) {
         notificationManager.initialize(context);
 
-        // Commands to be used
+        // Upgrade project
         context.subscriptions.push(instrumentOperationAsVsCodeCommand(Commands.JAVA_UPGRADE_WITH_COPILOT, async (promptText?: string) => {
-            await checkOrInstallExtension(ExtensionName.APP_MODERNIZATION_UPGRADE_FOR_JAVA, ExtensionName.APP_MODERNIZATION_FOR_JAVA);
+            await checkOrPromptToInstallAppModExtension(
+                ExtensionName.APP_MODERNIZATION_UPGRADE_FOR_JAVA,
+                "To upgrade the Java project, we need to use the App Modernization extension.",
+                "Install extension and upgrade");
             const promptToUse = promptText ?? DEFAULT_UPGRADE_PROMPT;
             await commands.executeCommand(Commands.GOTO_AGENT_MODE, { prompt: promptToUse });
         }));
+
+        // Show modernization view
         context.subscriptions.push(instrumentOperationAsVsCodeCommand(Commands.VIEW_MODERNIZE_JAVA_PROJECT, async () => {
-            await checkOrInstallExtension(ExtensionName.APP_MODERNIZATION_FOR_JAVA);
+            await checkOrPromptToInstallAppModExtension(
+                ExtensionName.APP_MODERNIZATION_FOR_JAVA,
+                "To modernize the Java project, we need to use the App Modernization extension.",
+                "Install extension and modernize");
             await commands.executeCommand("workbench.view.extension.azureJavaMigrationExplorer");
         }));
 

src/upgrade/utility.ts

@@ -4,7 +4,7 @@
 import { commands, extensions, Uri, window } from "vscode";
 import * as semver from "semver";
 import { UpgradeReason, type UpgradeIssue } from "./type";
-import { Upgrade } from "../constants";
+import { ExtensionName, Upgrade } from "../constants";
 
 
 function findEolDate(currentVersion: string, eolDate: Record<string, string>): string | null {
@@ -73,38 +73,33 @@ export function normalizePath(path: string): string {
     return Uri.parse(path).toString();
 }
 
-export async function checkOrInstallExtension(extensionIdToCheck: string, extensionIdToInstall?: string): Promise<void> {
+export async function checkOrPromptToInstallAppModExtension(
+    extensionIdToCheck: string,
+    notificationText: string,
+    buttonText: string): Promise<void> {
     if (extensions.getExtension(extensionIdToCheck)) {
         return;
     }
 
-    const actualExtensionIdToInstall = extensionIdToInstall ?? extensionIdToCheck;
-
-    {
-        const BTN_TEXT = "Install extension";
-        const choice = await window.showInformationMessage(
-            "An extension is needed for the feature to work. Please install it and try again.",
-            BTN_TEXT
-        );
-        if (choice === BTN_TEXT) {
-            await commands.executeCommand("workbench.extensions.installExtension", actualExtensionIdToInstall);
-        }
+    const choice = await window.showInformationMessage(notificationText, buttonText);
+    if (choice === buttonText) {
+        await commands.executeCommand("workbench.extensions.installExtension", ExtensionName.APP_MODERNIZATION_FOR_JAVA);
+    } else {
+        return;
     }
 
-    if (extensions.getExtension(actualExtensionIdToInstall)) {
+    if (extensions.getExtension(ExtensionName.APP_MODERNIZATION_FOR_JAVA)) {
         return;
     }
 
     // In this case the extension is disabled.
-    await commands.executeCommand("workbench.extensions.search", actualExtensionIdToInstall);
-    {
-        const BTN_TEXT = "Show extension in sidebar";
-        const choice = await window.showInformationMessage(
-            "An extension is needed for the feature to work but it seems disabled. Please enable it manually and try again.",
-            BTN_TEXT
-        );
-        if (choice === BTN_TEXT) {
-            await commands.executeCommand("workbench.extensions.search", actualExtensionIdToInstall);
-        }
+    await commands.executeCommand("workbench.extensions.search", ExtensionName.APP_MODERNIZATION_FOR_JAVA);
+    const BTN_TEXT = "Show extension in sidebar";
+    const choice2 = await window.showInformationMessage(
+        "App Modernization extension is needed for the feature to work but it seems disabled. Please enable it manually and try again.",
+        BTN_TEXT
+    );
+    if (choice2 === BTN_TEXT) {
+        await commands.executeCommand("workbench.extensions.search", ExtensionName.APP_MODERNIZATION_FOR_JAVA);
     }
 }