tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add non-players button to log viewer (#14097)

Browse Source 
* add include non-players button to log viewer

* breakout player filter check

* fix sending player logs with no players selected

* fix default not returning player logs, causing test issue
This commit is contained in:
Chief-Engineer
2023-02-28 10:09:35 -06:00
committed by GitHub
parent fbb23bd540
commit 8f402ee8ca
9 changed files with 84 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Administration/UI/Logs/AdminLogsControl.xaml
View File

@@ -32,6 +32,8 @@
<BoxContainer Orientation="Vertical" MinWidth="200">
<LineEdit Name="PlayerSearch" Access="Public" StyleClasses="actionSearchBox"
HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-players-placeholder}"/>
<Button Name="IncludeNonPlayersButton" Text="{Loc admin-logs-include-non-player}"
MinWidth="100" StyleClasses="ButtonSquare" ToggleMode="True" />
<BoxContainer Orientation="Horizontal">
<Button Name="SelectAllPlayersButton" Text="{Loc admin-logs-select-all}"
MinWidth="100" StyleClasses="ButtonSquare" />

39
Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
View File

@@ -34,6 +34,7 @@ public sealed partial class AdminLogsControl : Control
SelectAllTypesButton.OnPressed += SelectAllTypes;
SelectNoTypesButton.OnPressed += SelectNoTypes;
IncludeNonPlayersButton.OnPressed += IncludeNonPlayers;
SelectAllPlayersButton.OnPressed += SelectAllPlayers;
SelectNoPlayersButton.OnPressed += SelectNoPlayers;
@@ -53,6 +54,7 @@ public sealed partial class AdminLogsControl : Control
public string Search => LogSearch.Text;
private int ShownLogs { get; set; }
private int TotalLogs { get; set; }
public bool IncludeNonPlayerLogs { get; set; }
public HashSet<LogType> SelectedTypes { get; } = new();
@@ -139,6 +141,13 @@ public sealed partial class AdminLogsControl : Control
UpdateLogs();
}
private void IncludeNonPlayers(ButtonEventArgs args)
{
IncludeNonPlayerLogs = args.Button.Pressed;
UpdateLogs();
}
private void SelectAllPlayers(ButtonEventArgs args)
{
SelectedPlayers.Clear();
@@ -259,12 +268,33 @@ public sealed partial class AdminLogsControl : Control
button.Text.Contains(PlayerSearch.Text, StringComparison.OrdinalIgnoreCase);
}
private bool LogMatchesPlayerFilter(AdminLogLabel label)
{
if (label.Log.Players.Length == 0)
return SelectedPlayers.Count == 0 || IncludeNonPlayerLogs;
return SelectedPlayers.Overlaps(label.Log.Players);
}
private bool ShouldShowLog(AdminLogLabel label)
{
return SelectedTypes.Contains(label.Log.Type) &&
(SelectedPlayers.Count + label.Log.Players.Length == 0 || SelectedPlayers.Overlaps(label.Log.Players)) &&
SelectedImpacts.Contains(label.Log.Impact) &&
label.Log.Message.Contains(LogSearch.Text, StringComparison.OrdinalIgnoreCase);
// Check log type
if (!SelectedTypes.Contains(label.Log.Type))
return false;
// Check players
if (!LogMatchesPlayerFilter(label))
return false;
// Check impact
if (!SelectedImpacts.Contains(label.Log.Impact))
return false;
// Check search
if (!label.Log.Message.Contains(LogSearch.Text, StringComparison.OrdinalIgnoreCase))
return false;
return true;
}
private void TypeButtonPressed(ButtonEventArgs args)
@@ -481,6 +511,7 @@ public sealed partial class AdminLogsControl : Control
SelectAllTypesButton.OnPressed -= SelectAllTypes;
SelectNoTypesButton.OnPressed -= SelectNoTypes;
IncludeNonPlayersButton.OnPressed -= IncludeNonPlayers;
SelectAllPlayersButton.OnPressed -= SelectAllPlayers;
SelectNoPlayersButton.OnPressed -= SelectNoPlayers;

2
Content.Client/Administration/UI/Logs/AdminLogsEui.cs
View File

@@ -51,8 +51,10 @@ public sealed class AdminLogsEui : BaseEui
null,
null,
null,
LogsControl.SelectedPlayers.Count != 0,
LogsControl.SelectedPlayers.ToArray(),
null,
LogsControl.IncludeNonPlayerLogs,
null,
DateOrder.Descending);

15
Content.Server/Administration/Logs/AdminLogManager.Cache.cs
View File

