Update disconnectRepo and add a new confirm prompt step (#434)

Author: MicroFish91

src/commands/gitHub/disconnectRepo/DisconnectRepositoryConfirmStep.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { gitHubUrlParse } from "@microsoft/vscode-azext-github";
+import { AzureWizardPromptStep, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
+import { localize } from "../../../utils/localize";
+import type { IDisconnectRepoContext } from "./IDisconnectRepoContext";
+
+export class DisconnectRepositoryConfirmStep extends AzureWizardPromptStep<IDisconnectRepoContext> {
+    public async prompt(context: IDisconnectRepoContext): Promise<void> {
+        const { ownerOrOrganization: owner, repositoryName: repo } = gitHubUrlParse(nonNullValueAndProp(context.sourceControl, 'repoUrl'));
+
+        await context.ui.showWarningMessage(
+            localize('disconnectRepositoryWarning', 'Disconnect from GitHub repository "{0}"? \n\nThis will not affect your container app\'s active deployment. You may reconnect a repository at any time.', `${owner}/${repo}`),
+            { modal: true },
+            { title: localize('continue', 'Continue') }
+        );
+    }
+
+    public shouldPrompt(context: IDisconnectRepoContext): boolean {
+        return !!context.sourceControl;
+    }
+}

src/commands/gitHub/disconnectRepo/GitHubRepositoryDisconnectStep.ts

@@ -3,24 +3,22 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { ContainerAppsAPIClient, SourceControl } from "@azure/arm-appcontainers";
+import type { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
 import { gitHubUrlParse } from "@microsoft/vscode-azext-github";
-import { AzureWizardExecuteStep, nonNullProp, nonNullValue } from "@microsoft/vscode-azext-utils";
+import { AzureWizardExecuteStep, nonNullProp, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
 import type { Progress } from "vscode";
 import { ext } from "../../../extensionVariables";
 import { createContainerAppsClient } from "../../../utils/azureClients";
 import { localize } from "../../../utils/localize";
-import { getContainerAppSourceControl } from "../connectToGitHub/getContainerAppSourceControl";
 import type { IDisconnectRepoContext } from "./IDisconnectRepoContext";
 
 export class GitHubRepositoryDisconnectStep extends AzureWizardExecuteStep<IDisconnectRepoContext> {
     public priority: number = 300;
 
     public async execute(context: IDisconnectRepoContext, progress: Progress<{ message?: string | undefined; increment?: number | undefined }>): Promise<void> {
         const client: ContainerAppsAPIClient = await createContainerAppsClient(context, context.subscription);
-        const sourceControl: SourceControl | undefined = await getContainerAppSourceControl(context, context.subscription, context.containerApp);
 
-        const { ownerOrOrganization: owner, repositoryName: repo } = gitHubUrlParse(nonNullValue(sourceControl?.repoUrl));
+        const { ownerOrOrganization: owner, repositoryName: repo } = gitHubUrlParse(nonNullValueAndProp(context.sourceControl, 'repoUrl'));
 
         const rgName: string = context.containerApp.resourceGroup;
         const caName: string = context.containerApp.name;
@@ -42,7 +40,7 @@ export class GitHubRepositoryDisconnectStep extends AzureWizardExecuteStep<IDisc
         ext.outputChannel.appendLog(disconnected);
     }
 
-    public shouldExecute(): boolean {
-        return true;
+    public shouldExecute(context: IDisconnectRepoContext): boolean {
+        return !!context.sourceControl;
     }
 }

src/commands/gitHub/disconnectRepo/IDisconnectRepoContext.ts

@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import type { SourceControl } from "@azure/arm-appcontainers";
 import type { GitHubContext } from "@microsoft/vscode-azext-github";
 import type { ExecuteActivityContext } from "@microsoft/vscode-azext-utils";
 import type { ContainerAppModel } from "../../../tree/ContainerAppItem";
@@ -11,4 +12,5 @@ import type { IContainerAppContext } from "../../IContainerAppContext";
 export interface IDisconnectRepoContext extends IContainerAppContext, GitHubContext, ExecuteActivityContext {
     // Make containerApp _required_
     containerApp: ContainerAppModel;
+    sourceControl?: SourceControl;
 }

src/commands/gitHub/disconnectRepo/disconnectRepo.ts

@@ -4,17 +4,18 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { getGitHubAccessToken } from "@microsoft/vscode-azext-github";
-import { AzureWizard, AzureWizardExecuteStep, ITreeItemPickerContext, createSubscriptionContext } from "@microsoft/vscode-azext-utils";
+import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, ITreeItemPickerContext, createSubscriptionContext } from "@microsoft/vscode-azext-utils";
 import { ContainerAppsItem } from "../../../tree/ContainerAppsBranchDataProvider";
 import { ActionsItem } from "../../../tree/configurations/ActionsItem";
 import { createActivityContext } from "../../../utils/activityUtils";
 import { localize } from "../../../utils/localize";
 import { pickContainerApp } from "../../../utils/pickItem/pickContainerApp";
-import { isGitHubConnected } from "../connectToGitHub/isGitHubConnected";
+import { getContainerAppSourceControl } from "../connectToGitHub/getContainerAppSourceControl";
+import { DisconnectRepositoryConfirmStep } from "./DisconnectRepositoryConfirmStep";
 import { GitHubRepositoryDisconnectStep } from "./GitHubRepositoryDisconnectStep";
 import { IDisconnectRepoContext } from "./IDisconnectRepoContext";
 
-export async function disconnectRepo(context: ITreeItemPickerContext & Partial<IDisconnectRepoContext>, node?: ContainerAppsItem | ActionsItem): Promise<void> {
+export async function disconnectRepo(context: ITreeItemPickerContext, node?: ContainerAppsItem | ActionsItem): Promise<void> {
     if (!node) {
         context.suppressCreatePick = true;
         node = await pickContainerApp(context);
@@ -28,27 +29,30 @@ export async function disconnectRepo(context: ITreeItemPickerContext & Partial<I
         ...await createActivityContext(),
         subscription,
         containerApp,
-        gitHubAccessToken: await getGitHubAccessToken()
+        gitHubAccessToken: await getGitHubAccessToken(),
+        sourceControl: await getContainerAppSourceControl(context, subscription, containerApp)
     };
 
-    if (!await isGitHubConnected(wizardContext)) {
+    if (!wizardContext.sourceControl) {
         throw new Error(localize('repositoryNotConnected', '"{0}" is not connected to a GitHub repository.', containerApp.name));
     }
 
-    const title: string = localize('disconnectRepository', 'Disconnect "{0}" from a GitHub repository', containerApp.name);
+    const promptSteps: AzureWizardPromptStep<IDisconnectRepoContext>[] = [
+        new DisconnectRepositoryConfirmStep()
+    ];
 
     const executeSteps: AzureWizardExecuteStep<IDisconnectRepoContext>[] = [
         new GitHubRepositoryDisconnectStep()
     ];
 
     const wizard: AzureWizard<IDisconnectRepoContext> = new AzureWizard(wizardContext, {
-        title,
+        title: localize('disconnectRepository', 'Disconnect "{0}" from a GitHub repository', containerApp.name),
+        promptSteps,
         executeSteps,
         showLoadingPrompt: true
     });
 
-    // Title normally gets set during prompt phase... since no prompt steps are provided we must set the 'activityTitle' manually
-    wizardContext.activityTitle = title;
+    await wizard.prompt();
     await wizard.execute();
 }