Add a conditional revision draft deploy pop-up (#478)

MicroFish91 · web-flow · commit 8b6a8e789618 · 2023-10-11T17:16:29.000-07:00
diff --git a/package.json b/package.json
@@ -522,6 +522,11 @@
                             "%containerApps.deleteConfirmation.ClickButton%"
                         ],
                         "default": "EnterName"
+                    },
+                    "containerApps.showDraftCommandDeployPopup": {
+                        "type": "boolean",
+                        "description": "%containerApps.showDraftCommandDeployPopup%",
+                        "default": true
                     }
                 }
             }
diff --git a/package.nls.json b/package.nls.json
@@ -4,6 +4,7 @@
     "containerApps.revealResource": "Reveal Resource",
     "containerApps.description": "An Azure Container Apps extension for Visual Studio Code.",
     "containerApps.enableOutputTimestamps": "Prepends each line displayed in the output channel with a timestamp.",
+    "containerApps.showDraftCommandDeployPopup": "Show an informational deploy pop-up message whenever a draft command is run.",
     "containerApps.browse": "Browse",
     "containerApps.createContainerApp": "Create Container App...",
     "containerApps.editContainerApp": "Edit Container App (Advanced)...",
diff --git a/src/commands/image/updateImage/UpdateImageDraftStep.ts b/src/commands/image/updateImage/UpdateImageDraftStep.ts
@@ -22,7 +22,7 @@ export class UpdateImageDraftStep<T extends UpdateImageContext> extends Revision
         super(baseItem);
     }
 
-    public async execute(context: UpdateImageContext, progress: Progress<{ message?: string | undefined; increment?: number | undefined }>): Promise<void> {
+    public async execute(context: T, progress: Progress<{ message?: string | undefined; increment?: number | undefined }>): Promise<void> {
         progress.report({ message: localize('updatingImage', 'Updating image (draft)...') });
 
         this.revisionDraftTemplate.containers = [];
@@ -33,13 +33,13 @@ export class UpdateImageDraftStep<T extends UpdateImageContext> extends Revision
             name: getContainerNameForImage(nonNullProp(context, 'image')) + `-${randomUtils.getRandomHexString(5)}`,
         });
 
-        this.updateRevisionDraftWithTemplate();
+        await this.updateRevisionDraftWithTemplate(context);
 
         const parentResource: ContainerAppModel | Revision = getParentResourceFromItem(this.baseItem);
         ext.outputChannel.appendLog(localize('updatedImage', 'Updated container app "{0}" with image "{1}" (draft).', parentResource.name, context.image));
     }
 
-    public shouldExecute(context: UpdateImageContext): boolean {
+    public shouldExecute(context: T): boolean {
         return !!context.containerApp && !!context.image;
     }
 }
