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

Remove experiment keys for environments and add setup environment image #2811

Merged
merged 1 commit into from
May 6, 2024
Merged

Remove experiment keys for environments and add setup environment image #2811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 0 additions & 24 deletions settings/DevHome.Settings/Strings/en-us/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,36 +545,12 @@
<value>View logs</value>
<comment>Click on this if you want to see Dev Home's logs on your machine.</comment>
</data>
<data name="EnvironmentsManagementPage_Description" xml:space="preserve">
<value>Manage your local and cloud development virtual machines from Dev Home</value>
<comment>Text within a display card that explains what users can do with the Environments management feature. Users can choose to toggle this on/off to add or remove the feature.</comment>
</data>
<data name="EnvironmentsManagementPage_Name" xml:space="preserve">
<value>Environments Management</value>
<comment>Title text for the Environments management feature.</comment>
</data>
<data name="EnvironmentsSetupTargetFlow_Description" xml:space="preserve">
<value>Configure your local and cloud development virtual machines from Dev Home</value>
<comment>Text within a display card that explains what users can do with the Environments configuration feature. Users can choose to toggle this on/off to add or remove the feature.</comment>
</data>
<data name="EnvironmentsSetupTargetFlow_Name" xml:space="preserve">
<value>Environments Configuration</value>
<comment>Title text for the Environments configuration feature.</comment>
</data>
<data name="QuietBackgroundProcessesExperiment_Name" xml:space="preserve">
<value>Quiet background processes</value>
<comment>Name of experimental feature 'Quiet background processes' on the 'Settings -> Experiments' page where you enable it.</comment>
</data>
<data name="QuietBackgroundProcessesExperiment_Description" xml:space="preserve">
<value>Quiet background processes allows you to free up resources while developing</value>
<comment>Inline description of the Quiet background processes experimental feature on the 'Settings -> Experiments' page where you enable it.</comment>
</data>
<data name="EnvironmentsCreationFlow_Description" xml:space="preserve">
<value>Create a local or cloud machine from Dev Home</value>
<comment>Text within a display card that explains what users can do with the Environments creation feature. Users can choose to toggle this on/off to add or remove the feature.</comment>
</data>
<data name="EnvironmentsCreationFlow_Name" xml:space="preserve">
<value>Environments Creation</value>
<comment>Title text for the Environments creation feature.</comment>
</data>
</root>
63 changes: 0 additions & 63 deletions src/NavConfig.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,48 +38,6 @@
]
},
"experimentalFeatures": [
{
"identity": "EnvironmentsManagementPage",
"enabledByDefault": false,
"buildTypeOverrides": [
{
"buildType": "dev",
"enabledByDefault": true,
"visible": true
},
{
"buildType": "canary",
"enabledByDefault": true,
"visible": true
},
{
"buildType": "stable",
"enabledByDefault": false,
"visible": true
}
]
},
{
"identity": "EnvironmentsSetupTargetFlow",
"enabledByDefault": false,
"buildTypeOverrides": [
{
"buildType": "dev",
"enabledByDefault": true,
"visible": true
},
{
"buildType": "canary",
"enabledByDefault": true,
"visible": true
},
{
"buildType": "stable",
"enabledByDefault": false,
"visible": true
}
]
},
{
"identity": "QuietBackgroundProcessesExperiment",
"enabledByDefault": false,
Expand All @@ -100,27 +58,6 @@
"visible": true
}
]
},
{
"identity": "EnvironmentsCreationFlow",
"enabledByDefault": false,
"buildTypeOverrides": [
{
"buildType": "dev",
"enabledByDefault": true,
"visible": true
},
{
"buildType": "canary",
"enabledByDefault": true,
"visible": true
},
{
"buildType": "stable",
"enabledByDefault": false,
"visible": true
}
]
}
]
}
4 changes: 0 additions & 4 deletions tools/Environments/DevHome.Environments/Helpers/EnvironmentsExtensionsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,8 @@ public class EnvironmentsExtensionsService
{
private readonly IComputeSystemManager _computeSystemManager;

private const string EnvironmentsCreationFlowFeatureName = "EnvironmentsCreationFlow";

private readonly IExperimentationService _experimentationService;

public bool IsEnvironmentCreationEnabled => _experimentationService.IsFeatureEnabled(EnvironmentsCreationFlowFeatureName);

public EnvironmentsExtensionsService(IComputeSystemManager computeSystemManager, IExperimentationService experimentationService)
{
_computeSystemManager = computeSystemManager;
Expand Down
5 changes: 0 additions & 5 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 @@ -72,9 +72,6 @@ public partial class LandingPageViewModel : ObservableObject, IDisposable
[ObservableProperty]
private bool _shouldShowCreationHeader;

[ObservableProperty]
private bool _shouldShowCreateEnvironmentButton;

public ObservableCollection<string> Providers { get; set; }

private CancellationTokenSource _cancellationTokenSource = new();
Expand Down Expand Up @@ -198,8 +195,6 @@ public async Task LoadModelAsync(bool useDebugValues = false)
return;
}

ShouldShowCreateEnvironmentButton = _environmentExtensionsService.IsEnvironmentCreationEnabled;

// If the page has already loaded once, then we don't need to re-load the compute systems as that can take a while.
// The user can click the sync button to refresh the compute systems. However, there may be new operations that have started
// since the last time the page was loaded. So we need to add those to the view model quickly.
Expand Down
1 change: 0 additions & 1 deletion tools/Environments/DevHome.Environments/Views/LandingPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@
Grid.Column="3"
Style="{ThemeResource AccentButtonStyle}"
HorizontalAlignment="Right"
Visibility="{x:Bind ViewModel.ShouldShowCreateEnvironmentButton, Mode=OneWay}"
Command="{x:Bind ViewModel.CreateEnvironmentButtonCommand}" >
<Grid>
<Grid.ColumnDefinitions>
Expand Down
Binary file added tools/SetupFlow/DevHome.SetupFlow/Assets/SetupVirtualEnvironment.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions tools/SetupFlow/DevHome.SetupFlow/ViewModels/MainPageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ public partial class MainPageViewModel : SetupPageViewModelBase
{
private readonly ILogger _log = Log.ForContext("SourceContext", nameof(MainPageViewModel));

private const string EnvironmentsSetupFlowFeatureName = "EnvironmentsSetupTargetFlow";

private const string EnvironmentsCreationFlowFeatureName = "EnvironmentsCreationFlow";

private readonly IHost _host;
private readonly IWindowsPackageManager _wpm;
private readonly IDesiredStateConfiguration _dsc;
Expand All @@ -59,10 +55,6 @@ public partial class MainPageViewModel : SetupPageViewModelBase

public string MainPageQuickStepsGroupName => StringResource.GetLocalized(StringResourceKey.MainPageQuickConfigurationGroup);

public bool ShouldShowSetupTargetItem => _experimentationService.IsFeatureEnabled(EnvironmentsSetupFlowFeatureName);

public bool ShouldShowCreateEnvironmentItem => _experimentationService.IsFeatureEnabled(EnvironmentsCreationFlowFeatureName);

/// <summary>
/// Event raised when the user elects to start the setup flow.
/// The orchestrator for the whole flow subscribes to this event to handle
Expand Down
8 changes: 4 additions & 4 deletions tools/SetupFlow/DevHome.SetupFlow/Views/MainPageView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@

<!-- settings card for setup target flow. -->
<Grid
Background="Transparent"
Visibility="{x:Bind ViewModel.ShouldShowSetupTargetItem}">
Background="Transparent">
Copy link
Collaborator

Choose a reason for hiding this comment

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

Grid backgrounds are transparent by default.

<ctControls:SettingsCard
x:Uid="ms-resource:///DevHome.SetupFlow/Resources/MainPage_SetupFlow_For_target"
ActionIcon="{x:Null}"
Expand All @@ -130,7 +129,9 @@
IsClickEnabled="True"
IsEnabled="{x:Bind ViewModel.EnablePackageInstallerItem, Mode=OneWay}">
<ctControls:SettingsCard.HeaderIcon>
<ImageIcon Opacity="{x:Bind ViewModel.EnablePackageInstallerItem, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}" Source="ms-appx:///DevHome.SetupFlow/Assets/Setup_EndToEnd.png" />
<ImageIcon
Opacity="{x:Bind ViewModel.EnablePackageInstallerItem, Mode=OneWay, Converter={StaticResource BoolToOpacityConverter}}"
Source="ms-appx:///DevHome.SetupFlow/Assets/SetupVirtualEnvironment.png" />
</ctControls:SettingsCard.HeaderIcon>
</ctControls:SettingsCard>

Expand Down Expand Up @@ -167,7 +168,6 @@

<!-- settings card for creating an environment -->
<ctControls:SettingsCard
Visibility="{x:Bind ViewModel.ShouldShowCreateEnvironmentItem}"
x:Uid="MainPageCreateEnvironment"
AutomationProperties.AutomationId="CreateEnvironment"
IsClickEnabled="True"
Expand Down
Loading