Skip to content
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

Jump to bottom

[Environments] Increased timeout for configuration #3891

Merged
merged 8 commits into from
Oct 3, 2024
Merged

[Environments] Increased timeout for configuration #3891

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e63b9c0
Incresed timeout
huzaifa-msft Sep 13, 2024
d4aace6
Fixed sorting
huzaifa-msft Sep 23, 2024
8fc9908
Fixed pinning UI
huzaifa-msft Sep 23, 2024
55840cf
Changed shimmer size
huzaifa-msft Sep 24, 2024
dc7a22e
Revert "Fixed pinning UI"
huzaifa-msft Sep 30, 2024
e34f80c
Remove creep change
huzaifa-d Sep 30, 2024
7573417
String comparison simplification
huzaifa-msft Oct 1, 2024
8596552
Simplified conditional check
huzaifa-msft Oct 2, 2024
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
14 changes: 7 additions & 7 deletions common/Environments/Styles/HorizontalCardStyles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,12 @@
<Setter Property="Padding" Value="20,8,15,8" />
</Style>

<Style
x:Key="CardBodyLaunchButtonStyle"
TargetType="Button">
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Padding" Value="34,7,34,7" />
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
<Style
x:Key="CardBodyLaunchButtonStyle"
TargetType="Button">
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="Padding" Value="34,7,34,7" />
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
</Style>
</ResourceDictionary>
9 changes: 6 additions & 3 deletions tools/Environments/DevHome.Environments/ViewModels/LandingPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,10 +409,13 @@ public void SearchHandler(string query)

if (system is ComputeSystemViewModel computeSystemViewModel)
{
var providerName = computeSystemViewModel.ProviderDisplayName;
if (providerName != _selectedProvider)
if (_selectedProvider.ToString().Length > 0)
huzaifa-d marked this conversation as resolved.
Show resolved Hide resolved
{
return false;
var providerName = computeSystemViewModel.ProviderDisplayName;
if (providerName != _selectedProvider)
{
return false;
}
}

var systemName = computeSystemViewModel.ComputeSystem!.DisplayName.Value;
Expand Down
4 changes: 2 additions & 2 deletions tools/SetupFlow/DevHome.SetupFlow/Models/ConfigureTargetTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,12 +411,12 @@ public IAsyncOperation<TaskFinishedState> Execute()
applyConfigurationOperation.ConfigurationSetStateChanged += OnApplyConfigurationOperationChanged;
applyConfigurationOperation.ActionRequired += OnActionRequired;

// We'll cancel the operation after 10 minutes. This is arbitrary for now and will need to be adjusted in the future.
// We'll cancel the operation after 30 minutes. This is arbitrary for now and will need to be adjusted in the future.
// but we'll need to give the user the ability to cancel the operation in the UI as well. This is just a safety net.
// More work is needed to give the user the ability to cancel the operation as the capability is not currently available.
// in the UI of Dev Home's Loading page.
var tokenSource = new CancellationTokenSource();
tokenSource.CancelAfter(TimeSpan.FromMinutes(10));
tokenSource.CancelAfter(TimeSpan.FromMinutes(30));

ApplyConfigurationAsyncOperation = applyConfigurationOperation.StartAsync();
var result = await ApplyConfigurationAsyncOperation.AsTask().WaitAsync(tokenSource.Token);
Expand Down
Loading