Add Deploy to Container App with Copilot command (#965)

Author: motm32

package.json

@@ -95,6 +95,11 @@
                 "title": "%containerApps.deployContainerApp%",
                 "category": "Azure Container Apps"
             },
+            {
+                "command": "containerApps.deployContainerAppWithCopilot",
+                "title": "%containerApps.deployContainerAppWithCopilot%",
+                "category": "Azure Container Apps"
+            },
             {
                 "command": "containerApps.deleteContainerApp",
                 "title": "%containerApps.deleteContainerApp%",
@@ -383,6 +388,11 @@
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single/i",
                     "group": "2@1"
                 },
+                {
+                    "command": "containerApps.deployContainerAppWithCopilot",
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single/i",
+                    "group": "2@2"
+                },
                 {
                     "command": "containerApps.deployRevisionDraft",
                     "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /containerAppItem(.*)revisionMode:single(.*)unsavedChanges:true/i",

package.nls.json

@@ -25,6 +25,7 @@
     "containerApps.deployWorkspaceProject": "Deploy Project from Workspace...",
     "containerApps.deployWorkspaceProjectApi": "Deploy Project from Workspace (API)...",
     "containerApps.deployContainerApp": "Deploy to Container App...",
+    "containerApps.deployContainerAppWithCopilot": "Deploy to Container App with Copilot...",
     "containerApps.deleteContainerApp": "Delete Container App...",
     "containerApps.disableIngress": "Disable Ingress for Container App",
     "containerApps.enableIngress": "Enable Ingress for Container App...",

src/commands/copilot/deployWithCopilot.ts

@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { CopilotUserInput, type IActionContext } from "@microsoft/vscode-azext-utils";
+import * as vscode from 'vscode';
+import { type ContainerAppItem } from "../../tree/ContainerAppItem";
+import { SharedState } from "../../webviews/OpenConfirmationViewStep";
+import { deployContainerApp } from "../deployContainerApp/deployContainerApp";
+
+export async function deployWithCopilot(context: IActionContext, node: ContainerAppItem): Promise<void> {
+    context.ui = new CopilotUserInput(vscode, JSON.stringify(node.viewProperties), () => SharedState.currentPanel);
+    await deployContainerApp(context, node);
+}

src/commands/deployContainerApp/deployContainerApp.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KnownActiveRevisionsMode } from "@azure/arm-appcontainers";
-import { AzureWizard, createSubscriptionContext, nonNullProp, type IActionContext, type ISubscriptionActionContext, type ISubscriptionContext } from "@microsoft/vscode-azext-utils";
+import { AzureWizard, CopilotUserInput, createSubscriptionContext, nonNullProp, type AzureWizardPromptStep, type IActionContext, type ISubscriptionActionContext, type ISubscriptionContext } from "@microsoft/vscode-azext-utils";
 import { ImageSource } from "../../constants";
 import { type ContainerAppItem } from "../../tree/ContainerAppItem";
 import { createActivityContext } from "../../utils/activityUtils";
@@ -14,6 +14,7 @@ import { getVerifyProvidersStep } from "../../utils/getVerifyProvidersStep";
 import { localize } from "../../utils/localize";
 import { pickContainerApp } from "../../utils/pickItem/pickContainerApp";
 import { OpenConfirmationViewStep } from "../../webviews/OpenConfirmationViewStep";
+import { OpenLoadingViewStep } from "../../webviews/OpenLoadingViewStep";
 import { CommandAttributes } from "../CommandAttributes";
 import { ContainerAppOverwriteConfirmStep } from "../ContainerAppOverwriteConfirmStep";
 import { deployWorkspaceProject } from "../deployWorkspaceProject/deployWorkspaceProject";
