Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions CDPIUI.Tests/CDPIUI.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
<Compile Include="..\CDPIUI\ViewModels\BlockCheck2\IBlockCheck2NavigationSource.cs" Link="Presentation\IBlockCheck2NavigationSource.cs" />
<Compile Include="..\CDPIUI\ViewModels\BlockCheck2\BlockCheck2WizardNavigation.cs" Link="Presentation\BlockCheck2WizardNavigation.cs" />
<Compile Include="..\CDPIUI\ViewModels\Store\ItemDownloadPresentation.cs" Link="Linked\ItemDownloadPresentation.cs" />
<Compile Include="..\CDPIUI\ViewModels\ConfigMaker\ConfigMakerStatusPresentation.cs" Link="Linked\ConfigMakerStatusPresentation.cs" />
<Compile Include="..\CDPIUI\ViewModels\Welcome\MigrationComponentDisplayItem.cs" Link="Linked\MigrationComponentDisplayItem.cs" />
<Compile Include="..\CDPIUI\ViewModels\Welcome\WelcomeMigrationPresentation.cs" Link="Linked\WelcomeMigrationPresentation.cs" />
<Compile Include="..\CDPIUI\ViewModels\BlockCheck2\IBlockCheck2MainPageView.cs" Link="Presentation\IBlockCheck2MainPageView.cs" />
<Compile Include="..\CDPIUI\ViewModels\BlockCheck2\BlockCheck2WizardStep.cs" Link="Presentation\BlockCheck2WizardStep.cs" />
<Compile Include="..\CDPIUI\ViewModels\BlockCheck2\BlockCheck2NavigationButtons.cs" Link="Presentation\BlockCheck2NavigationButtons.cs" />
Expand Down
429 changes: 429 additions & 0 deletions CDPIUI.Tests/Presentation/ConfigMakerStatusPresentationTests.cs

Large diffs are not rendered by default.

430 changes: 430 additions & 0 deletions CDPIUI.Tests/Presentation/WelcomeMigrationPresentationTests.cs

Large diffs are not rendered by default.

68 changes: 68 additions & 0 deletions CDPIUI/ViewModels/ConfigMaker/ConfigMakerStatusPresentation.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#nullable enable

using System;

namespace CDPIUI.ViewModels.ConfigMaker;

internal sealed class ConfigMakerStatusPresentation<TSeverity> : ObservableObject
{
private readonly Func<TSeverity, string?> _resolveTitle;
private readonly Action<TSeverity, string?, string?> _raiseNotice;
private readonly Func<bool> _getInline;
private string? _statusTitle = string.Empty;
private string? _statusMessage = string.Empty;
private TSeverity _statusSeverity;
private bool _isStatusOpen;

public ConfigMakerStatusPresentation(
TSeverity initialSeverity,
Func<TSeverity, string?> resolveTitle,
Action<TSeverity, string?, string?> raiseNotice,
Func<bool> getInline)
{
_statusSeverity = initialSeverity;
_resolveTitle = resolveTitle;
_raiseNotice = raiseNotice;
_getInline = getInline;
}

public string? StatusTitle
{
get => _statusTitle;
set => SetProperty(ref _statusTitle, value);
}

public string? StatusMessage
{
get => _statusMessage;
set => SetProperty(ref _statusMessage, value);
}

public TSeverity StatusSeverity
{
get => _statusSeverity;
set => SetProperty(ref _statusSeverity, value);
}

public bool IsStatusOpen
{
get => _isStatusOpen;
set => SetProperty(ref _isStatusOpen, value);
}

public void Show(string? message, TSeverity severity)
{
string? title = _resolveTitle(severity);
_raiseNotice(severity, title, message);
if (!_getInline())
{
IsStatusOpen = false;
return;
}

StatusTitle = title;
StatusMessage = message;
StatusSeverity = severity;
IsStatusOpen = true;
}
}
56 changes: 22 additions & 34 deletions CDPIUI/ViewModels/ConfigMaker/ConfigMakerViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,23 @@ public sealed partial class ConfigMakerViewModel : ObservableObject, IConfigMake
private bool _isEditorReadOnly;
private bool _updatingComponent;
private string _editorBackground = BlackBackground;
private string _statusTitle = string.Empty;
private string _statusMessage = string.Empty;
private InfoBarSeverity _statusSeverity = InfoBarSeverity.Informational;
private bool _isStatusOpen;
private readonly ConfigMakerStatusPresentation<InfoBarSeverity> _statusPresentation;