diff --git a/src/commands/revisionDraft/RevisionDraftUpdateBaseStep.ts b/src/commands/revisionDraft/RevisionDraftUpdateBaseStep.ts
@@ -3,14 +3,20 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { type Template } from "@azure/arm-appcontainers";
+import { KnownActiveRevisionsMode, type Template } from "@azure/arm-appcontainers";
 import { AzureWizardExecuteStep, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
-import type { Progress } from "vscode";
+import { ProgressLocation, window, type Progress } from "vscode";
 import { ext } from "../../extensionVariables";
 import { ContainerAppItem } from "../../tree/ContainerAppItem";
+import { RevisionDraftItem } from "../../tree/revisionManagement/RevisionDraftItem";
 import type { RevisionsItemModel } from "../../tree/revisionManagement/RevisionItem";
+import { localize } from "../../utils/localize";
+import { pickContainerAppWithoutPrompt } from "../../utils/pickItem/pickContainerApp";
+import { pickRevisionDraft } from "../../utils/pickItem/pickRevision";
 import { getParentResourceFromItem } from "../../utils/revisionDraftUtils";
+import { settingUtils } from "../../utils/settingUtils";
 import type { IContainerAppContext } from "../IContainerAppContext";
+import { deployRevisionDraft } from "./deployRevisionDraft/deployRevisionDraft";
 
 export abstract class RevisionDraftUpdateBaseStep<T extends IContainerAppContext> extends AzureWizardExecuteStep<T> {
     /**
@@ -29,8 +35,9 @@ export abstract class RevisionDraftUpdateBaseStep<T extends IContainerAppContext
     /**
      * Call this method to upload `revisionDraftTemplate` changes to the container app revision draft
      */
-    protected updateRevisionDraftWithTemplate(): void {
+    protected async updateRevisionDraftWithTemplate(context: T): Promise<void> {
         ext.revisionDraftFileSystem.updateRevisionDraftWithTemplate(this.baseItem, this.revisionDraftTemplate);
+        await this.showRevisionDraftDeployPopup(context);
     }
 
     private initRevisionDraftTemplate(): Template {
@@ -41,4 +48,44 @@ export abstract class RevisionDraftUpdateBaseStep<T extends IContainerAppContext
         }
         return template;
     }
+
+    /**
+     * An informational deploy pop-up to show after executing a revision draft command
+     */
+    private async showRevisionDraftDeployPopup(context: T): Promise<void> {
+        if (!await settingUtils.getGlobalSetting('showDraftCommandDeployPopup')) {
+            return;
+        }
+
+        const yes: string = localize('yes', 'Yes');
+        const no: string = localize('no', 'No');
+        const dontShowAgain: string = localize('dontShowAgain', 'Don\'t show again');
+
+        const message: string = localize('message', 'Would you like to deploy these changes? Click "Yes" to proceed, or "No" to continue making changes.');
+        const buttonMessages: string[] = [yes, no, dontShowAgain];
+
+        void window.showInformationMessage(message, ...buttonMessages).then(async (result: string | undefined) => {
+            if (result === yes) {
+                const item: ContainerAppItem | RevisionDraftItem = await window.withProgress({
+                    location: ProgressLocation.Notification,
+                    cancellable: false,
+                    title: localize('preparingForDeployment', 'Preparing for deployment...')
+                }, async () => {
+                    const containerAppItem: ContainerAppItem = await pickContainerAppWithoutPrompt(context, this.baseItem.containerApp, { showLoadingPrompt: false });
+
+                    if (this.baseItem.containerApp.revisionsMode === KnownActiveRevisionsMode.Single) {
+                        return containerAppItem;
+                    } else {
+                        return await pickRevisionDraft(context, containerAppItem, { showLoadingPrompt: false });
+                    }
+                });
+
+                await deployRevisionDraft(context, item);
+            } else if (result === dontShowAgain) {
+                await settingUtils.updateGlobalSetting('showDraftCommandDeployPopup', false);
+            } else {
+                // Do nothing
+            }
+        });
+    }
 }
diff --git a/src/commands/scaling/scaleRange/ScaleRangeUpdateStep.ts b/src/commands/scaling/scaleRange/ScaleRangeUpdateStep.ts
@@ -18,12 +18,12 @@ export class ScaleRangeUpdateStep<T extends ScaleRangeContext> extends RevisionD
         super(baseItem);
     }
 
-    public async execute(context: ScaleRangeContext): Promise<void> {
+    public async execute(context: T): Promise<void> {
         this.revisionDraftTemplate.scale ||= {};
         this.revisionDraftTemplate.scale.minReplicas = context.newMinRange;
         this.revisionDraftTemplate.scale.maxReplicas = context.newMaxRange;
 
-        this.updateRevisionDraftWithTemplate();
+        await this.updateRevisionDraftWithTemplate(context);
 
         context.scaleMinRange = nonNullProp(context, 'newMinRange');
         context.scaleMaxRange = nonNullProp(context, 'newMaxRange');
@@ -32,7 +32,7 @@ export class ScaleRangeUpdateStep<T extends ScaleRangeContext> extends RevisionD
         ext.outputChannel.appendLog(localize('updatedScaleRange', 'Updated replica scaling range to {0}-{1} for "{2}".', context.newMinRange, context.newMaxRange, parentResourceName));
     }
 
-    public shouldExecute(context: ScaleRangeContext): boolean {
+    public shouldExecute(context: T): boolean {
         return context.newMinRange !== undefined && context.newMaxRange !== undefined;
     }
 }
diff --git a/src/commands/scaling/scaleRule/addScaleRule/AddScaleRuleStep.ts b/src/commands/scaling/scaleRule/addScaleRule/AddScaleRuleStep.ts
@@ -20,23 +20,23 @@ export class AddScaleRuleStep<T extends IAddScaleRuleContext> extends RevisionDr
         super(baseItem);
     }
 
