Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix "Next" never sending admin logs for rounds outside the cache, show a round's total logs on the UI (#16531)

Browse Source 
* Fix next never sending logs for rounds outside the cache

* Show round's total log count on the ui

* Disable next button when waiting for a next response

* Cleanup AdminLogsEui.CurrentRoundId

* Fix popout window width
This commit is contained in:
DrSmugleaf
2023-05-17 04:04:28 -07:00
committed by GitHub
parent 9ef5bd389c
commit b5fe408baf
10 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Administration/Logs/AdminLogManager.cs
View File

@@ -374,4 +374,9 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
{
return Round(_currentRoundId);
}
public Task<int> CountLogs(int round)
{
return _db.CountAdminLogs(round);
}
}

30
Content.Server/Administration/Logs/AdminLogsEui.cs
View File

@@ -29,10 +29,11 @@ public sealed class AdminLogsEui : BaseEui
private int _clientBatchSize;
private bool _isLoading = true;
private readonly Dictionary<Guid, string> _players = new();
private int _roundLogs;
private CancellationTokenSource _logSendCancellation = new();
private LogFilter _filter;
private DefaultObjectPool<List<SharedAdminLog>> _adminLogListPool =
private readonly DefaultObjectPool<List<SharedAdminLog>> _adminLogListPool =
new(new ListPolicy<SharedAdminLog>());
public AdminLogsEui()
@@ -50,7 +51,7 @@ public sealed class AdminLogsEui : BaseEui
};
}
public int CurrentRoundId => EntitySystem.Get<GameTicker>().RoundId;
private int CurrentRoundId => EntitySystem.Get<GameTicker>().RoundId;
public override async void Opened()
{
@@ -58,8 +59,8 @@ public sealed class AdminLogsEui : BaseEui
_adminManager.OnPermsChanged += OnPermsChanged;
var roundId = _filter.Round ?? EntitySystem.Get<GameTicker>().RoundId;
LoadFromDb(roundId);
var roundId = _filter.Round ?? CurrentRoundId;
await LoadFromDb(roundId);
}
private void ClientBatchSizeChanged(int value)
@@ -79,13 +80,13 @@ public sealed class AdminLogsEui : BaseEui
{
if (_isLoading)
{
return new AdminLogsEuiState(CurrentRoundId, new Dictionary<Guid, string>())
return new AdminLogsEuiState(CurrentRoundId, new Dictionary<Guid, string>(), 0)
{
IsLoading = true
};
}
var state = new AdminLogsEuiState(CurrentRoundId, _players);
var state = new AdminLogsEuiState(CurrentRoundId, _players, _roundLogs);
return state;
}
@@ -120,12 +121,12 @@ public sealed class AdminLogsEui : BaseEui
AnyPlayers = request.AnyPlayers,
AllPlayers = request.AllPlayers,
IncludeNonPlayers = request.IncludeNonPlayers,
LastLogId = 0,
LastLogId = null,
Limit = _clientBatchSize
};
var roundId = _filter.Round ??= EntitySystem.Get<GameTicker>().RoundId;
LoadFromDb(roundId);
var roundId = _filter.Round ??= CurrentRoundId;
await LoadFromDb(roundId);
SendLogs(true);
break;
@@ -192,13 +193,16 @@ public sealed class AdminLogsEui : BaseEui
_logSendCancellation.Dispose();
}
private async void LoadFromDb(int roundId)
private async Task LoadFromDb(int roundId)
{
_isLoading = true;
StateDirty();
var round = await Task.Run(() => _adminLogs.Round(roundId));
var players = round.Players
var round = _adminLogs.Round(roundId);
var count = _adminLogs.CountLogs(roundId);
await Task.WhenAll(round, count);
var players = (await round).Players
.ToDictionary(player => player.UserId, player => player.LastSeenUserName);
_players.Clear();
@@ -208,6 +212,8 @@ public sealed class AdminLogsEui : BaseEui
_players.Add(id, name);
}
_roundLogs = await count;
_isLoading = false;
StateDirty();
}

1
Content.Server/Administration/Logs/IAdminLogManager.cs
View File

@@ -23,4 +23,5 @@ public interface IAdminLogManager : ISharedAdminLogManager
IAsyncEnumerable<string> CurrentRoundMessages(LogFilter? filter = null);
IAsyncEnumerable<JsonDocument> CurrentRoundJson(LogFilter? filter = null);
Task<Round> CurrentRound();
Task<int> CountLogs(int round);
}