From b84bb6b437a1f898f5c0f5f3f02cf747596c390a Mon Sep 17 00:00:00 2001
From: Jason Dove <1695733+jasongdove@users.noreply.github.com>
Date: Tue, 15 Aug 2023 06:39:29 -0500
Subject: [PATCH] fix ui crashes (#1382)

* fix ffmpeg editor crash

* fix watermark editor

* fix multi collection editor

* fix filler preset editor crash
---
 ErsatzTV/Pages/FFmpegEditor.razor          |  58 ++++-
 ErsatzTV/Pages/FillerPresetEditor.razor    | 229 ++++++++---------
 ErsatzTV/Pages/MultiCollectionEditor.razor | 104 ++++----
 ErsatzTV/Pages/WatermarkEditor.razor       | 273 +++++++++++----------
 4 files changed, 358 insertions(+), 306 deletions(-)

diff --git a/ErsatzTV/Pages/FFmpegEditor.razor b/ErsatzTV/Pages/FFmpegEditor.razor
index 6e89752cd..6772ae304 100644
--- a/ErsatzTV/Pages/FFmpegEditor.razor
+++ b/ErsatzTV/Pages/FFmpegEditor.razor
@@ -11,9 +11,12 @@
 @inject ISnackbar _snackbar
 @inject IMediator _mediator
 @inject IMemoryCache _memoryCache
+@inject PersistentComponentState ApplicationState
 
 <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
-    <EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync">
+    @if (_editContext is not null)
+    {
+        <EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync">
         <FluentValidationValidator/>
         <MudCard>
             <MudCardHeader>
@@ -139,6 +142,7 @@
             </MudCardActions>
         </MudCard>
     </EditForm>
+    }
 </MudContainer>
 
 @code {
@@ -151,25 +155,55 @@
     private EditContext _editContext;
     private ValidationMessageStore _messageStore;
 
-    private List<ResolutionViewModel> _resolutions;
-    private List<string> _vaapiDevices;
+    private List<ResolutionViewModel> _resolutions = new();
+    private List<string> _vaapiDevices = new();
+    private PersistingComponentStateSubscription _persistingSubscription;
 
     public void Dispose()
     {
+        _persistingSubscription.Dispose();
+
         _cts.Cancel();
         _cts.Dispose();
     }
+    
+    protected override Task OnInitializedAsync()
+    {
+        _persistingSubscription = ApplicationState.RegisterOnPersisting(PersistData);
+
+        return base.OnInitializedAsync();
+    }
 
     protected override async Task OnParametersSetAsync()
     {
-        _resolutions = await _mediator.Send(new GetAllResolutions(), _cts.Token);
+        if (!ApplicationState.TryTakeFromJson("_resolutions", out List<ResolutionViewModel> restoredResolutions))
+        {
+            _resolutions = await _mediator.Send(new GetAllResolutions(), _cts.Token);
+        }
+        else
+        {
+            _resolutions = restoredResolutions;
+        }
 
         if (IsEdit)
         {
-            Option<FFmpegProfileViewModel> profile = await _mediator.Send(new GetFFmpegProfileById(Id), _cts.Token);
-            profile.Match(
-                ffmpegProfileViewModel => _model = new FFmpegProfileEditViewModel(ffmpegProfileViewModel),
-                () => _navigationManager.NavigateTo("404"));
+            if (!ApplicationState.TryTakeFromJson("_model", out FFmpegProfileEditViewModel restoredProfile))
+            {
+                Option<FFmpegProfileViewModel> maybeProfile = await _mediator.Send(new GetFFmpegProfileById(Id), _cts.Token);
+                foreach (FFmpegProfileViewModel profile in maybeProfile)
+                {
+                    _model = new FFmpegProfileEditViewModel(profile);
+                }
+
+                if (maybeProfile.IsNone)
+                {
+                    _navigationManager.NavigateTo("404");
+                }
+            }
+            else
+            {
+                _model = restoredProfile;
+            }
         }
         else
         {
@@ -186,6 +220,14 @@
 
         _vaapiDevices = vaapiDevices.OrderBy(s => s).ToList();
     }
+    
+    private Task PersistData()
+    {
+        ApplicationState.PersistAsJson("_model", _model);
+        ApplicationState.PersistAsJson("_resolutions", _resolutions);
+
+        return Task.CompletedTask;
+    }
 
     private bool IsEdit => Id != 0;
 
diff --git a/ErsatzTV/Pages/FillerPresetEditor.razor b/ErsatzTV/Pages/FillerPresetEditor.razor
index 7027d47f0..b421d6f21 100644
--- a/ErsatzTV/Pages/FillerPresetEditor.razor
+++ b/ErsatzTV/Pages/FillerPresetEditor.razor
@@ -16,119 +16,122 @@
     <div style="max-width: 400px;">
         <MudText Typo="Typo.h4" Class="mb-4">@(IsEdit ? "Edit Filler Preset" : "Add Filler Preset")</MudText>
 
-        <EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync">
-            <FluentValidationValidator/>
-            <MudCard>
-                <MudCardContent>
-                    <MudTextField Class="mt-3" Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/>
-                    <MudSelect Class="mt-3" Label="Filler Kind" @bind-Value="_model.FillerKind" For="@(() => _model.FillerKind)" Disabled="@IsEdit">
-                        <MudSelectItem Value="@(FillerKind.PreRoll)">Pre-Roll</MudSelectItem>
-                        <MudSelectItem Value="@(FillerKind.MidRoll)">Mid-Roll</MudSelectItem>
-                        <MudSelectItem Value="@(FillerKind.PostRoll)">Post-Roll</MudSelectItem>
-                        <MudSelectItem Value="@(FillerKind.Tail)">Tail</MudSelectItem>
-                        <MudSelectItem Value="@(FillerKind.Fallback)">Fallback</MudSelectItem>
-                    </MudSelect>
-                    <MudSelect Class="mt-3" Label="Filler Mode" @bind-Value="_model.FillerMode" For="@(() => _model.FillerMode)"
-                               Disabled="@(_model.FillerKind is FillerKind.Fallback or FillerKind.Tail)">
-                        <MudSelectItem Value="@(FillerMode.Duration)">Duration</MudSelectItem>
-                        <MudSelectItem Value="@(FillerMode.Count)">Count</MudSelectItem>
-                        <MudSelectItem Value="@(FillerMode.Pad)">Pad</MudSelectItem>
-                    </MudSelect>
-                    <MudTimePicker Class="mt-3" Label="Filler Duration" @bind-Time="@_model.Duration" For="@(() => _model.Duration)" Disabled="@(_model.FillerMode != FillerMode.Duration)"/>
-                    <MudTextField Class="mt-3" Label="Filler Count" @bind-Value="@_model.Count" For="@(() => _model.Count)" Disabled="@(_model.FillerMode != FillerMode.Count)"/>
-                    <MudSelect Class="mt-3" Label="Filler Pad To Nearest Minute" @bind-Value="_model.PadToNearestMinute" For="@(() => _model.PadToNearestMinute)" Disabled="@(_model.FillerMode != FillerMode.Pad)">
-                        <MudSelectItem T="int?" Value="5">5 (:00, :05, :10, :15, :20, etc)</MudSelectItem>
-                        <MudSelectItem T="int?" Value="10">10 (:00, :10, :20, :30, :40, :50)</MudSelectItem>
-                        <MudSelectItem T="int?" Value="15">15 (:00, :15, :30, :45)</MudSelectItem>
-                        <MudSelectItem T="int?" Value="30">30 (:00, :30)</MudSelectItem>
-                    </MudSelect>
-                    <MudCheckBox Class="mt-3" Label="Allow Watermarks" @bind-Checked="@_model.AllowWatermarks" For="@(() => _model.AllowWatermarks)"/>
-                    <MudSelect Class="mt-3" Label="Filler Collection Type" @bind-Value="_model.CollectionType" For="@(() => _model.CollectionType)">
-                        @foreach (ProgramScheduleItemCollectionType collectionType in Enum.GetValues<ProgramScheduleItemCollectionType>())
-                        {
-                            <MudSelectItem Value="@collectionType">@collectionType</MudSelectItem>
-                        }
-                    </MudSelect>
-                    @if (_model.CollectionType == ProgramScheduleItemCollectionType.Collection)
-                    {
-                        <MudSelect Class="mt-3"
-                                   T="MediaCollectionViewModel"
-                                   Label="Collection"
-                                   @bind-value="_model.Collection">
-                            @foreach (MediaCollectionViewModel collection in _mediaCollections)
-                            {
-                                <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
-                            }
-                        </MudSelect>
-                    }
-                    @if (_model.CollectionType == ProgramScheduleItemCollectionType.MultiCollection)
-                    {
-                        <MudSelect Class="mt-3"
-                                   T="MultiCollectionViewModel"
-                                   Label="Multi Collection"
-                                   @bind-value="_model.MultiCollection">
-                            @foreach (MultiCollectionViewModel collection in _multiCollections)
-                            {
-                                <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
-                            }
+        @if (_editContext is not null)
+        {
+            <EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync">
+                <FluentValidationValidator/>
+                <MudCard>
+                    <MudCardContent>
+                        <MudTextField Class="mt-3" Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/>
+                        <MudSelect Class="mt-3" Label="Filler Kind" @bind-Value="_model.FillerKind" For="@(() => _model.FillerKind)" Disabled="@IsEdit">
+                            <MudSelectItem Value="@(FillerKind.PreRoll)">Pre-Roll</MudSelectItem>
+                            <MudSelectItem Value="@(FillerKind.MidRoll)">Mid-Roll</MudSelectItem>
+                            <MudSelectItem Value="@(FillerKind.PostRoll)">Post-Roll</MudSelectItem>
+                            <MudSelectItem Value="@(FillerKind.Tail)">Tail</MudSelectItem>
+                            <MudSelectItem Value="@(FillerKind.Fallback)">Fallback</MudSelectItem>
                         </MudSelect>
-                    }
-                    @if (_model.CollectionType == ProgramScheduleItemCollectionType.SmartCollection)
-                    {
-                        <MudSelect Class="mt-3"
-                                   T="SmartCollectionViewModel"
-                                   Label="Smart Collection"
-                                   @bind-value="_model.SmartCollection">
-                            @foreach (SmartCollectionViewModel collection in _smartCollections)
-                            {
-                                <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
-                            }
+                        <MudSelect Class="mt-3" Label="Filler Mode" @bind-Value="_model.FillerMode" For="@(() => _model.FillerMode)"
+                                   Disabled="@(_model.FillerKind is FillerKind.Fallback or FillerKind.Tail)">
+                            <MudSelectItem Value="@(FillerMode.Duration)">Duration</MudSelectItem>
+                            <MudSelectItem Value="@(FillerMode.Count)">Count</MudSelectItem>
+                            <MudSelectItem Value="@(FillerMode.Pad)">Pad</MudSelectItem>
                         </MudSelect>
-                    }
-                    @if (_model.CollectionType == ProgramScheduleItemCollectionType.TelevisionShow)
-                    {
-                        <MudSelect Class="mt-3"
-                                   T="NamedMediaItemViewModel"
-                                   Label="Television Show"
-                                   @bind-value="_model.MediaItem">
-                            @foreach (NamedMediaItemViewModel show in _televisionShows)
-                            {
-                                <MudSelectItem Value="@show">@show.Name</MudSelectItem>
-                            }
-                        </MudSelect>
-                    }
-                    @if (_model.CollectionType == ProgramScheduleItemCollectionType.TelevisionSeason)
-                    {
-                        <MudSelect Class="mt-3"
-                                   T="NamedMediaItemViewModel"
-                                   Label="Television Season"
-                                   @bind-value="_model.MediaItem">
-                            @foreach (NamedMediaItemViewModel season in _televisionSeasons)
-                            {
-                                <MudSelectItem Value="@season">@season.Name</MudSelectItem>
-                            }
+                        <MudTimePicker Class="mt-3" Label="Filler Duration" @bind-Time="@_model.Duration" For="@(() => _model.Duration)" Disabled="@(_model.FillerMode != FillerMode.Duration)"/>
+                        <MudTextField Class="mt-3" Label="Filler Count" @bind-Value="@_model.Count" For="@(() => _model.Count)" Disabled="@(_model.FillerMode != FillerMode.Count)"/>
+                        <MudSelect Class="mt-3" Label="Filler Pad To Nearest Minute" @bind-Value="_model.PadToNearestMinute" For="@(() => _model.PadToNearestMinute)" Disabled="@(_model.FillerMode != FillerMode.Pad)">
+                            <MudSelectItem T="int?" Value="5">5 (:00, :05, :10, :15, :20, etc)</MudSelectItem>
+                            <MudSelectItem T="int?" Value="10">10 (:00, :10, :20, :30, :40, :50)</MudSelectItem>
+                            <MudSelectItem T="int?" Value="15">15 (:00, :15, :30, :45)</MudSelectItem>
+                            <MudSelectItem T="int?" Value="30">30 (:00, :30)</MudSelectItem>
                         </MudSelect>
-                    }
-                    @if (_model.CollectionType == ProgramScheduleItemCollectionType.Artist)
-                    {
-                        <MudSelect Class="mt-3"
-                                   T="NamedMediaItemViewModel"
-                                   Label="Artist"
-                                   @bind-value="_model.MediaItem">
-                            @foreach (NamedMediaItemViewModel artist in _artists)
+                        <MudCheckBox Class="mt-3" Label="Allow Watermarks" @bind-Checked="@_model.AllowWatermarks" For="@(() => _model.AllowWatermarks)"/>
+                        <MudSelect Class="mt-3" Label="Filler Collection Type" @bind-Value="_model.CollectionType" For="@(() => _model.CollectionType)">
+                            @foreach (ProgramScheduleItemCollectionType collectionType in Enum.GetValues<ProgramScheduleItemCollectionType>())
                             {
-                                <MudSelectItem Value="@artist">@artist.Name</MudSelectItem>
+                                <MudSelectItem Value="@collectionType">@collectionType</MudSelectItem>
                             }
                         </MudSelect>
-                    }
-                </MudCardContent>
-                <MudCardActions>
-                    <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary" Class="ml-auto">
-                        @(IsEdit ? "Save Changes" : "Add Filler Preset")
-                    </MudButton>
-                </MudCardActions>
-            </MudCard>
-        </EditForm>
+                        @if (_model.CollectionType == ProgramScheduleItemCollectionType.Collection)
+                        {
+                            <MudSelect Class="mt-3"
+                                       T="MediaCollectionViewModel"
+                                       Label="Collection"
+                                       @bind-value="_model.Collection">
+                                @foreach (MediaCollectionViewModel collection in _mediaCollections)
+                                {
+                                    <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                        }
+                        @if (_model.CollectionType == ProgramScheduleItemCollectionType.MultiCollection)
+                        {
+                            <MudSelect Class="mt-3"
+                                       T="MultiCollectionViewModel"
+                                       Label="Multi Collection"
+                                       @bind-value="_model.MultiCollection">
+                                @foreach (MultiCollectionViewModel collection in _multiCollections)
+                                {
+                                    <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                        }
+                        @if (_model.CollectionType == ProgramScheduleItemCollectionType.SmartCollection)
+                        {
+                            <MudSelect Class="mt-3"
+                                       T="SmartCollectionViewModel"
+                                       Label="Smart Collection"
+                                       @bind-value="_model.SmartCollection">
+                                @foreach (SmartCollectionViewModel collection in _smartCollections)
+                                {
+                                    <MudSelectItem Value="@collection">@collection.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                        }
+                        @if (_model.CollectionType == ProgramScheduleItemCollectionType.TelevisionShow)
+                        {
+                            <MudSelect Class="mt-3"
+                                       T="NamedMediaItemViewModel"
+                                       Label="Television Show"
+                                       @bind-value="_model.MediaItem">
+                                @foreach (NamedMediaItemViewModel show in _televisionShows)
+                                {
+                                    <MudSelectItem Value="@show">@show.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                        }
+                        @if (_model.CollectionType == ProgramScheduleItemCollectionType.TelevisionSeason)
+                        {
+                            <MudSelect Class="mt-3"
+                                       T="NamedMediaItemViewModel"
+                                       Label="Television Season"
+                                       @bind-value="_model.MediaItem">
+                                @foreach (NamedMediaItemViewModel season in _televisionSeasons)
+                                {
+                                    <MudSelectItem Value="@season">@season.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                        }
+                        @if (_model.CollectionType == ProgramScheduleItemCollectionType.Artist)
+                        {
+                            <MudSelect Class="mt-3"
+                                       T="NamedMediaItemViewModel"
+                                       Label="Artist"
+                                       @bind-value="_model.MediaItem">
+                                @foreach (NamedMediaItemViewModel artist in _artists)
+                                {
+                                    <MudSelectItem Value="@artist">@artist.Name</MudSelectItem>
+                                }
+                            </MudSelect>
+                        }
+                    </MudCardContent>
+                    <MudCardActions>
+                        <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary" Class="ml-auto">
+                            @(IsEdit ? "Save Changes" : "Add Filler Preset")
+                        </MudButton>
+                    </MudCardActions>
+                </MudCard>
+            </EditForm>
+        }
     </div>
 </MudContainer>
 
@@ -142,12 +145,12 @@
     private EditContext _editContext;
     private ValidationMessageStore _messageStore;
 
-    private List<MediaCollectionViewModel> _mediaCollections;
-    private List<MultiCollectionViewModel> _multiCollections;
-    private List<SmartCollectionViewModel> _smartCollections;
-    private List<NamedMediaItemViewModel> _televisionShows;
-    private List<NamedMediaItemViewModel> _televisionSeasons;
-    private List<NamedMediaItemViewModel> _artists;
+    private List<MediaCollectionViewModel> _mediaCollections = new();
+    private List<MultiCollectionViewModel> _multiCollections = new();
+    private List<SmartCollectionViewModel> _smartCollections = new();
+    private List<NamedMediaItemViewModel> _televisionShows = new();
+    private List<NamedMediaItemViewModel> _televisionSeasons = new();
+    private List<NamedMediaItemViewModel> _artists = new();
 
     public void Dispose()
     {
diff --git a/ErsatzTV/Pages/MultiCollectionEditor.razor b/ErsatzTV/Pages/MultiCollectionEditor.razor
index 332a8845d..a0941abfa 100644
--- a/ErsatzTV/Pages/MultiCollectionEditor.razor
+++ b/ErsatzTV/Pages/MultiCollectionEditor.razor
@@ -11,53 +11,56 @@
     <div style="max-width: 400px;">
         <MudText Typo="Typo.h4" Class="mb-4">@(IsEdit ? "Edit Multi Collection" : "Add Multi Collection")</MudText>
 
-        <EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync">
-            <FluentValidationValidator/>
-            <MudCard>
-                <MudCardContent>
-                    <MudTextField Class="mt-3" Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/>
-                    <MudSelect @ref="_collectionSelect"
-                               Class="mt-4"
-                               T="MediaCollectionViewModel"
-                               Label="Collection"
-                               @bind-value="_selectedCollection"
-                               HelperText="Disabled collections are already present in this multi collection">
-                        @foreach (MediaCollectionViewModel collection in _collections)
-                        {
-                            <MudSelectItem Disabled="@(_model.Items.Any(i => i.Collection.Id == collection.Id))"
-                                           Value="@collection">
-                                @collection.Name
-                            </MudSelectItem>
-                        }
-                    </MudSelect>
-                    <MudButton Variant="Variant.Filled" Color="Color.Secondary" OnClick="@(_ => AddCollection())" Class="mt-4 mr-auto">
-                        Add Collection
-                    </MudButton>
-                    <MudSelect @ref="_smartCollectionSelect"
-                               Class="mt-4"
-                               T="SmartCollectionViewModel"
-                               Label="Smart Collection"
-                               @bind-value="_selectedSmartCollection"
-                               HelperText="Disabled collections are already present in this multi collection">
-                        @foreach (SmartCollectionViewModel collection in _smartCollections)
-                        {
-                            <MudSelectItem Disabled="@(_model.Items.Any(i => i.Collection.Id == collection.Id))"
-                                           Value="@collection">
-                                @collection.Name
-                            </MudSelectItem>
-                        }
-                    </MudSelect>
-                    <MudButton Variant="Variant.Filled" Color="Color.Secondary" OnClick="@(_ => AddSmartCollection())" Class="mt-4 mr-auto">
-                        Add Smart Collection
-                    </MudButton>
-                </MudCardContent>
-                <MudCardActions>
-                    <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary" Class="mr-2 ml-auto">
-                        @(IsEdit ? "Save Changes" : "Add Multi Collection")
-                    </MudButton>
-                </MudCardActions>
-            </MudCard>
-        </EditForm>
+        @if (_editContext is not null)
+        {
+            <EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync">
+                <FluentValidationValidator/>
+                <MudCard>
+                    <MudCardContent>
+                        <MudTextField Class="mt-3" Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/>
+                        <MudSelect @ref="_collectionSelect"
+                                   Class="mt-4"
+                                   T="MediaCollectionViewModel"
+                                   Label="Collection"
+                                   @bind-value="_selectedCollection"
+                                   HelperText="Disabled collections are already present in this multi collection">
+                            @foreach (MediaCollectionViewModel collection in _collections)
+                            {
+                                <MudSelectItem Disabled="@(_model.Items.Any(i => i.Collection.Id == collection.Id))"
+                                               Value="@collection">
+                                    @collection.Name
+                                </MudSelectItem>
+                            }
+                        </MudSelect>
+                        <MudButton Variant="Variant.Filled" Color="Color.Secondary" OnClick="@(_ => AddCollection())" Class="mt-4 mr-auto">
+                            Add Collection
+                        </MudButton>
+                        <MudSelect @ref="_smartCollectionSelect"
+                                   Class="mt-4"
+                                   T="SmartCollectionViewModel"
+                                   Label="Smart Collection"
+                                   @bind-value="_selectedSmartCollection"
+                                   HelperText="Disabled collections are already present in this multi collection">
+                            @foreach (SmartCollectionViewModel collection in _smartCollections)
+                            {
+                                <MudSelectItem Disabled="@(_model.Items.Any(i => i.Collection.Id == collection.Id))"
+                                               Value="@collection">
+                                    @collection.Name
+                                </MudSelectItem>
+                            }
+                        </MudSelect>
+                        <MudButton Variant="Variant.Filled" Color="Color.Secondary" OnClick="@(_ => AddSmartCollection())" Class="mt-4 mr-auto">
+                            Add Smart Collection
+                        </MudButton>
+                    </MudCardContent>
+                    <MudCardActions>
+                        <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary" Class="mr-2 ml-auto">
+                            @(IsEdit ? "Save Changes" : "Add Multi Collection")
+                        </MudButton>
+                    </MudCardActions>
+                </MudCard>
+            </EditForm>
+        }
     </div>
 
     <MudTable Hover="true" Items="_model.Items.OrderBy(i => i.Collection.Name, StringComparer.CurrentCultureIgnoreCase)" Dense="true" Class="mt-6">
@@ -108,11 +111,12 @@
     [Parameter]
     public int Id { get; set; }
 
-    private readonly MultiCollectionEditViewModel _model = new();
+    private readonly MultiCollectionEditViewModel _model =
+        new() { Items = new List<MultiCollectionItemEditViewModel>() };
     private EditContext _editContext;
     private ValidationMessageStore _messageStore;
-    private List<MediaCollectionViewModel> _collections;
-    private List<SmartCollectionViewModel> _smartCollections;
+    private List<MediaCollectionViewModel> _collections = new();
+    private List<SmartCollectionViewModel> _smartCollections = new();
     private MediaCollectionViewModel _selectedCollection;
     private SmartCollectionViewModel _selectedSmartCollection;
     private MudSelect<MediaCollectionViewModel> _collectionSelect;
diff --git a/ErsatzTV/Pages/WatermarkEditor.razor b/ErsatzTV/Pages/WatermarkEditor.razor
index 88e828435..0ba335ce8 100644
--- a/ErsatzTV/Pages/WatermarkEditor.razor
+++ b/ErsatzTV/Pages/WatermarkEditor.razor
@@ -11,141 +11,144 @@
 
 <MudContainer MaxWidth="MaxWidth.ExtraLarge" Class="pt-8">
     <div style="max-width: 400px;">
-        <EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync">
-            <FluentValidationValidator/>
-            <MudCard>
-                <MudCardHeader>
-                    <CardHeaderContent>
-                        <MudText Typo="Typo.h5">@(IsEdit ? "Edit Watermark" : "Add Watermark")</MudText>
-                    </CardHeaderContent>
-                </MudCardHeader>
-                <MudCardContent>
-                    <MudTextField Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/>
-                    <MudSelect Class="mt-3" Label="Mode" @bind-Value="_model.Mode"
-                               For="@(() => _model.Mode)">
-                        <MudSelectItem Value="@(ChannelWatermarkMode.None)">None</MudSelectItem>
-                        <MudSelectItem Value="@(ChannelWatermarkMode.Permanent)">Permanent</MudSelectItem>
-                        <MudSelectItem Value="@(ChannelWatermarkMode.Intermittent)">Intermittent</MudSelectItem>
-                    </MudSelect>
-                    <MudSelect Class="mt-3" Label="Image Source" @bind-Value="_model.ImageSource"
-                               For="@(() => _model.ImageSource)"
-                               Disabled="@(_model.Mode == ChannelWatermarkMode.None)">
-                        <MudSelectItem Value="@(ChannelWatermarkImageSource.Custom)">Custom</MudSelectItem>
-                        <MudSelectItem Value="@(ChannelWatermarkImageSource.ChannelLogo)">Channel Logo</MudSelectItem>
-                    </MudSelect>
-                    <MudGrid Class="mt-3" Style="align-items: center" Justify="Justify.Center">
-                        <MudItem xs="6">
-                            <InputFile id="watermarkFileInput" OnChange="UploadWatermark" style="display: none;"/>
-                            @if (!string.IsNullOrWhiteSpace(_model.Image) && _model.ImageSource == ChannelWatermarkImageSource.Custom)
-                            {
-                                <MudElement HtmlTag="img" src="@($"artwork/watermarks/{_model.Image}")" Style="max-height: 50px"/>
-                            }
-                            <ValidationMessage For="@(() => _model.Image)" style="color: #f44336 !important;"/>
-                        </MudItem>
-                        <MudItem xs="6">
-                            <MudButton Class="ml-auto" HtmlTag="label"
-                                       Variant="Variant.Filled"
-                                       Color="Color.Primary"
-                                       StartIcon="@Icons.Material.Filled.CloudUpload"
-                                       Disabled="@(_model.ImageSource != ChannelWatermarkImageSource.Custom)"
-                                       for="watermarkFileInput">
-                                Upload Image
-                            </MudButton>
-                        </MudItem>
-                    </MudGrid>
-                    <MudSelect Class="mt-3" Label="Location" @bind-Value="_model.Location"
-                               For="@(() => _model.Location)"
-                               Disabled="@(_model.Mode == ChannelWatermarkMode.None)">
-                        <MudSelectItem Value="@(WatermarkLocation.BottomRight)">Bottom Right</MudSelectItem>
-                        <MudSelectItem Value="@(WatermarkLocation.BottomMiddle)">Bottom Middle</MudSelectItem>
-                        <MudSelectItem Value="@(WatermarkLocation.BottomLeft)">Bottom Left</MudSelectItem>
-                        <MudSelectItem Value="@(WatermarkLocation.LeftMiddle)">Left Middle</MudSelectItem>
-                        <MudSelectItem Value="@(WatermarkLocation.TopLeft)">Top Left</MudSelectItem>
-                        <MudSelectItem Value="@(WatermarkLocation.TopMiddle)">Top Middle</MudSelectItem>
-                        <MudSelectItem Value="@(WatermarkLocation.TopRight)">Top Right</MudSelectItem>
-                        <MudSelectItem Value="@(WatermarkLocation.RightMiddle)">Right Middle</MudSelectItem>
-                    </MudSelect>
-                    <MudCheckBox Class="mt-3" Label="Place Within Source Content"
-                                 @bind-Checked="_model.PlaceWithinSourceContent"
-                                 For="@(() => _model.PlaceWithinSourceContent)"
-                                 Disabled="@(_model.Mode == ChannelWatermarkMode.None)"/>
-                    <MudGrid Class="mt-3" Style="align-items: start" Justify="Justify.Center">
-                        <MudItem xs="6">
-                            <MudSelect Label="Size" @bind-Value="_model.Size"
-                                       For="@(() => _model.Size)"
-                                       Disabled="@(_model.Mode == ChannelWatermarkMode.None)">
-                                <MudSelectItem Value="@(WatermarkSize.Scaled)">Scaled</MudSelectItem>
-                                <MudSelectItem Value="@(WatermarkSize.ActualSize)">Actual Size</MudSelectItem>
-                            </MudSelect>
-                        </MudItem>
-                        <MudItem xs="6">
-                            <MudTextField Label="Width" @bind-Value="_model.Width"
-                                          For="@(() => _model.Width)"
-                                          Adornment="Adornment.End"
-                                          AdornmentText="%"
-                                          Disabled="@(_model.Mode == ChannelWatermarkMode.None || _model.Size == WatermarkSize.ActualSize)"
-                                          Immediate="true"/>
-                        </MudItem>
-                    </MudGrid>
-                    <MudGrid Class="mt-3" Style="align-items: start" Justify="Justify.Center">
-                        <MudItem xs="6">
-                            <MudTextField Label="Horizontal Margin" @bind-Value="_model.HorizontalMargin"
-                                          For="@(() => _model.HorizontalMargin)"
-                                          Adornment="Adornment.End"
-                                          AdornmentText="%"
-                                          Disabled="@(_model.Mode == ChannelWatermarkMode.None)"
-                                          Immediate="true"/>
-                        </MudItem>
-                        <MudItem xs="6">
-                            <MudTextField Label="Vertical Margin" @bind-Value="_model.VerticalMargin"
-                                          For="@(() => _model.VerticalMargin)"
-                                          Adornment="Adornment.End"
-                                          AdornmentText="%"
-                                          Disabled="@(_model.Mode == ChannelWatermarkMode.None)"
-                                          Immediate="true"/>
-                        </MudItem>
-                    </MudGrid>
-                    <MudGrid Class="mt-3" Style="align-items: start" Justify="Justify.Center">
-                        <MudItem xs="6">
-                            <MudSelect Label="Frequency" @bind-Value="_model.FrequencyMinutes"
-                                       For="@(() => _model.FrequencyMinutes)"
-                                       Disabled="@(_model.Mode != ChannelWatermarkMode.Intermittent)">
-                                <MudSelectItem Value="5">5 minutes</MudSelectItem>
-                                <MudSelectItem Value="10">10 minutes</MudSelectItem>
-                                <MudSelectItem Value="15">15 minutes</MudSelectItem>
-                                <MudSelectItem Value="20">20 minutes</MudSelectItem>
-                                <MudSelectItem Value="30">30 minutes</MudSelectItem>
-                                <MudSelectItem Value="60">60 minutes</MudSelectItem>
-                            </MudSelect>
-                        </MudItem>
-                        <MudItem xs="6">
-                            <MudTextField Label="Duration" @bind-Value="_model.DurationSeconds"
-                                          For="@(() => _model.DurationSeconds)"
-                                          Adornment="Adornment.End"
-                                          AdornmentText="seconds"
-                                          Disabled="@(_model.Mode != ChannelWatermarkMode.Intermittent)"
-                                          Immediate="true"/>
-                        </MudItem>
-                    </MudGrid>
-                    <MudGrid Class="mt-3" Style="align-items: start" Justify="Justify.Center">
-                        <MudItem xs="6">
-                            <MudTextField Label="Opacity" @bind-Value="_model.Opacity"
-                                          For="@(() => _model.Opacity)"
-                                          Adornment="Adornment.End"
-                                          AdornmentText="%"
-                                          Disabled="@(_model.Mode == ChannelWatermarkMode.None)"
-                                          Immediate="true"/>
-                        </MudItem>
-                        <MudItem xs="6"/>
-                    </MudGrid>
-                </MudCardContent>
-                <MudCardActions>
-                    <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary">
-                        @(IsEdit ? "Save Changes" : "Add Watermark")
-                    </MudButton>
-                </MudCardActions>
-            </MudCard>
-        </EditForm>
+        @if (_editContext is not null)
+        {
+            <EditForm EditContext="_editContext" OnSubmit="@HandleSubmitAsync">
+                <FluentValidationValidator/>
+                <MudCard>
+                    <MudCardHeader>
+                        <CardHeaderContent>
+                            <MudText Typo="Typo.h5">@(IsEdit ? "Edit Watermark" : "Add Watermark")</MudText>
+                        </CardHeaderContent>
+                    </MudCardHeader>
+                    <MudCardContent>
+                        <MudTextField Label="Name" @bind-Value="_model.Name" For="@(() => _model.Name)"/>
+                        <MudSelect Class="mt-3" Label="Mode" @bind-Value="_model.Mode"
+                                   For="@(() => _model.Mode)">
+                            <MudSelectItem Value="@(ChannelWatermarkMode.None)">None</MudSelectItem>
+                            <MudSelectItem Value="@(ChannelWatermarkMode.Permanent)">Permanent</MudSelectItem>
+                            <MudSelectItem Value="@(ChannelWatermarkMode.Intermittent)">Intermittent</MudSelectItem>
+                        </MudSelect>
+                        <MudSelect Class="mt-3" Label="Image Source" @bind-Value="_model.ImageSource"
+                                   For="@(() => _model.ImageSource)"
+                                   Disabled="@(_model.Mode == ChannelWatermarkMode.None)">
+                            <MudSelectItem Value="@(ChannelWatermarkImageSource.Custom)">Custom</MudSelectItem>
+                            <MudSelectItem Value="@(ChannelWatermarkImageSource.ChannelLogo)">Channel Logo</MudSelectItem>
+                        </MudSelect>
+                        <MudGrid Class="mt-3" Style="align-items: center" Justify="Justify.Center">
+                            <MudItem xs="6">
+                                <InputFile id="watermarkFileInput" OnChange="UploadWatermark" style="display: none;"/>
+                                @if (!string.IsNullOrWhiteSpace(_model.Image) && _model.ImageSource == ChannelWatermarkImageSource.Custom)
+                                {
+                                    <MudElement HtmlTag="img" src="@($"artwork/watermarks/{_model.Image}")" Style="max-height: 50px"/>
+                                }
+                                <ValidationMessage For="@(() => _model.Image)" style="color: #f44336 !important;"/>
+                            </MudItem>
+                            <MudItem xs="6">
+                                <MudButton Class="ml-auto" HtmlTag="label"
+                                           Variant="Variant.Filled"
+                                           Color="Color.Primary"
+                                           StartIcon="@Icons.Material.Filled.CloudUpload"
+                                           Disabled="@(_model.ImageSource != ChannelWatermarkImageSource.Custom)"
+                                           for="watermarkFileInput">
+                                    Upload Image
+                                </MudButton>
+                            </MudItem>
+                        </MudGrid>
+                        <MudSelect Class="mt-3" Label="Location" @bind-Value="_model.Location"
+                                   For="@(() => _model.Location)"
+                                   Disabled="@(_model.Mode == ChannelWatermarkMode.None)">
+                            <MudSelectItem Value="@(WatermarkLocation.BottomRight)">Bottom Right</MudSelectItem>
+                            <MudSelectItem Value="@(WatermarkLocation.BottomMiddle)">Bottom Middle</MudSelectItem>
+                            <MudSelectItem Value="@(WatermarkLocation.BottomLeft)">Bottom Left</MudSelectItem>
+                            <MudSelectItem Value="@(WatermarkLocation.LeftMiddle)">Left Middle</MudSelectItem>
+                            <MudSelectItem Value="@(WatermarkLocation.TopLeft)">Top Left</MudSelectItem>
+                            <MudSelectItem Value="@(WatermarkLocation.TopMiddle)">Top Middle</MudSelectItem>
+                            <MudSelectItem Value="@(WatermarkLocation.TopRight)">Top Right</MudSelectItem>
+                            <MudSelectItem Value="@(WatermarkLocation.RightMiddle)">Right Middle</MudSelectItem>
+                        </MudSelect>
+                        <MudCheckBox Class="mt-3" Label="Place Within Source Content"
+                                     @bind-Checked="_model.PlaceWithinSourceContent"
+                                     For="@(() => _model.PlaceWithinSourceContent)"
+                                     Disabled="@(_model.Mode == ChannelWatermarkMode.None)"/>
+                        <MudGrid Class="mt-3" Style="align-items: start" Justify="Justify.Center">
+                            <MudItem xs="6">
+                                <MudSelect Label="Size" @bind-Value="_model.Size"
+                                           For="@(() => _model.Size)"
+                                           Disabled="@(_model.Mode == ChannelWatermarkMode.None)">
+                                    <MudSelectItem Value="@(WatermarkSize.Scaled)">Scaled</MudSelectItem>
+                                    <MudSelectItem Value="@(WatermarkSize.ActualSize)">Actual Size</MudSelectItem>
+                                </MudSelect>
+                            </MudItem>
+                            <MudItem xs="6">
+                                <MudTextField Label="Width" @bind-Value="_model.Width"
+                                              For="@(() => _model.Width)"
+                                              Adornment="Adornment.End"
+                                              AdornmentText="%"
+                                              Disabled="@(_model.Mode == ChannelWatermarkMode.None || _model.Size == WatermarkSize.ActualSize)"
+                                              Immediate="true"/>
+                            </MudItem>
+                        </MudGrid>
+                        <MudGrid Class="mt-3" Style="align-items: start" Justify="Justify.Center">
+                            <MudItem xs="6">
+                                <MudTextField Label="Horizontal Margin" @bind-Value="_model.HorizontalMargin"
+                                              For="@(() => _model.HorizontalMargin)"
+                                              Adornment="Adornment.End"
+                                              AdornmentText="%"
+                                              Disabled="@(_model.Mode == ChannelWatermarkMode.None)"
+                                              Immediate="true"/>
+                            </MudItem>
+                            <MudItem xs="6">
+                                <MudTextField Label="Vertical Margin" @bind-Value="_model.VerticalMargin"
+                                              For="@(() => _model.VerticalMargin)"
+                                              Adornment="Adornment.End"
+                                              AdornmentText="%"
+                                              Disabled="@(_model.Mode == ChannelWatermarkMode.None)"
+                                              Immediate="true"/>
+                            </MudItem>
+                        </MudGrid>
+                        <MudGrid Class="mt-3" Style="align-items: start" Justify="Justify.Center">
+                            <MudItem xs="6">
+                                <MudSelect Label="Frequency" @bind-Value="_model.FrequencyMinutes"
+                                           For="@(() => _model.FrequencyMinutes)"
+                                           Disabled="@(_model.Mode != ChannelWatermarkMode.Intermittent)">
+                                    <MudSelectItem Value="5">5 minutes</MudSelectItem>
+                                    <MudSelectItem Value="10">10 minutes</MudSelectItem>
+                                    <MudSelectItem Value="15">15 minutes</MudSelectItem>
+                                    <MudSelectItem Value="20">20 minutes</MudSelectItem>
+                                    <MudSelectItem Value="30">30 minutes</MudSelectItem>
+                                    <MudSelectItem Value="60">60 minutes</MudSelectItem>
+                                </MudSelect>
+                            </MudItem>
+                            <MudItem xs="6">
+                                <MudTextField Label="Duration" @bind-Value="_model.DurationSeconds"
+                                              For="@(() => _model.DurationSeconds)"
+                                              Adornment="Adornment.End"
+                                              AdornmentText="seconds"
+                                              Disabled="@(_model.Mode != ChannelWatermarkMode.Intermittent)"
+                                              Immediate="true"/>
+                            </MudItem>
+                        </MudGrid>
+                        <MudGrid Class="mt-3" Style="align-items: start" Justify="Justify.Center">
+                            <MudItem xs="6">
+                                <MudTextField Label="Opacity" @bind-Value="_model.Opacity"
+                                              For="@(() => _model.Opacity)"
+                                              Adornment="Adornment.End"
+                                              AdornmentText="%"
+                                              Disabled="@(_model.Mode == ChannelWatermarkMode.None)"
+                                              Immediate="true"/>
+                            </MudItem>
+                            <MudItem xs="6"/>
+                        </MudGrid>
+                    </MudCardContent>
+                    <MudCardActions>
+                        <MudButton ButtonType="ButtonType.Submit" Variant="Variant.Filled" Color="Color.Primary">
+                            @(IsEdit ? "Save Changes" : "Add Watermark")
+                        </MudButton>
+                    </MudCardActions>
+                </MudCard>
+            </EditForm>
+        }
     </div>
 </MudContainer>