@@ -60,18 +61,28 @@ export async function deployContainerApp(context: IActionContext, node?: Contain
     wizardContext.telemetry.properties.revisionMode = item.containerApp.revisionsMode;
 
     const confirmationViewTitle: string = localize('summary', 'Summary');
-    const confirmationViewDescription: string = localize('viewDescription', 'Please select an input you would like to change. Note: Any input proceeding the changed input may need to change as well');
-    const confirmationViewTabTitle: string = localize('deployContainerAppTabTitle', 'Summary - Deploy Image to Container App');
-    const title: string = localize('deployContainerAppTitle', 'Deploy image to container app');
+    let confirmationViewDescription: string = localize('viewDescription', 'Please select an input you would like to change. Note: Any input proceeding the changed input will need to change as well');
+    let confirmationViewTabTitle: string = localize('deployContainerAppTabTitle', 'Summary - Deploy Image to Container App');
+    let title: string = localize('deployContainerAppTitle', 'Deploy image to container app');
+
+    const promptSteps: AzureWizardPromptStep<ContainerAppDeployContext>[] = []
+    if (wizardContext.ui instanceof CopilotUserInput) {
+        promptSteps.push(new OpenLoadingViewStep());
+        confirmationViewDescription = localize('viewDescription', 'Please review AI generated inputs and select any you would like to modify. Note: Any input proceeding the modified input will need to change as well');
+        confirmationViewTabTitle = localize('deployContainerAppTabTitle', 'Summary - Deploy Image to Container App using Copilot');
+        title = localize('deployContainerAppWithCopilotTitle', 'Deploy image to container app using copilot');
+    }
+
+    promptSteps.push(
+        new ContainerAppDeployStartingResourcesLogStep(),
+        new ImageSourceListStep(),
+        new ContainerAppOverwriteConfirmStep(),
+        new OpenConfirmationViewStep(confirmationViewTitle, confirmationViewTabTitle, confirmationViewDescription, title, () => wizard.confirmationViewProperties)
+    );
 
     const wizard: AzureWizard<ContainerAppDeployContext> = new AzureWizard(wizardContext, {
         title: title,
-        promptSteps: [
-            new ContainerAppDeployStartingResourcesLogStep(),
-            new ImageSourceListStep(),
-            new ContainerAppOverwriteConfirmStep(),
-            new OpenConfirmationViewStep(confirmationViewTitle, confirmationViewTabTitle, confirmationViewDescription, title, () => wizard.confirmationViewProperties)
-        ],
+        promptSteps: promptSteps,
         executeSteps: [
             getVerifyProvidersStep<ContainerAppDeployContext>(),
             new ContainerAppUpdateStep(),

src/commands/registerCommands.ts

@@ -7,6 +7,7 @@ import { registerCommand, registerCommandWithTreeNodeUnwrapping, registerErrorHa
 import { type EnvironmentVariableItem } from '../tree/containers/EnvironmentVariableItem';
 import { deployImageApiCompat } from './api/deployImageApi';
 import { browseContainerAppNode } from './browseContainerApp';
+import { deployWithCopilot } from './copilot/deployWithCopilot';
 import { createContainerApp } from './createContainerApp/createContainerApp';
 import { createManagedEnvironment } from './createManagedEnvironment/createManagedEnvironment';
 import { deleteContainerApp } from './deleteContainerApp/deleteContainerApp';
@@ -87,6 +88,7 @@ export function registerCommands(): void {
     registerCommandWithTreeNodeUnwrapping('containerApps.deployRevisionDraft', deployRevisionDraft);
     registerCommandWithTreeNodeUnwrapping('containerApps.deployWorkspaceProject', deployWorkspaceProject);
     registerCommandWithTreeNodeUnwrapping('containerApps.deployContainerApp', deployContainerApp);
+    registerCommandWithTreeNodeUnwrapping('containerApps.deployContainerAppWithCopilot', deployWithCopilot);
 
     // github
     registerCommandWithTreeNodeUnwrapping('containerApps.connectToGitHub', connectToGitHub);

src/webviews/LoadingView.tsx

@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Spinner } from "@fluentui/react-components";
+import './loadingView.scss';
+
+export const LoadingView = () =>
+    <div className='loadingView'>
+        <Spinner labelPosition="below" label="Generating Copilot responses..." />
+    </div>
+

src/webviews/LoadingViewController.ts

@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { ViewColumn } from "vscode";
+import { ext } from "../extensionVariables";
+import { WebviewController } from "./extension-server/WebviewController";
+
+export type LoadingViewControllerType = {
+    title: string;
+}
+
+export class LoadingViewController extends WebviewController<LoadingViewControllerType> {
+    constructor(viewConfiguration: LoadingViewControllerType) {
+        super(ext.context, viewConfiguration.title, 'loadingView', viewConfiguration, ViewColumn.Active);
+    }
+}

src/webviews/OpenConfirmationViewStep.ts

@@ -3,8 +3,9 @@
 *  Licensed under the MIT License. See License.md in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { AzureWizardPromptStep, GoBackError, openUrl, UserCancelledError, type ConfirmationViewProperty, type IActionContext } from "@microsoft/vscode-azext-utils";
+import { AzExtUserInput, AzureWizardPromptStep, CopilotUserInput, GoBackError, openUrl, UserCancelledError, type ConfirmationViewProperty, type IActionContext } from "@microsoft/vscode-azext-utils";
 import * as vscode from 'vscode';
+import { type WebviewPanel } from 'vscode';
 import { localize } from "../utils/localize";
 import { ConfirmationViewController } from "./ConfirmationViewController";
 
@@ -13,6 +14,7 @@ export const SharedState = {
     cancelled: true,
     copilotClicked: false,
     editingPicks: false,
+    currentPanel: undefined as WebviewPanel | undefined,
 };
 
 export class OpenConfirmationViewStep<T extends IActionContext> extends AzureWizardPromptStep<T> {
@@ -32,6 +34,11 @@ export class OpenConfirmationViewStep<T extends IActionContext> extends AzureWiz
     }
 
     public async prompt(context: T): Promise<void> {
+        if (SharedState.currentPanel) {
+            SharedState.currentPanel.dispose();
+            SharedState.currentPanel = undefined;
+        }
+
         const confirmationView = new ConfirmationViewController({
             title: this.title,
             tabTitle: this.tabTitle,
@@ -48,6 +55,9 @@ export class OpenConfirmationViewStep<T extends IActionContext> extends AzureWiz
                     if (SharedState.itemsToClear > 0) {
                         context.telemetry.properties.editingPicks = 'true';
                         SharedState.editingPicks = true;
+                        if (context.ui instanceof CopilotUserInput) {
+                            context.ui = new AzExtUserInput(context);
+                        }
                         throw new GoBackError(SharedState.itemsToClear);
                     }
 

src/webviews/OpenLoadingViewStep.ts

@@ -0,0 +1,22 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.md in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { AzureWizardPromptStep, type IActionContext } from "@microsoft/vscode-azext-utils";
+import * as vscode from 'vscode';
+import { localize } from "../utils/localize";
+import { LoadingViewController } from "./LoadingViewController";
+import { SharedState } from "./OpenConfirmationViewStep";
+
+export class OpenLoadingViewStep<T extends IActionContext> extends AzureWizardPromptStep<T> {
+    public async prompt(): Promise<void> {
+        const loadingView = new LoadingViewController({ title: localize('loadingViewTitle', 'Loading...') });
+        loadingView.revealToForeground(vscode.ViewColumn.Active);
+        SharedState.currentPanel = loadingView.panel;
+    }
+
+    public shouldPrompt(): boolean {
+        return true;
+    }
+}

src/webviews/WebviewRegistry.ts

@@ -4,7 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ConfirmationView } from "./ConfirmationView";
+import { LoadingView } from "./LoadingView";
 
 export const WebviewRegistry = {
-    confirmationView: ConfirmationView
+    confirmationView: ConfirmationView,
+    loadingView: LoadingView
 } as const;