Misc

Author: MicroFish91

src/commands/revisionDraft/RevisionDraftFileSystem.ts

@@ -145,7 +145,7 @@ export class RevisionDraftFileSystem implements FileSystemProvider {
         }
 
         const newContent: Uint8Array = Buffer.from(JSON.stringify(template, undefined, 4));
-        const file: RevisionDraftFile | undefined = nonNullValue(this.draftStore.get(uri.path));
+        const file: RevisionDraftFile = nonNullValue(this.draftStore.get(uri.path));
         if (file.contents === newContent) {
             return;
         }

src/commands/revisionDraft/RevisionDraftUpdateBaseStep.ts

@@ -12,7 +12,7 @@ import { IContainerAppContext } from "../IContainerAppContext";
 
 export abstract class RevisionDraftUpdateBaseStep<T extends IContainerAppContext> extends AzureWizardExecuteStep<T> {
     /**
-     * This property holds the template revisions that will be used to update when calling `updateRevisionDraftWithTemplate`
+     * This property holds the active template revisions used for updating the revision draft
      */
     protected revisionDraftTemplate: Template;
 

src/commands/scaling/addScaleRule/AddScaleRuleStep.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import type { ScaleRule } from "@azure/arm-appcontainers";
+import { KnownActiveRevisionsMode, type ScaleRule } from "@azure/arm-appcontainers";
 import { nonNullProp } from "@microsoft/vscode-azext-utils";
 import { Progress } from "vscode";
 import { ScaleRuleTypes } from "../../../constants";
@@ -22,7 +22,17 @@ export class AddScaleRuleStep<T extends IAddScaleRuleContext> extends RevisionDr
     }
 
     public async execute(context: IAddScaleRuleContext, progress: Progress<{ message?: string | undefined; increment?: number | undefined }>): Promise<void> {
-        context.activityTitle = localize('addingScaleRule', 'Add {0} rule "{1}" to "{2}" (draft)', context.ruleType, context.ruleName, context.containerApp.name);
+        let adding: string | undefined;
+        let added: string | undefined;
+        if (context.containerApp.revisionsMode === KnownActiveRevisionsMode.Single) {
+            adding = localize('addingScaleRuleSingle', 'Add {0} rule "{1}" to container app "{2}" (draft)', context.ruleType, context.ruleName, context.containerApp.name);
+            added = localize('addedScaleRuleSingle', 'Added {0} rule "{1}" to container app "{2}" (draft).', context.ruleType, context.ruleName, context.containerApp.name);
+        } else {
+            adding = localize('addingScaleRuleMultiple', 'Add {0} rule "{1}" to revision "{2}" (draft)', context.ruleType, context.ruleName, this.baseItem.revision.name);
+            added = localize('addedScaleRuleMultiple', 'Added {0} rule "{1}" to revision "{2}" (draft)', context.ruleType, context.ruleName, this.baseItem.revision.name);
+        }
+
+        context.activityTitle = adding;
         progress.report({ message: localize('addingRule', 'Adding scale rule...') });
 
         this.revisionDraftTemplate.scale ||= {};
@@ -35,7 +45,6 @@ export class AddScaleRuleStep<T extends IAddScaleRuleContext> extends RevisionDr
         // Artificial delay to make the activity log look like it's performing an action
         await delay(1000);
 
-        const added = localize('addedScaleRule', 'Added {0} rule "{1}" to "{2}" (draft).', context.ruleType, context.ruleName, context.containerApp.name);
         ext.outputChannel.appendLog(added);
     }
 

src/commands/scaling/editScalingRange.ts

@@ -8,11 +8,11 @@ import { ProgressLocation, window } from "vscode";
 import { ext } from "../../extensionVariables";
 import { ScaleItem } from "../../tree/scaling/ScaleItem";
 import { localize } from "../../utils/localize";
+import { pickScale } from "../../utils/pickItem/pickScale";
 import { updateContainerApp } from "../../utils/updateContainerApp";
-import { getContainerAppAndRevision } from "./addScaleRule/addScaleRule";
 
 export async function editScalingRange(context: IActionContext, node?: ScaleItem): Promise<void> {
-    const { containerApp, revision, subscription } = node ?? await getContainerAppAndRevision(context);
+    const { containerApp, revision, subscription } = node ?? await pickScale(context);
 
     const scale = nonNullValue(revision?.template?.scale);
     const prompt: string = localize('editScalingRange', 'Set the range of application replicas that get created in response to a scale rule. Set any range within the minimum of 0 and the maximum of 10 replicas');