Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ import { ResourceGroupListStep, getResourceGroupFromId, uiUtils } from "@microso
import { AzureWizardPromptStep, nonNullProp, nonNullValueAndProp, type IAzureQuickPickItem } from "@microsoft/vscode-azext-utils";
import { createContainerAppsAPIClient } from "../../../../utils/azureClients";
import { localize } from "../../../../utils/localize";
import { type DeploymentConfigurationSettings } from "../../settings/DeployWorkspaceProjectSettingsV2";
import { dwpSettingUtilsV2 } from "../../settings/dwpSettingUtilsV2";
import { type DeployWorkspaceProjectInternalContext } from "../DeployWorkspaceProjectInternalContext";

const recommendedPickDescription: string = localize('recommended', '(Recommended)');
export class DwpManagedEnvironmentListStep extends AzureWizardPromptStep<DeployWorkspaceProjectInternalContext> {
public async prompt(context: DeployWorkspaceProjectInternalContext): Promise<void> {
const placeHolder: string = localize('selectManagedEnvironment', 'Select a container apps environment');
Expand All @@ -21,8 +24,13 @@ export class DwpManagedEnvironmentListStep extends AzureWizardPromptStep<DeployW
return;
}

await this.setRecommendedPicks(context, picks);
const pick = await context.ui.showQuickPick(picks, { placeHolder, suppressPersistence: true });
context.telemetry.properties.usedRecommendedEnv = pick.description === recommendedPickDescription ? 'true' : 'false';
context.telemetry.properties.recommendedEnvCount =
Copy link
Copy Markdown
Contributor

@MicroFish91 MicroFish91 Apr 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh hi reduce 👋 👍

String(picks.reduce((count, p) => count + (p.description === recommendedPickDescription ? 1 : 0), 0));

const managedEnvironment: ManagedEnvironment | undefined = (await context.ui.showQuickPick(picks, { placeHolder })).data;
const managedEnvironment: ManagedEnvironment | undefined = pick.data;
if (!managedEnvironment) {
// User is choosing to create a new managed environment
return;
Expand Down Expand Up @@ -66,4 +74,45 @@ export class DwpManagedEnvironmentListStep extends AzureWizardPromptStep<DeployW
context.resourceGroup = resourceGroups.find(rg => rg.name === getResourceGroupFromId(nonNullProp(managedEnvironment, 'id')));
context.managedEnvironment = managedEnvironment;
}

private async setRecommendedPicks(context: DeployWorkspaceProjectInternalContext, picks: IAzureQuickPickItem<ManagedEnvironment | undefined>[]): Promise<void> {
const deploymentConfigurations: DeploymentConfigurationSettings[] | undefined = await dwpSettingUtilsV2.getWorkspaceDeploymentConfigurations(nonNullProp(context, 'rootFolder'));
if (!deploymentConfigurations?.length) {
return;
}

const client = await createContainerAppsAPIClient(context);
for (const config of deploymentConfigurations) {
try {
if (config.resourceGroup && config.containerApp) {
const containerApp = await client.containerApps.get(config.resourceGroup, config.containerApp);
const recommendedPick = picks.find(p => p.data?.id === containerApp.managedEnvironmentId);
if (recommendedPick) {
recommendedPick.description = recommendedPickDescription;
}
}
}
catch (these_hands) {
// ignore the error and continue
}
}

const recommendedPick = (pick: IAzureQuickPickItem<ManagedEnvironment | undefined>): boolean => {
Comment thread
MicroFish91 marked this conversation as resolved.
Outdated
if (pick.description === recommendedPickDescription) {
return true;
}

return false;
};
// sort the picks by recommendation
picks.sort((a, b) => {
if (recommendedPick(a)) {
return -1;
} else if (recommendedPick(b)) {
return 1;
} else {
return 0;
}
});
}
}
4 changes: 4 additions & 0 deletions src/telemetry/deployWorkspaceProjectTelemetryProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ export interface DeployWorkspaceProjectInternalTelemetryProps extends AzdTelemet
hasNewSettings?: 'true' | 'false'; // ShouldSaveDeploySettingsPromptStep
shouldSaveDeploySettings?: 'true' | 'false'; // ShouldSaveDeploySettingsPromptStep
didSaveSettings?: 'true' | 'false'; // DeployWorkspaceProjectSaveSettingsStep - we swallow errors here, so log the outcome just in case

// Recommended managed environments
recommendedEnvCount?: string; // number casted to string
usedRecommendedEnv?: 'true' | 'false';
}

export interface DeployWorkspaceProjectNotificationTelemetryProps {
Expand Down