Skip to content

Fix subscription ID not being disabled on Azure provisioning dialog #12888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2025
+22 −21
Merged

Fix subscription ID not being disabled on Azure provisioning dialog #12888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc4538f
Fix subscription ID not being disabled on Azure provisioning dialog
JamesNK Nov 11, 2025
29d200a
Fix location always disabled
JamesNK Nov 11, 2025
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
3 changes: 2 additions & 1 deletion src/Aspire.Dashboard/Components/Dialogs/InteractionsInputDialog.razor.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

.interaction-input-dialog .interaction-input ::deep fluent-text-field,
.interaction-input-dialog .interaction-input ::deep fluent-select,
.interaction-input-dialog .interaction-input ::deep fluent-combobox {
.interaction-input-dialog .interaction-input ::deep fluent-combobox,
.interaction-input-dialog .interaction-input ::deep label {
Copy link
Member Author

@JamesNK JamesNK Nov 11, 2025

Choose a reason for hiding this comment

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

Unrelated. Label width not being the same as input has bugged me

width: 75%;
/* Prevent long select/combox controls from extending outside the dialog. This can happen when there is very long placeholder text */
max-width: 500px;
Expand Down
40 changes: 20 additions & 20 deletions src/Aspire.Hosting.Azure/Provisioning/Internal/RunModeProvisioningContextProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,26 +155,13 @@ private async Task RetrieveAzureProvisioningOptions(CancellationToken cancellati
// show the value as from the configuration and disable the input
// there should be no option to change it

inputs.Add(new InteractionInput
InputLoadOptions? subscriptionLoadOptions = null;
if (string.IsNullOrEmpty(_options.SubscriptionId))
{
Name = SubscriptionIdName,
InputType = string.IsNullOrEmpty(_options.SubscriptionId) ? InputType.Choice : InputType.Text,
Label = AzureProvisioningStrings.SubscriptionIdLabel,
Required = true,
AllowCustomChoice = true,
Placeholder = AzureProvisioningStrings.SubscriptionIdPlaceholder,
Disabled = !string.IsNullOrEmpty(_options.SubscriptionId),
Value = _options.SubscriptionId,
DynamicLoading = new InputLoadOptions
subscriptionLoadOptions = new InputLoadOptions
{
LoadCallback = async (context) =>
{
if (!string.IsNullOrEmpty(_options.SubscriptionId))
{
// If subscription ID is not set, we don't need to load options
return;
}

// Get tenant ID from input if tenant selection is enabled, otherwise use configured value
var tenantId = context.AllInputs[TenantName].Value ?? string.Empty;

Expand All @@ -186,8 +173,21 @@ private async Task RetrieveAzureProvisioningOptions(CancellationToken cancellati
: [];
context.Input.Disabled = false;
},
DependsOnInputs = string.IsNullOrEmpty(_options.SubscriptionId) ? [TenantName] : []
}
DependsOnInputs = [TenantName]
};
}

inputs.Add(new InteractionInput
{
Name = SubscriptionIdName,
InputType = string.IsNullOrEmpty(_options.SubscriptionId) ? InputType.Choice : InputType.Text,
Label = AzureProvisioningStrings.SubscriptionIdLabel,
Required = true,
AllowCustomChoice = true,
Placeholder = AzureProvisioningStrings.SubscriptionIdPlaceholder,
Disabled = true,
Value = _options.SubscriptionId,
DynamicLoading = subscriptionLoadOptions
});

inputs.Add(new InteractionInput
Expand All @@ -197,7 +197,7 @@ private async Task RetrieveAzureProvisioningOptions(CancellationToken cancellati
Label = AzureProvisioningStrings.LocationLabel,
Placeholder = AzureProvisioningStrings.LocationPlaceholder,
Required = true,
Disabled = true,
Disabled = string.IsNullOrEmpty(_options.SubscriptionId),
DynamicLoading = new InputLoadOptions
{
LoadCallback = async (context) =>
Expand All @@ -209,7 +209,7 @@ private async Task RetrieveAzureProvisioningOptions(CancellationToken cancellati
context.Input.Options = locationOptions;
context.Input.Disabled = false;
},
DependsOnInputs = [SubscriptionIdName]
DependsOnInputs = string.IsNullOrEmpty(_options.SubscriptionId) ? [SubscriptionIdName] : []
}
});

Expand Down