public ConfigMakerViewModel(IConfigMakerView view, DispatcherQueue dispatcherQueue)
{
_view = view ?? throw new ArgumentNullException(nameof(view));
_dispatcherQueue = dispatcherQueue ?? throw new ArgumentNullException(nameof(dispatcherQueue));
_statusPresentation = new(InfoBarSeverity.Informational,
severity => severity switch
{
InfoBarSeverity.Error => _localizer.GetLocalizedString("SomethingWentWrong"),
InfoBarSeverity.Warning => _localizer.GetLocalizedString("Attention"),
_ => _localizer.GetLocalizedString("Information"),
},
(severity, title, message) => StatusNotificationRequested?.Invoke(
this, new StatusNotificationRequestedEventArgs(severity, title, message)),
() => UseInlineStatusMessages);
_statusPresentation.PropertyChanged += (_, args) => OnPropertyChanged(args.PropertyName);
_textChanges = new TextChangeRelay(
() => IsEditorReadOnly, () => CommandText, text => CommandText = text,
_view.ReplaceEditorText,
Expand Down Expand Up @@ -193,26 +201,26 @@ public bool IsEditorReadOnly

public string StatusTitle
{
get => _statusTitle;
private set => SetProperty(ref _statusTitle, value);
get => _statusPresentation.StatusTitle;
private set => _statusPresentation.StatusTitle = value;
}

public string StatusMessage
{
get => _statusMessage;
private set => SetProperty(ref _statusMessage, value);
get => _statusPresentation.StatusMessage;
private set => _statusPresentation.StatusMessage = value;
}

public InfoBarSeverity StatusSeverity
{
get => _statusSeverity;
private set => SetProperty(ref _statusSeverity, value);
get => _statusPresentation.StatusSeverity;
private set => _statusPresentation.StatusSeverity = value;
}

public bool IsStatusOpen
{
get => _isStatusOpen;
set => SetProperty(ref _isStatusOpen, value);
get => _statusPresentation.IsStatusOpen;
set => _statusPresentation.IsStatusOpen = value;
}

public string EditorBackground => _editorBackground;
Expand Down Expand Up @@ -293,28 +301,8 @@ public void LoadEditorBackground()
RaiseEditorBackgroundChanged();
}

public void ShowEditorMessage(string message, InfoBarSeverity severity)
{
string title = severity switch
{
InfoBarSeverity.Error => _localizer.GetLocalizedString("SomethingWentWrong"),
InfoBarSeverity.Warning => _localizer.GetLocalizedString("Attention"),
_ => _localizer.GetLocalizedString("Information"),
};
StatusNotificationRequested?.Invoke(
this,
new StatusNotificationRequestedEventArgs(severity, title, message));
if (!UseInlineStatusMessages)
{
IsStatusOpen = false;
return;
}

StatusTitle = title;
StatusMessage = message;
StatusSeverity = severity;
IsStatusOpen = true;
}
public void ShowEditorMessage(string message, InfoBarSeverity severity) =>
_statusPresentation.Show(message, severity);

// An exception must not leave an async void event handler: it would reach the global handler.
public void ReportHandlerError(Exception exception)
Expand Down
108 changes: 108 additions & 0 deletions CDPIUI/ViewModels/Welcome/WelcomeMigrationPresentation.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
#nullable enable

using System;
using System.Collections.Generic;

namespace CDPIUI.ViewModels.Welcome;

internal sealed class WelcomeMigrationPresentation<TSeverity> : ObservableObject
{
private readonly TSeverity _errorSeverity;
private readonly Func<string, string?> _text;
private bool _isMigrationMode;
private string? _migrationStatusTitle = string.Empty;
private string? _migrationStatusMessage = string.Empty;
private TSeverity _migrationStatusSeverity;
private double _migrationProgress;
private IReadOnlyList<MigrationComponentDisplayItem>? _migrationComponentItems;
private bool _isMigrationComponentsListVisible = true;
private string? _migrationSummaryText = string.Empty;
private bool _isRetryMigrationVisible;

public WelcomeMigrationPresentation(TSeverity initialSeverity, TSeverity errorSeverity,
Func<string, string?> text)
{
_migrationStatusSeverity = initialSeverity;
_errorSeverity = errorSeverity;
_text = text;
}

public bool IsMigrationMode
{
get => _isMigrationMode;
set
{
if (SetProperty(ref _isMigrationMode, value))
OnPropertyChanged(nameof(IsReadyBundlesContentVisible));
}
}

public bool IsReadyBundlesContentVisible => !_isMigrationMode;

public string? MigrationStatusTitle
{
get => _migrationStatusTitle;
set => SetProperty(ref _migrationStatusTitle, value);
}

public string? MigrationStatusMessage
{
get => _migrationStatusMessage;
set => SetProperty(ref _migrationStatusMessage, value);
}

public TSeverity MigrationStatusSeverity
{
get => _migrationStatusSeverity;
set => SetProperty(ref _migrationStatusSeverity, value);
}

public double MigrationProgress
{
get => _migrationProgress;
set => SetProperty(ref _migrationProgress, value);
}

public IReadOnlyList<MigrationComponentDisplayItem>? MigrationComponentItems
{
get => _migrationComponentItems;
set => SetProperty(ref _migrationComponentItems, value);
}

public bool IsMigrationComponentsListVisible
{
get => _isMigrationComponentsListVisible;
set => SetProperty(ref _isMigrationComponentsListVisible, value);
}

public string? MigrationSummaryText
{
get => _migrationSummaryText;
set => SetProperty(ref _migrationSummaryText, value);
}

public bool IsRetryMigrationVisible
{
get => _isRetryMigrationVisible;
set => SetProperty(ref _isRetryMigrationVisible, value);
}

public void ShowStatus(string? titleKey, string? messageKey, TSeverity severity)
{
MigrationStatusTitle = _text($"/WelcomeWizard/{titleKey}");
MigrationStatusMessage = _text($"/WelcomeWizard/{messageKey}");
MigrationStatusSeverity = severity;
}

public void ShowError(string? message, string? errorCode)
{
// The migration session reports some failures with an English message; the code selects the localized text.
string? localizedMessage = _text($"/WelcomeWizard/MigrationError_{errorCode}");
if (!string.IsNullOrWhiteSpace(localizedMessage))
message = localizedMessage;
MigrationStatusTitle = _text("/WelcomeWizard/MigrationFailedTitle");
MigrationStatusMessage = $"{message}\n\n{errorCode}";
MigrationStatusSeverity = _errorSeverity;
IsRetryMigrationVisible = true;
}
}
Loading
Loading