Refactor collection initializers to use C# 12 collection expressions

This commit updates various files across the Core and WebApp projects to replace traditional collection initializers with C# 12 collection expressions. Changes include modifications to EventAssignment.cs, TeamScheduler_DecisionTree.cs, CareerField.cs, EventDefinition.cs, and several components in the WebApp. These updates enhance code readability and maintainability by adhering to modern C# syntax standards.
2026-01-11 10:35:58 -05:00
parent e53403c934
commit 8af86e22d9
20 changed files with 288 additions and 162 deletions
@@ -118,7 +118,7 @@ else
                {
                    if (!_fieldIdToCareers.ContainsKey(field.Id))
                    {
-                        _fieldIdToCareers[field.Id] = new List<string>();
+                        _fieldIdToCareers[field.Id] = [];
                    }
                    // Add unique career names for this field
                    foreach (var career in evt.RelatedCareers)
@@ -153,8 +153,8 @@ else

    private NetworkData GenerateNetworkData(List<EventDefinition> events)
    {
-        var nodes = new List<Node>();
-        var edges = new List<Edge>();
+        List<Node> nodes = [];
+        List<Edge> edges = [];

        // Dictionary to track node IDs (to avoid duplicates)
        var eventNodeIds = new Dictionary<int, string>();
@@ -284,7 +284,7 @@ else
                        Title = field.Name,
                        Description = field.Description,
                        IsCareerField = true,
-                        Careers = careers?.ToList() ?? new List<string>()
+                        Careers = careers?.ToList() ?? []
                    };
                }
            }
@@ -1,5 +1,6 @@
@page "/events"
@attribute [Authorize]
+@implements IAsyncDisposable
@using Microsoft.EntityFrameworkCore
@using WebApp.Models
@using WebApp.Components.Shared.Components
@@ -74,16 +75,32 @@
@code {
    MudDataGrid<EventDefinition> _dataGrid = null!;
    private bool _isLoading = true;
+    private CancellationTokenSource? _cancellationTokenSource;
+    private bool _isDisposed = false;
+
+    protected override void OnInitialized()
+    {
+        _cancellationTokenSource = new CancellationTokenSource();
+    }

    private async Task<GridData<EventDefinition>> ServerReload(GridState<EventDefinition> state)
    {
+        if (_isDisposed)
+        {
+            return new GridData<EventDefinition> { TotalItems = 0, Items = [] };
+        }
+
        _isLoading = true;
        try
        {
-            var query = Context.Events.OrderBy(e => e.Name).Where(state.FilterDefinitions).OrderBy(state.SortDefinitions);
+            var cancellationToken = _cancellationTokenSource?.Token ?? CancellationToken.None;

-            var totalItems = await query.CountAsync();
-            var pagedData = await query.Skip(state.Page * state.PageSize).Take(state.PageSize).ToArrayAsync();
+            var query = Context.Events
+                .AsNoTracking()
+                .OrderBy(e => e.Name).Where(state.FilterDefinitions).OrderBy(state.SortDefinitions);
+
+            var totalItems = await query.CountAsync(cancellationToken);
+            var pagedData = await query.Skip(state.Page * state.PageSize).Take(state.PageSize).ToArrayAsync(cancellationToken);

            return new GridData<EventDefinition>
            {
@@ -91,31 +108,82 @@
                Items = pagedData
            };
        }
+        catch (TaskCanceledException)
+        {
+            return new GridData<EventDefinition> { TotalItems = 0, Items = [] };
+        }
+        catch (JSDisconnectedException)
+        {
+            return new GridData<EventDefinition> { TotalItems = 0, Items = [] };
+        }
        finally
        {
-            _isLoading = false;
+            if (!_isDisposed)
+            {
+                _isLoading = false;
+            }
        }
    }

    private async Task DeleteEventDefinition(EventDefinition evt)
    {
-        //_isRowBlocked = true;
+        if (_isDisposed) return;

-        var result = await DialogService
-            .ShowMessageBox("Delete Event",
-                (MarkupString)$"Are you sure want to delete <b>{evt.Name}</b>? This cannot be undone.",
-                yesText:"Yes",
-                noText:"Cancel");
-
-        if (result == true)
+        try
        {
-            Context.Events.Remove(evt!);
-            await Context.SaveChangesAsync();
-            Snackbar.Add($"Delete event: Delete of Event {evt.Name}", Severity.Info);
-        }
+            var cancellationToken = _cancellationTokenSource?.Token ?? CancellationToken.None;

-        //_isRowBlocked = false;
-        StateHasChanged();
-        await _dataGrid.ReloadServerData();
+            var result = await DialogService
+                .ShowMessageBox("Delete Event",
+                    (MarkupString)$"Are you sure want to delete <b>{evt.Name}</b>? This cannot be undone.",
+                    yesText:"Yes",
+                    noText:"Cancel");
+
+            if (_isDisposed) return;
+
+            if (result == true)
+            {
+                Context.Events.Remove(evt!);
+                await Context.SaveChangesAsync(cancellationToken);
+                
+                if (!_isDisposed)
+                {
+                    Snackbar.Add($"Event {evt.Name} deleted", Severity.Info);
+                }
+            }
+
+            if (!_isDisposed)
+            {
+                StateHasChanged();
+                await _dataGrid.ReloadServerData();
+            }
+        }
+        catch (TaskCanceledException)
+        {
+            // Component was disposed, ignore
+        }
+        catch (JSDisconnectedException)
+        {
+            // JS connection lost, ignore
+        }
+        catch (Exception ex)
+        {
+            if (!_isDisposed)
+            {
+                Snackbar.Add($"Error deleting event: {ex.Message}", Severity.Error);
+            }
+        }
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (!_isDisposed)
+        {
+            _isDisposed = true;
+            _cancellationTokenSource?.Cancel();
+            _cancellationTokenSource?.Dispose();
+            _cancellationTokenSource = null;
+        }
+        await ValueTask.CompletedTask;
    }
 }