fix(wpf): ensure skill list builds correctly after session or stats are cleared

Author: ihonliu

StarResonanceDpsAnalysis.WPF/ViewModels/DpsStatisticsSubViewModel.cs

@@ -178,7 +178,7 @@ protected StatisticDataViewModel GetOrAddStatisticDataViewModel(PlayerStatistics
 
         var playerInfoDict = _dataSourceEngine.GetPlayerInfoDictionary();
         var ret = playerInfoDict.TryGetValue(playerStats.Uid, out var playerInfo);
-        slot = new StatisticDataViewModel(_debugFunctions, _localizationManager, FetchSkillList)
+        slot = new StatisticDataViewModel(_debugFunctions, _localizationManager, playerStats)
         {
             Index = 999,
             Value = 0,
@@ -205,24 +205,7 @@ protected StatisticDataViewModel GetOrAddStatisticDataViewModel(PlayerStatistics
         return slot;
     }
 
-    private SkillViewModelCollection FetchSkillList(long playerUid)
-    {
-        var data = _dataSourceEngine.CurrentSource.GetRawData();
-        var found = data.TryGetValue(playerUid, out var value);
-
-        Debug.Assert(found, $"PlayerNotFound with {playerUid}");
-        Debug.Assert(value != null, nameof(value) + " != null");
-        if (!found)
-        {
-            _logger.LogWarning("Player not found with {playerUid}", playerUid);
-            return SkillViewModelCollection.Empty;
-        }
-
-        var list = value.ToSkillItemVmList(_localizationManager);
-        return list;
-    }
-
-    private void UpdatePlayerInfo(StatisticDataViewModel slot, PlayerInfo? playerInfo)
+    private static void UpdatePlayerInfo(StatisticDataViewModel slot, PlayerInfo? playerInfo)
     {
         if (playerInfo != null)
         {
@@ -304,6 +287,7 @@ internal void UpdateDataOptimized(Dictionary<long, DpsDataProcessed> processedDa
             slot.Value = processed.Value;
             slot.DurationTicks = processed.DurationTicks;
             slot.ValuePerSecond = processed.ValuePerSecond;
+            slot.OriginalData = processed.OriginalData;
 
             // Set current player slot if this is the current player
             if (hasCurrentPlayer && uid == currentPlayerUid)
@@ -358,14 +342,15 @@ private void UpdateItemIndices()
     public void AddTestItem()
     {
         var slots = Data;
-        var newItem = new StatisticDataViewModel(_debugFunctions, _localizationManager, FetchSkillListFunc)
+        var uid = Random.Shared.Next(100, 999);
+        var newItem = new StatisticDataViewModel(_debugFunctions, _localizationManager, new PlayerStatistics(uid))
         {
             Index = slots.Count + 1,
             Value = (ulong)Random.Shared.Next(100, 2000),
             DurationTicks = 60000,
             Player = new PlayerInfoViewModel(LocalizationManager.Instance)
             {
-                Uid = Random.Shared.Next(100, 999),
+                Uid = uid,
                 Class = RandomClass(),
                 Guild = "Test Guild",
                 Name = $"Test Player {slots.Count + 1}",
@@ -449,14 +434,6 @@ public void AddTestItem()
         slots.Add(newItem);
         SortSlotsInPlace();
         return;
-
-        static SkillViewModelCollection FetchSkillListFunc(long uid)
-        {
-            List<SkillItemViewModel> damage = [new()];
-            List<SkillItemViewModel> healing = [new()];
-            List<SkillItemViewModel> taken = [new()];
-            return new SkillViewModelCollection(damage, healing, taken);
-        }
     }
 
     private Classes RandomClass()

StarResonanceDpsAnalysis.WPF/ViewModels/StatisticDataViewModel.cs

@@ -2,6 +2,8 @@
 using System.Diagnostics;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using StarResonanceDpsAnalysis.Core.Statistics;
+using StarResonanceDpsAnalysis.WPF.Extensions;
 using StarResonanceDpsAnalysis.WPF.Localization;
 
 namespace StarResonanceDpsAnalysis.WPF.ViewModels;
@@ -15,7 +17,7 @@ public record struct SkillViewModelCollection(
 }
 
 [DebuggerDisplay("Name:{Player?.Name};Value:{Value}")]
-public partial class StatisticDataViewModel(DebugFunctions debug, LocalizationManager localizationManager, Func<long , SkillViewModelCollection> fetchSkillListFunc) : BaseViewModel, IComparable<StatisticDataViewModel>
+public partial class StatisticDataViewModel(DebugFunctions debug, LocalizationManager localizationManager, PlayerStatistics originalData) : BaseViewModel, IComparable<StatisticDataViewModel>
 {
     [ObservableProperty] private long _durationTicks;
     [ObservableProperty] private long _index;
@@ -34,6 +36,7 @@ public partial class StatisticDataViewModel(DebugFunctions debug, LocalizationMa
     public SkillDataCollection Damage { get; } = new();
     public SkillDataCollection Heal { get; } = new();
     public SkillDataCollection TakenDamage { get; } = new();
+    public PlayerStatistics OriginalData { get; set; } = originalData;
 
     public int CompareTo(StatisticDataViewModel? other)
     {
@@ -78,9 +81,9 @@ private void SortSkillList()
         SkillListRefreshTrigger++;
     }
 
-    private void FetchSkillList()
+    private void UpdateTotalSkillList()
     {
-        var (damage, healing, taken) = fetchSkillListFunc.Invoke(Player.Uid);
+        var (damage, healing, taken) = OriginalData.ToSkillItemVmList(localizationManager);
         Damage.TotalSkillList = damage;
         Heal.TotalSkillList = healing;
         TakenDamage.TotalSkillList = taken;
@@ -90,7 +93,7 @@ private void FetchSkillList()
     private void MouseEnterItem(int limit)
     {
         SetHoverStateAction?.Invoke(true);
-        FetchSkillList();
+        UpdateTotalSkillList();
         SortSkillList();
         RefreshFilterLists(limit);
     }