-    public async execute(context: IAddScaleRuleContext): Promise<void> {
+    public async execute(context: T): Promise<void> {
         this.revisionDraftTemplate.scale ||= {};
         this.revisionDraftTemplate.scale.rules ||= [];
 
         context.scaleRule = this.buildRule(context);
         this.integrateRule(context, this.revisionDraftTemplate.scale.rules, context.scaleRule);
-        this.updateRevisionDraftWithTemplate();
+        await this.updateRevisionDraftWithTemplate(context);
 
         const resourceName = getParentResourceFromItem(this.baseItem).name;
         ext.outputChannel.appendLog(localize('addedScaleRule', 'Added {0} rule "{1}" to "{2}" (draft)', context.newRuleType, context.newRuleName, resourceName));
     }
 
-    public shouldExecute(context: IAddScaleRuleContext): boolean {
+    public shouldExecute(context: T): boolean {
         return !!context.newRuleName && !!context.newRuleType;
     }
 
-    private buildRule(context: IAddScaleRuleContext): ScaleRule {
+    private buildRule(context: T): ScaleRule {
         const scaleRule: ScaleRule = { name: context.newRuleName };
         switch (context.newRuleType) {
             case ScaleRuleTypes.HTTP:
@@ -58,7 +58,7 @@ export class AddScaleRuleStep<T extends IAddScaleRuleContext> extends RevisionDr
         return scaleRule;
     }
 
-    private integrateRule(context: IAddScaleRuleContext, scaleRules: ScaleRule[], scaleRule: ScaleRule): void {
+    private integrateRule(context: T, scaleRules: ScaleRule[], scaleRule: ScaleRule): void {
         switch (context.newRuleType) {
             case ScaleRuleTypes.HTTP:
                 // Portal only allows one HTTP rule per revision
diff --git a/src/commands/scaling/scaleRule/addScaleRule/addScaleRule.ts b/src/commands/scaling/scaleRule/addScaleRule/addScaleRule.ts
@@ -39,8 +39,6 @@ export async function addScaleRule(context: IActionContext, node?: ScaleRuleGrou
     });
 
     await wizard.prompt();
-
     wizardContext.activityTitle = localize('addScaleRuleTitle', 'Add {0} rule "{1}" to "{2}" (draft)', wizardContext.newRuleType, wizardContext.newRuleName, parentResource.name);
-
     await wizard.execute();
 }
diff --git a/src/commands/scaling/scaleRule/deleteScaleRule/DeleteScaleRuleStep.ts b/src/commands/scaling/scaleRule/deleteScaleRule/DeleteScaleRuleStep.ts
@@ -17,20 +17,20 @@ export class DeleteScaleRuleStep<T extends ScaleRuleContext> extends RevisionDra
         super(baseItem);
     }
 
-    public async execute(context: ScaleRuleContext): Promise<void> {
+    public async execute(context: T): Promise<void> {
         this.revisionDraftTemplate.scale ||= {};
         this.revisionDraftTemplate.scale.rules ||= [];
 
         const index = this.revisionDraftTemplate.scale.rules.findIndex(r => r.name === nonNullValueAndProp(context.scaleRule, 'name'));
         this.revisionDraftTemplate.scale.rules.splice(index, 1);
 
-        this.updateRevisionDraftWithTemplate();
+        await this.updateRevisionDraftWithTemplate(context);
 
         const resourceName = getParentResourceFromItem(this.baseItem).name;
         ext.outputChannel.appendLog(localize('deletedScaleRule', 'Deleted rule "{0}" to "{1}" (draft)', context.scaleRule?.name, resourceName));
     }
 
-    public shouldExecute(context: ScaleRuleContext): boolean {
+    public shouldExecute(context: T): boolean {
         return !!context.scaleRule;
     }
 }
diff --git a/src/tree/ContainerAppItem.ts b/src/tree/ContainerAppItem.ts
@@ -5,7 +5,7 @@
 
 import { ContainerApp, ContainerAppsAPIClient, KnownActiveRevisionsMode, Revision, Template } from "@azure/arm-appcontainers";
 import { getResourceGroupFromId, uiUtils } from "@microsoft/vscode-azext-azureutils";
-import { AzureWizard, DeleteConfirmationStep, IActionContext, callWithTelemetryAndErrorHandling, createContextValue, createSubscriptionContext, nonNullProp, nonNullValue } from "@microsoft/vscode-azext-utils";
+import { AzureWizard, DeleteConfirmationStep, IActionContext, callWithTelemetryAndErrorHandling, createContextValue, createSubscriptionContext, nonNullProp, nonNullValue, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
 import { AzureSubscription, ViewPropertiesModel } from "@microsoft/vscode-azureresources-api";
 import * as deepEqual from "deep-eql";
 import { TreeItem, TreeItemCollapsibleState, Uri } from "vscode";
@@ -61,8 +61,13 @@ export class ContainerAppItem implements ContainerAppsItem, RevisionsDraftModel
 
     private get contextValue(): string {
         const values: string[] = [ContainerAppItem.contextValue];
+
+        // Enable more granular tree item filtering by container app name
+        values.push(nonNullValueAndProp(this.containerApp, 'name'));
+
         values.push(this.containerApp.revisionsMode === KnownActiveRevisionsMode.Single ? revisionModeSingleContextValue : revisionModeMultipleContextValue);
         values.push(this.hasUnsavedChanges() ? unsavedChangesTrueContextValue : unsavedChangesFalseContextValue);
+
         return createContextValue(values);
     }
 
diff --git a/src/tree/ManagedEnvironmentItem.ts b/src/tree/ManagedEnvironmentItem.ts
@@ -5,7 +5,7 @@
 
 import { ContainerAppsAPIClient, ManagedEnvironment, Resource } from "@azure/arm-appcontainers";
 import { getResourceGroupFromId, uiUtils } from "@microsoft/vscode-azext-azureutils";
-import { IActionContext, callWithTelemetryAndErrorHandling, createSubscriptionContext, nonNullProp } from "@microsoft/vscode-azext-utils";
+import { IActionContext, callWithTelemetryAndErrorHandling, createContextValue, createSubscriptionContext, nonNullProp, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
 import { AzureResource, AzureSubscription } from "@microsoft/vscode-azureresources-api";
 import { TreeItem, TreeItemCollapsibleState } from "vscode";
 import { createContainerAppsAPIClient } from "../utils/azureClients";
@@ -25,6 +25,16 @@ export class ManagedEnvironmentItem implements TreeElementBase {
         this.id = managedEnvironment.id;
     }
 
+    private get contextValue(): string {
+        const values: string[] = [];
+
+        // Enable more granular tree item filtering by environment name
+        values.push(nonNullValueAndProp(this.managedEnvironment, 'name'));
+
+        values.push(ManagedEnvironmentItem.contextValue);
+        return createContextValue(values);
+    }
+
     async getChildren(): Promise<ContainerAppsItem[]> {
         const result = await callWithTelemetryAndErrorHandling('getChildren', async (context) => {
             const containerApps = await ContainerAppItem.List(context, this.subscription, this.id);
@@ -39,7 +49,7 @@ export class ManagedEnvironmentItem implements TreeElementBase {
             label: this.managedEnvironment.name,
             id: this.id,
             iconPath: treeUtils.getIconPath('managed-environment'),
-            contextValue: ManagedEnvironmentItem.contextValue,
+            contextValue: this.contextValue,
             collapsibleState: TreeItemCollapsibleState.Collapsed,
         }
     }
diff --git a/src/utils/pickItem/PickItemOptions.ts b/src/utils/pickItem/PickItemOptions.ts
@@ -15,4 +15,5 @@ export interface RevisionPickItemOptions extends PickItemOptions {
 
 export interface PickItemOptions {
     title?: string;
+    showLoadingPrompt?: boolean;
 }
diff --git a/src/utils/pickItem/pickContainerApp.ts b/src/utils/pickItem/pickContainerApp.ts
@@ -3,23 +3,35 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { AzureResourceQuickPickWizardContext, AzureWizardPromptStep, ContextValueQuickPickStep, IActionContext, QuickPickWizardContext, runQuickPickWizard } from "@microsoft/vscode-azext-utils";
+import { parseAzureResourceId } from "@microsoft/vscode-azext-azureutils";
+import { AzureResourceQuickPickWizardContext, AzureWizardPromptStep, ContextValueQuickPickStep, IActionContext, QuickPickWizardContext, nonNullProp, runQuickPickWizard } from "@microsoft/vscode-azext-utils";
 import { ext } from "../../extensionVariables";
-import { ContainerAppItem } from "../../tree/ContainerAppItem";
+import { ContainerAppItem, ContainerAppModel } from "../../tree/ContainerAppItem";
 import { localize } from "../localize";
 import type { PickItemOptions } from "./PickItemOptions";
 import { getPickEnvironmentSteps } from "./pickEnvironment";
 
+export function getPickContainerAppStep(containerAppName?: string | RegExp): AzureWizardPromptStep<AzureResourceQuickPickWizardContext> {
+    let containerAppFilter: RegExp | undefined;
+    if (containerAppName) {
+        containerAppFilter = containerAppName instanceof RegExp ? containerAppName : new RegExp(containerAppName);
+    } else {
+        containerAppFilter = ContainerAppItem.contextValueRegExp;
+    }
+
+    return new ContextValueQuickPickStep(ext.rgApiV2.resources.azureResourceTreeDataProvider, {
+        contextValueFilter: { include: containerAppFilter },
+        skipIfOne: true,
+    }, {
+        placeHolder: localize('selectContainerApp', 'Select a container app'),
+        noPicksMessage: localize('noContainerApps', 'Selected container apps environment has no apps'),
+    });
+}
+
 export function getPickContainerAppSteps(): AzureWizardPromptStep<AzureResourceQuickPickWizardContext>[] {
     return [
         ...getPickEnvironmentSteps(),
-        new ContextValueQuickPickStep(ext.rgApiV2.resources.azureResourceTreeDataProvider, {
-            contextValueFilter: { include: ContainerAppItem.contextValueRegExp },
-            skipIfOne: true,
-        }, {
-            placeHolder: localize('selectContainerApp', 'Select a container app'),
-            noPicksMessage: localize('noContainerApps', 'Selected container apps environment has no apps'),
-        }),
+        getPickContainerAppStep()
     ];
 }
 
@@ -31,5 +43,23 @@ export async function pickContainerApp(context: IActionContext, options?: PickIt
     return await runQuickPickWizard(context, {
         promptSteps,
         title: options?.title,
+        showLoadingPrompt: options?.showLoadingPrompt
+    });
+}
+
+export async function pickContainerAppWithoutPrompt(
+    context: IActionContext,
+    containerApp: ContainerAppModel,
+    options?: PickItemOptions
+): Promise<ContainerAppItem> {
+    const environmentName: string = parseAzureResourceId(nonNullProp(containerApp, 'environmentId')).resourceName;
+
+    return await runQuickPickWizard(context, {
+        promptSteps: [
+            ...getPickEnvironmentSteps(true /** skipIfOne */, environmentName),
+            getPickContainerAppStep(containerApp.name)
+        ],
+        title: options?.title,
+        showLoadingPrompt: options?.showLoadingPrompt
     });
 }
diff --git a/src/utils/pickItem/pickEnvironment.ts b/src/utils/pickItem/pickEnvironment.ts
diff --git a/src/utils/pickItem/pickRevision.ts b/src/utils/pickItem/pickRevision.ts
diff --git a/src/utils/pickItem/pickScale.ts b/src/utils/pickItem/pickScale.ts
diff --git a/src/utils/pickItem/pickSecret.ts b/src/utils/pickItem/pickSecret.ts
diff --git a/src/utils/settingUtils.ts b/src/utils/settingUtils.ts

Original file line number	Diff line number	Diff line change
`@@ -522,6 +522,11 @@`
`522`	`522`	`"%containerApps.deleteConfirmation.ClickButton%"`
`523`	`523`	`],`
`524`	`524`	`"default": "EnterName"`
	`525`	`+ },`
	`526`	`+ "containerApps.showDraftCommandDeployPopup": {`
	`527`	`+ "type": "boolean",`
	`528`	`+ "description": "%containerApps.showDraftCommandDeployPopup%",`
	`529`	`+ "default": true`
`525`	`530`	`}`
`526`	`531`	`}`
`527`	`532`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ export class UpdateImageDraftStep<T extends UpdateImageContext> extends Revision`
`22`	`22`	`super(baseItem);`
`23`	`23`	`}`
`24`	`24`
`25`		`- public async execute(context: UpdateImageContext, progress: Progress<{ message?: string \| undefined; increment?: number \| undefined }>): Promise<void> {`
	`25`	`+ public async execute(context: T, progress: Progress<{ message?: string \| undefined; increment?: number \| undefined }>): Promise<void> {`
`26`	`26`	`progress.report({ message: localize('updatingImage', 'Updating image (draft)...') });`
`27`	`27`
`28`	`28`	`this.revisionDraftTemplate.containers = [];`
`@@ -33,13 +33,13 @@ export class UpdateImageDraftStep<T extends UpdateImageContext> extends Revision`
`33`	`33`	name: getContainerNameForImage(nonNullProp(context, 'image')) + `-${randomUtils.getRandomHexString(5)}`,
`34`	`34`	`});`
`35`	`35`
`36`		`- this.updateRevisionDraftWithTemplate();`
	`36`	`+ await this.updateRevisionDraftWithTemplate(context);`
`37`	`37`
`38`	`38`	`const parentResource: ContainerAppModel \| Revision = getParentResourceFromItem(this.baseItem);`
`39`	`39`	`ext.outputChannel.appendLog(localize('updatedImage', 'Updated container app "{0}" with image "{1}" (draft).', parentResource.name, context.image));`
`40`	`40`	`}`
`41`	`41`
`42`		`- public shouldExecute(context: UpdateImageContext): boolean {`
	`42`	`+ public shouldExecute(context: T): boolean {`
`43`	`43`	`return !!context.containerApp && !!context.image;`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,12 @@ export class ScaleRangeUpdateStep<T extends ScaleRangeContext> extends RevisionD`
`18`	`18`	`super(baseItem);`
`19`	`19`	`}`
`20`	`20`
`21`		`- public async execute(context: ScaleRangeContext): Promise<void> {`
	`21`	`+ public async execute(context: T): Promise<void> {`
`22`	`22`	`this.revisionDraftTemplate.scale \|\|= {};`
`23`	`23`	`this.revisionDraftTemplate.scale.minReplicas = context.newMinRange;`
`24`	`24`	`this.revisionDraftTemplate.scale.maxReplicas = context.newMaxRange;`
`25`	`25`
`26`		`- this.updateRevisionDraftWithTemplate();`
	`26`	`+ await this.updateRevisionDraftWithTemplate(context);`
`27`	`27`
`28`	`28`	`context.scaleMinRange = nonNullProp(context, 'newMinRange');`
`29`	`29`	`context.scaleMaxRange = nonNullProp(context, 'newMaxRange');`
`@@ -32,7 +32,7 @@ export class ScaleRangeUpdateStep<T extends ScaleRangeContext> extends RevisionD`
`32`	`32`	`ext.outputChannel.appendLog(localize('updatedScaleRange', 'Updated replica scaling range to {0}-{1} for "{2}".', context.newMinRange, context.newMaxRange, parentResourceName));`
`33`	`33`	`}`
`34`	`34`
`35`		`- public shouldExecute(context: ScaleRangeContext): boolean {`
	`35`	`+ public shouldExecute(context: T): boolean {`
`36`	`36`	`return context.newMinRange !== undefined && context.newMaxRange !== undefined;`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ export async function addScaleRule(context: IActionContext, node?: ScaleRuleGrou`
`39`	`39`	`});`
`40`	`40`
`41`	`41`	`await wizard.prompt();`
`42`		`-`
`43`	`42`	`wizardContext.activityTitle = localize('addScaleRuleTitle', 'Add {0} rule "{1}" to "{2}" (draft)', wizardContext.newRuleType, wizardContext.newRuleName, parentResource.name);`
`44`		`-`
`45`	`43`	`await wizard.execute();`
`46`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,20 +17,20 @@ export class DeleteScaleRuleStep<T extends ScaleRuleContext> extends RevisionDra`
`17`	`17`	`super(baseItem);`
`18`	`18`	`}`
`19`	`19`
`20`		`- public async execute(context: ScaleRuleContext): Promise<void> {`
	`20`	`+ public async execute(context: T): Promise<void> {`
`21`	`21`	`this.revisionDraftTemplate.scale \|\|= {};`
`22`	`22`	`this.revisionDraftTemplate.scale.rules \|\|= [];`
`23`	`23`
`24`	`24`	`const index = this.revisionDraftTemplate.scale.rules.findIndex(r => r.name === nonNullValueAndProp(context.scaleRule, 'name'));`
`25`	`25`	`this.revisionDraftTemplate.scale.rules.splice(index, 1);`
`26`	`26`
`27`		`- this.updateRevisionDraftWithTemplate();`
	`27`	`+ await this.updateRevisionDraftWithTemplate(context);`
`28`	`28`
`29`	`29`	`const resourceName = getParentResourceFromItem(this.baseItem).name;`
`30`	`30`	`ext.outputChannel.appendLog(localize('deletedScaleRule', 'Deleted rule "{0}" to "{1}" (draft)', context.scaleRule?.name, resourceName));`
`31`	`31`	`}`
`32`	`32`
`33`		`- public shouldExecute(context: ScaleRuleContext): boolean {`
	`33`	`+ public shouldExecute(context: T): boolean {`
`34`	`34`	`return !!context.scaleRule;`
`35`	`35`	`}`
`36`	`36`	`}`