newest iteration; 3/12

Author: eleanorjboyd

src/features/packageManagement.ts

@@ -1,4 +1,3 @@
-import { window } from 'vscode';
 import { traceInfo } from '../common/logging';
 import { getCallingExtension } from '../common/utils/frameUtils';
 import { getConfiguration } from '../common/workspace.apis';
@@ -49,10 +48,9 @@ export async function packageManagementFlow(packages: string[]): Promise<void> {
     if (!isConfigured) {
         // calling extension has no config, user has no wildcard setup
         // prompt user to "alwaysAsk" or "alwaysAllow"
-        const selectedOption = await promptForInstallPermissions(callingExtension, packages.join(', '));
+        const selectedOption = await promptForInstallPermissions(callingExtension, packages);
         if (selectedOption === InstallPermissionEnum.Cancel) {
             // user cancelled the prompt, exit
-            window.showErrorMessage(`Installation of ${packages.join(', ')} was canceled by the user.`);
             return Promise.reject('User cancelled the package installation.');
         }
         if (selectedOption !== InstallPermissionEnum.InstallNoConfigure) {
@@ -65,10 +63,9 @@ export async function packageManagementFlow(packages: string[]): Promise<void> {
         if (callingExtensionTrustLevel === InstallPermissionEnum.AlwaysAsk) {
             traceInfo('Installation is pending user confirmation due to permission settings.');
             // prompt user to allow or deny package installation
-            const simpleResponse = await promptForAlwaysAsk(callingExtension, packages.join(', '));
+            const simpleResponse = await promptForAlwaysAsk(callingExtension, packages);
             if (simpleResponse === SimpleResponseEnum.NoInstall || simpleResponse === SimpleResponseEnum.Cancel) {
                 // user cancelled the prompt, exit
-                window.showErrorMessage(`Installation of ${packages.join(', ')} was canceled by the user.`);
                 return Promise.reject('User cancelled the package installation.');
             }
         }

src/features/utils.ts

@@ -5,37 +5,53 @@ export type SettingsPackageTrust = {
     [key: string]: InstallPermissionEnum.AlwaysAllow | InstallPermissionEnum.AlwaysAsk;
 };
 
-export const ALWAYS_ALLOW = 'Always allow installs';
-export const ALWAYS_ASK = 'Always ask before installing';
+export const ALWAYS_ALLOW = 'Always allow';
+export const ALWAYS_ASK = 'Ask every time';
 export const INSTALL_NO_CONFIGURE = 'Install without configuring permissions';
 
 export const YES_INSTALL = 'Yes, Install';
 export const NO_INSTALL = 'Do Not Install';
 
-export function promptForInstallPermissions(extensionName: string, packages: string): Thenable<InstallPermissionEnum> {
+export function promptForInstallPermissions(
+    extensionName: string,
+    packages: string[],
+): Thenable<InstallPermissionEnum> {
+    const extName = extensionName.split('.')[1];
+    if (packages.length < 1) {
+        return Promise.reject('No packages to install.');
+    }
+    let detailStr = `'${extensionName}' wants to install the package '${packages[0]}'.`;
+    if (packages.length > 1) {
+        detailStr = `'${extensionName}' wants to install packages '${packages.join(', ')}'.`;
+    }
+    detailStr = `Set permissions for this and future package installations from '${extensionName}'.`;
     return new Promise((resolve) => {
         window
             .showInformationMessage(
-                'Would you like to set permissions for future package installs from the ' + extensionName + ' extension?',
+                `Allow extension '${extName}' to install packages?`,
                 {
-                    detail: `package/s: "${packages}"`,
+                    detail: detailStr,
                     modal: true,
                 },
                 ALWAYS_ASK,
                 ALWAYS_ALLOW,
-                INSTALL_NO_CONFIGURE,
             )
             .then((selectedOption) => {
                 switch (selectedOption) {
                     case ALWAYS_ALLOW:
+                        window.showInformationMessage(
+                            `${extName} extension installed ${packages.join(', ')} package and is always allowed to install in the future.`,
+                            'Configure'
+                        ).then((selection) => {
+                            if (selection === 'Configure') {
+                                // Add logic to open the configuration settings
+                            }
+                        });
                         resolve(InstallPermissionEnum.AlwaysAllow);
                         break;
                     case ALWAYS_ASK:
                         resolve(InstallPermissionEnum.AlwaysAsk);
                         break;
-                    case INSTALL_NO_CONFIGURE:
-                        resolve(InstallPermissionEnum.InstallNoConfigure);
-                        break;
                     default:
                         resolve(InstallPermissionEnum.Cancel);
                         break;
@@ -44,13 +60,21 @@ export function promptForInstallPermissions(extensionName: string, packages: str
     });
 }
 
-export function promptForAlwaysAsk(extensionName: string, packages: string): Thenable<string | undefined> {
+export function promptForAlwaysAsk(extensionName: string, packages: string[]): Thenable<string | undefined> {
+    const extName = extensionName.split('.')[1];
+    if (packages.length < 1) {
+        return Promise.reject('No packages to install.');
+    }
+    let detailStr = `${extName} wants to install '${packages[0]}' package.`;
+    if (packages.length > 1) {
+        detailStr = `${extName} wants to install '${packages.join(', ')}' packages.`;
+    }
     return new Promise((resolve) => {
         window
             .showInformationMessage(
-                'Do you want to install the following package/s from the ' + extensionName + ' extension?',
+                `Allow ${extName} to Install Packages?`,
                 {
-                    detail: `package/s: "${packages}"`,
+                    detail: detailStr,
                     modal: true,
                 },
                 YES_INSTALL,