Skip to content

Commit 07cc7a1

Browse files
committed
Nits
1 parent e9d0d99 commit 07cc7a1

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

src/commands/createContainerApp/ContainerAppCreateStep.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ export class ContainerAppCreateStep extends ExecuteActivityOutputStepBase<ICreat
6060
]
6161
}
6262
}));
63-
64-
if (!context.activityChildren) {
65-
context.activityResult = {
66-
id: nonNullValueAndProp(context.containerApp, 'id'),
67-
name: containerAppName,
68-
type: containerAppsWebProvider
69-
};
70-
}
7163
}
7264

7365
public shouldExecute(context: ICreateContainerAppContext): boolean {

src/commands/deployWorkspaceProject/DeployWorkspaceProjectSaveSettingsStep.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { localize } from "../../utils/localize";
1212
import type { DeployWorkspaceProjectContext } from "./DeployWorkspaceProjectContext";
1313
import { DeployWorkspaceProjectSettings, setDeployWorkspaceProjectSettings } from "./deployWorkspaceProjectSettings";
1414

15-
const saveSettingsLabel: string = localize('saveSettingsLabel', 'Save deployment settings to workspace: "{0}"', relativeSettingsFilePath);
15+
const saveSettingsLabel: string = localize('saveSettingsLabel', 'Save deployment settings to workspace "{0}"', relativeSettingsFilePath);
1616

1717
export class DeployWorkspaceProjectSaveSettingsStep extends ExecuteActivityOutputStepBase<DeployWorkspaceProjectContext> {
1818
public priority: number = 1480;

src/commands/deployWorkspaceProject/deployWorkspaceProject.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { LocationListStep, ResourceGroupCreateStep, VerifyProvidersStep } from "
77
import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, GenericTreeItem, IActionContext, ISubscriptionContext, createSubscriptionContext, nonNullProp, nonNullValueAndProp, subscriptionExperience } from "@microsoft/vscode-azext-utils";
88
import type { AzureSubscription } from "@microsoft/vscode-azureresources-api";
99
import { ProgressLocation, window } from "vscode";
10-
import { activitySuccessContext, activitySuccessIcon, appProvider, managedEnvironmentsId, operationalInsightsProvider, webProvider } from "../../constants";
10+
import { activityInfoIcon, activitySuccessContext, appProvider, managedEnvironmentsId, operationalInsightsProvider, webProvider } from "../../constants";
1111
import { ext } from "../../extensionVariables";
1212
import { ContainerAppModel, isIngressEnabled } from "../../tree/ContainerAppItem";
1313
import { createActivityChildContext, createActivityContext } from "../../utils/activity/activityUtils";
@@ -70,8 +70,8 @@ export async function deployWorkspaceProject(context: IActionContext): Promise<v
7070
wizardContext.activityChildren?.push(
7171
new GenericTreeItem(undefined, {
7272
contextValue: createActivityChildContext(['useExistingResourceGroup', activitySuccessContext]),
73-
label: localize('useResourceGroup', 'Use resource group "{0}"', resourceGroupName),
74-
iconPath: activitySuccessIcon
73+
label: localize('useResourceGroup', 'Using resource group "{0}"', resourceGroupName),
74+
iconPath: activityInfoIcon
7575
})
7676
);
7777

@@ -88,8 +88,8 @@ export async function deployWorkspaceProject(context: IActionContext): Promise<v
8888
wizardContext.activityChildren?.push(
8989
new GenericTreeItem(undefined, {
9090
contextValue: createActivityChildContext(['useExistingManagedEnvironment', activitySuccessContext]),
91-
label: localize('useManagedEnvironment', 'Use container app environment "{0}"', managedEnvironmentName),
92-
iconPath: activitySuccessIcon
91+
label: localize('useManagedEnvironment', 'Using container app environment "{0}"', managedEnvironmentName),
92+
iconPath: activityInfoIcon
9393
})
9494
);
9595

@@ -119,8 +119,8 @@ export async function deployWorkspaceProject(context: IActionContext): Promise<v
119119
wizardContext.activityChildren?.push(
120120
new GenericTreeItem(undefined, {
121121
contextValue: createActivityChildContext(['useExistingAcr', activitySuccessContext]),
122-
label: localize('useAcr', 'Use container registry "{0}"', registryName),
123-
iconPath: activitySuccessIcon
122+
label: localize('useAcr', 'Using container registry "{0}"', registryName),
123+
iconPath: activityInfoIcon
124124
})
125125
);
126126

@@ -139,8 +139,8 @@ export async function deployWorkspaceProject(context: IActionContext): Promise<v
139139
wizardContext.activityChildren?.push(
140140
new GenericTreeItem(undefined, {
141141
contextValue: createActivityChildContext(['useExistingContainerApp', activitySuccessContext]),
142-
label: localize('useContainerApp', 'Use container app "{0}"', containerAppName),
143-
iconPath: activitySuccessIcon
142+
label: localize('useContainerApp', 'Using container app "{0}"', containerAppName),
143+
iconPath: activityInfoIcon
144144
})
145145
);
146146

src/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ export const relativeSettingsFilePath: string = `${vscodeFolder}/${settingsFile}
8686
// Originally from the Docker extension: https://github.com/microsoft/vscode-docker/blob/main/src/constants.ts
8787
export const DOCKERFILE_GLOB_PATTERN = '**/{*.[dD][oO][cC][kK][eE][rR][fF][iI][lL][eE],[dD][oO][cC][kK][eE][rR][fF][iI][lL][eE],[dD][oO][cC][kK][eE][rR][fF][iI][lL][eE].*}';
8888

89+
export const activityInfoIcon: ThemeIcon = new ThemeIcon('info', new ThemeColor('charts.blue'));
8990
export const activitySuccessIcon: ThemeIcon = new ThemeIcon('pass', new ThemeColor('testing.iconPassed'));
9091
export const activityFailIcon: ThemeIcon = new ThemeIcon('error', new ThemeColor('testing.iconFailed'));
9192

0 commit comments

Comments
 (0)