@@ -122,14 +122,25 @@ public sealed partial class AdminLogManager
query = query.Where(log => log.Date > filter.After);
}
if (filter.IncludePlayers)
{
if (filter.AnyPlayers != null)
{
query = query.Where(log => filter.AnyPlayers.Any(filterPlayer => log.Players.Contains(filterPlayer)));
query = query.Where(log =>
filter.AnyPlayers.Any(filterPlayer => log.Players.Contains(filterPlayer)) ||
log.Players.Length == 0 && filter.IncludeNonPlayers);
}
if (filter.AllPlayers != null)
{
query = query.Where(log => filter.AllPlayers.All(filterPlayer => log.Players.Contains(filterPlayer)));
query = query.Where(log =>
filter.AllPlayers.All(filterPlayer => log.Players.Contains(filterPlayer)) ||
log.Players.Length == 0 && filter.IncludeNonPlayers);
}
}
else
{
query = query.Where(log => log.Players.Length == 0);
}
if (filter.LogsSent != 0)

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

@@ -119,8 +119,10 @@ public sealed class AdminLogsEui : BaseEui
Impacts = request.Impacts,
Before = request.Before,
After = request.After,
IncludePlayers = request.IncludePlayers,
AnyPlayers = request.AnyPlayers,
AllPlayers = request.AllPlayers,
IncludeNonPlayers = request.IncludeNonPlayers,
LastLogId = 0,
Limit = _clientBatchSize
};

4
Content.Server/Administration/Logs/LogFilter.cs
View File

@@ -20,10 +20,14 @@ public sealed class LogFilter
public DateTime? After { get; set; }
public bool IncludePlayers { get; set; } = true;
public Guid[]? AnyPlayers { get; set; }
public Guid[]? AllPlayers { get; set; }
public bool IncludeNonPlayers { get; set; }
public int? LastLogId { get; set; }
public int LogsSent { get; set; }

15
Content.Server/Database/ServerDbBase.cs
View File

@@ -740,14 +740,25 @@ namespace Content.Server.Database
query = query.Where(log => log.Date > filter.After);
}
if (filter.IncludePlayers)
{
if (filter.AnyPlayers != null)
{
query = query.Where(log => log.Players.Any(p => filter.AnyPlayers.Contains(p.PlayerUserId)));
query = query.Where(log =>
log.Players.Any(p => filter.AnyPlayers.Contains(p.PlayerUserId)) ||
log.Players.Count == 0 && filter.IncludeNonPlayers);
}
if (filter.AllPlayers != null)
{
query = query.Where(log => log.Players.All(p => filter.AllPlayers.Contains(p.PlayerUserId)));
query = query.Where(log =>
log.Players.All(p => filter.AllPlayers.Contains(p.PlayerUserId)) ||
log.Players.Count == 0 && filter.IncludeNonPlayers);
}
}
else
{
query = query.Where(log => log.Players.Count == 0);
}
if (filter.LastLogId != null)

6
Content.Shared/Administration/Logs/AdminLogsEuiState.cs
View File

@@ -67,8 +67,10 @@ public static class AdminLogsEuiMsg
HashSet<LogImpact>? impacts,
DateTime? before,
DateTime? after,
bool includePlayers,
Guid[]? anyPlayers,
Guid[]? allPlayers,
bool includeNonPlayers,
int? lastLogId,
DateOrder dateOrder)
{
@@ -78,8 +80,10 @@ public static class AdminLogsEuiMsg
Impacts = impacts;
Before = before;
After = after;
IncludePlayers = includePlayers;
AnyPlayers = anyPlayers is { Length: > 0 } ? anyPlayers : null;
AllPlayers = allPlayers is { Length: > 0 } ? allPlayers : null;
IncludeNonPlayers = includeNonPlayers;
LastLogId = lastLogId;
DateOrder = dateOrder;
}
@@ -90,8 +94,10 @@ public static class AdminLogsEuiMsg
public HashSet<LogImpact>? Impacts { get; set; }
public DateTime? Before { get; set; }
public DateTime? After { get; set; }
public bool IncludePlayers { get; set; }
public Guid[]? AnyPlayers { get; set; }
public Guid[]? AllPlayers { get; set; }
public bool IncludeNonPlayers { get; set; }
public int? LastLogId { get; set; }
public DateOrder DateOrder { get; set; }
}

1
Resources/Locale/en-US/administration/ui/admin-logs.ftl
View File

@@ -15,6 +15,7 @@ admin-logs-select-none = None
# Players
admin-logs-search-players-placeholder = Search Players (OR)
admin-logs-select-none = None
admin-logs-include-non-player = Include Non-players
# Logs
admin-logs-search-logs-placeholder = Search Logs