diff --git a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs index 210d14babe..a97eee26fd 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using System.Linq; using System.Runtime.InteropServices; using Content.Client.Administration.UI.CustomControls; using Content.Shared.Administration.Logs; @@ -9,7 +7,6 @@ using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; -using Robust.Shared.Localization; using static Robust.Client.UserInterface.Controls.BaseButton; using static Robust.Client.UserInterface.Controls.LineEdit; @@ -53,6 +50,7 @@ public sealed partial class AdminLogsControl : Control private int CurrentRound { get; set; } public int SelectedRoundId => RoundSpinBox.Value; + public string Search => LogSearch.Text; public HashSet SelectedTypes { get; } = new(); diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs index deea152134..ea8e8075c6 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs @@ -46,6 +46,7 @@ public sealed class AdminLogsEui : BaseEui { var request = new LogsRequest( LogsControl.SelectedRoundId, + LogsControl.Search, LogsControl.SelectedTypes.ToHashSet(), null, null, diff --git a/Content.Server/Administration/Logs/AdminLogsEui.cs b/Content.Server/Administration/Logs/AdminLogsEui.cs index ba89ab35fd..d9d700f0f4 100644 --- a/Content.Server/Administration/Logs/AdminLogsEui.cs +++ b/Content.Server/Administration/Logs/AdminLogsEui.cs @@ -108,6 +108,7 @@ public sealed class AdminLogsEui : BaseEui { CancellationToken = _logSendCancellation.Token, Round = request.RoundId, + Search = request.Search, Types = request.Types, Impacts = request.Impacts, Before = request.Before, diff --git a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs index a0ee0d50c0..3eaa3acd71 100644 --- a/Content.Shared/Administration/Logs/AdminLogsEuiState.cs +++ b/Content.Shared/Administration/Logs/AdminLogsEuiState.cs @@ -45,6 +45,7 @@ public static class AdminLogsEuiMsg { public LogsRequest( int? roundId, + string? search, HashSet? types, HashSet? impacts, DateTime? before, @@ -55,6 +56,7 @@ public static class AdminLogsEuiMsg DateOrder dateOrder) { RoundId = roundId; + Search = search; Types = types; Impacts = impacts; Before = before; @@ -66,6 +68,7 @@ public static class AdminLogsEuiMsg } public int? RoundId { get; set; } + public string? Search { get; set; } public HashSet? Types { get; set; } public HashSet? Impacts { get; set; } public DateTime? Before { get; set; }