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

Move admin logs into their own separate window

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-08 23:03:08 +01:00
parent f2adfd0ff3
commit 7929600def
3 changed files with 109 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,10 @@ using Content.Shared.Administration;
using Content.Shared.Administration.Logs; using Content.Shared.Administration.Logs;
using Content.Shared.Eui; using Content.Shared.Eui;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Shared.IoC;
using static Content.Shared.Administration.AdminLogsEuiMsg; using static Content.Shared.Administration.AdminLogsEuiMsg;
namespace Content.Client.Administration.UI.Logs; namespace Content.Client.Administration.UI.Logs;
@@ -11,28 +15,54 @@ namespace Content.Client.Administration.UI.Logs;
[UsedImplicitly] [UsedImplicitly]
public class AdminLogsEui : BaseEui public class AdminLogsEui : BaseEui
{ {
[Dependency] private readonly IClyde _clyde = default!;
[Dependency] private readonly IUserInterfaceManager _uiManager = default!;
public AdminLogsEui() public AdminLogsEui()
{ {
Window = new AdminLogsWindow(); var monitor = _clyde.EnumerateMonitors().First();
Window.OnClose += () => SendMessage(new Close());
Window.LogSearch.OnTextEntered += _ => RequestLogs(); ClydeWindow = _clyde.CreateWindow(new WindowCreateParameters
Window.RefreshButton.OnPressed += _ => RequestLogs(); {
Window.NextButton.OnPressed += _ => NextLogs(); Maximized = true,
Title = "Admin Logs",
Monitor = monitor
});
ClydeWindow.RequestClosed += OnRequestClosed;
ClydeWindow.DisposeOnClose = true;
LogsWindow = new AdminLogsWindow();
LogsWindow.LogSearch.OnTextEntered += _ => RequestLogs();
LogsWindow.RefreshButton.OnPressed += _ => RequestLogs();
LogsWindow.NextButton.OnPressed += _ => NextLogs();
Root = _uiManager.CreateWindowRoot(ClydeWindow);
Root.AddChild(LogsWindow);
} }
private AdminLogsWindow Window { get; } private WindowRoot Root { get; }
private IClydeWindow ClydeWindow { get; }
private AdminLogsWindow LogsWindow { get; }
private bool FirstState { get; set; } = true; private bool FirstState { get; set; } = true;
private void OnRequestClosed(WindowRequestClosedEventArgs args)
{
SendMessage(new Close());
}
private void RequestLogs() private void RequestLogs()
{ {
var request = new LogsRequest( var request = new LogsRequest(
Window.SelectedRoundId, LogsWindow.SelectedRoundId,
Window.SelectedTypes.ToList(), LogsWindow.SelectedTypes.ToList(),
null, null,
null, null,
null, null,
Window.SelectedPlayers.ToArray(), LogsWindow.SelectedPlayers.ToArray(),
null, null,
null, null,
DateOrder.Descending); DateOrder.Descending);
@@ -54,16 +84,11 @@ public class AdminLogsEui : BaseEui
} }
FirstState = false; FirstState = false;
Window.SetCurrentRound(state.RoundId); LogsWindow.SetCurrentRound(state.RoundId);
Window.SetRoundSpinBox(state.RoundId); LogsWindow.SetRoundSpinBox(state.RoundId);
return true; return true;
} }
public override void Opened()
{
Window.OpenCentered();
}
public override void HandleState(EuiStateBase state) public override void HandleState(EuiStateBase state)
{ {
var s = (AdminLogsEuiState) state; var s = (AdminLogsEuiState) state;
@@ -75,8 +100,8 @@ public class AdminLogsEui : BaseEui
return; return;
} }
Window.SetCurrentRound(s.RoundId); LogsWindow.SetCurrentRound(s.RoundId);
Window.SetPlayers(s.Players); LogsWindow.SetPlayers(s.Players);
if (first) if (first)
{ {
@@ -91,10 +116,10 @@ public class AdminLogsEui : BaseEui
switch (msg) switch (msg)
{ {
case NewLogs {Replace: true} newLogs: case NewLogs {Replace: true} newLogs:
Window.SetLogs(newLogs.Logs); LogsWindow.SetLogs(newLogs.Logs);
break; break;
case NewLogs {Replace: false} newLogs: case NewLogs {Replace: false} newLogs:
Window.AddLogs(newLogs.Logs); LogsWindow.AddLogs(newLogs.Logs);
break; break;
} }
} }
@@ -103,7 +128,10 @@ public class AdminLogsEui : BaseEui
{ {
base.Closed(); base.Closed();
Window.Close(); ClydeWindow.RequestClosed -= OnRequestClosed;
Window.Dispose();
LogsWindow.Dispose();
Root.Dispose();
ClydeWindow.Dispose();
} }
} }

109
Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml
View File

@@ -1,59 +1,64 @@
<SS14Window xmlns="https://spacestation14.io" <Control xmlns="https://spacestation14.io"
xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls" xmlns:aui="clr-namespace:Content.Client.Administration.UI.CustomControls"
Title="{Loc admin-logs-title}" xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
MinWidth="1000" MinWidth="1000"
MinHeight="400"> MinHeight="400">
<BoxContainer Orientation="Horizontal"> <PanelContainer>
<BoxContainer Orientation="Vertical"> <PanelContainer.PanelOverride>
<BoxContainer Orientation="Horizontal" MinWidth="400"> <gfx:StyleBoxFlat BackgroundColor="#25252add"/>
<Label Text="{Loc admin-logs-round}"/> </PanelContainer.PanelOverride>
<SpinBox Name="RoundSpinBox" Value="0" MinWidth="150"/> <BoxContainer Orientation="Horizontal">
<Control HorizontalExpand="True"/> <BoxContainer Orientation="Vertical">
<Button Name="ResetRoundButton" Text="{Loc admin-logs-reset}" HorizontalAlignment="Right" <BoxContainer Orientation="Horizontal" MinWidth="400">
StyleClasses="OpenRight"/> <Label Text="{Loc admin-logs-round}"/>
<SpinBox Name="RoundSpinBox" Value="0" MinWidth="150"/>
<Control HorizontalExpand="True"/>
<Button Name="ResetRoundButton" Text="{Loc admin-logs-reset}" HorizontalAlignment="Right"
StyleClasses="OpenRight"/>
</BoxContainer>
<BoxContainer Orientation="Horizontal" VerticalExpand="True">
<BoxContainer Orientation="Vertical" MinWidth="200">
<LineEdit Name="TypeSearch" Access="Public" StyleClasses="actionSearchBox"
HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-types-placeholder}"/>
<BoxContainer Orientation="Horizontal">
<Button Name="SelectAllTypesButton" Text="{Loc admin-logs-select-all}"
MinWidth="100" StyleClasses="ButtonSquare"/>
<Button Name="SelectNoTypesButton" Text="{Loc admin-logs-select-none}"
MinWidth="100" StyleClasses="ButtonSquare"/>
</BoxContainer>
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="TypesContainer" Access="Public" Orientation="Vertical"/>
</ScrollContainer>
</BoxContainer>
<aui:VSeparator/>
<BoxContainer Orientation="Vertical" MinWidth="200">
<LineEdit Name="PlayerSearch" Access="Public" StyleClasses="actionSearchBox"
HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-players-placeholder}"/>
<BoxContainer Orientation="Horizontal">
<Button Name="SelectAllPlayersButton" Text="{Loc admin-logs-select-all}"
MinWidth="100" StyleClasses="ButtonSquare" />
<Button Name="SelectNoPlayersButton" Text="{Loc admin-logs-select-none}"
MinWidth="100" StyleClasses="ButtonSquare"/>
</BoxContainer>
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="PlayersContainer" Access="Public" Orientation="Vertical"/>
</ScrollContainer>
</BoxContainer>
<aui:VSeparator/>
</BoxContainer>
</BoxContainer> </BoxContainer>
<BoxContainer Orientation="Horizontal" VerticalExpand="True"> <BoxContainer Orientation="Vertical" HorizontalExpand="True">
<BoxContainer Orientation="Vertical" MinWidth="200"> <BoxContainer Name="LogImpactContainer" Orientation="Horizontal"/>
<LineEdit Name="TypeSearch" Access="Public" StyleClasses="actionSearchBox" <BoxContainer Orientation="Horizontal">
HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-types-placeholder}"/> <LineEdit Name="LogSearch" Access="Public" StyleClasses="actionSearchBox"
<BoxContainer Orientation="Horizontal"> HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-logs-placeholder}"/>
<Button Name="SelectAllTypesButton" Text="{Loc admin-logs-select-all}" <Button Name="RefreshButton" Access="Public" Text="{Loc admin-logs-refresh}" StyleClasses="ButtonSquare"/>
MinWidth="100" StyleClasses="ButtonSquare"/> <Button Name="NextButton" Access="Public" Text="{Loc admin-logs-next}" StyleClasses="OpenLeft"/>
<Button Name="SelectNoTypesButton" Text="{Loc admin-logs-select-none}"
MinWidth="100" StyleClasses="ButtonSquare"/>
</BoxContainer>
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="TypesContainer" Access="Public" Orientation="Vertical"/>
</ScrollContainer>
</BoxContainer> </BoxContainer>
<aui:VSeparator/> <ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
<BoxContainer Orientation="Vertical" MinWidth="200"> <BoxContainer Name="LogsContainer" Access="Public" Orientation="Vertical" VerticalExpand="True"/>
<LineEdit Name="PlayerSearch" Access="Public" StyleClasses="actionSearchBox" </ScrollContainer>
HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-players-placeholder}"/>
<BoxContainer Orientation="Horizontal">
<Button Name="SelectAllPlayersButton" Text="{Loc admin-logs-select-all}"
MinWidth="100" StyleClasses="ButtonSquare"></Button>
<Button Name="SelectNoPlayersButton" Text="{Loc admin-logs-select-none}"
MinWidth="100" StyleClasses="ButtonSquare"/>
</BoxContainer>
<ScrollContainer VerticalExpand="True">
<BoxContainer Name="PlayersContainer" Access="Public" Orientation="Vertical"/>
</ScrollContainer>
</BoxContainer>
<aui:VSeparator/>
</BoxContainer> </BoxContainer>
</BoxContainer> </BoxContainer>
<BoxContainer Orientation="Vertical" HorizontalExpand="True"> </PanelContainer>
<BoxContainer Name="LogImpactContainer" Orientation="Horizontal"/> </Control>
<BoxContainer Orientation="Horizontal">
<LineEdit Name="LogSearch" Access="Public" StyleClasses="actionSearchBox"
HorizontalExpand="true" PlaceHolder="{Loc admin-logs-search-logs-placeholder}"/>
<Button Name="RefreshButton" Access="Public" Text="{Loc admin-logs-refresh}" StyleClasses="ButtonSquare"/>
<Button Name="NextButton" Access="Public" Text="{Loc admin-logs-next}" StyleClasses="OpenLeft"/>
</BoxContainer>
<ScrollContainer VerticalExpand="True" HorizontalExpand="True" HScrollEnabled="False">
<BoxContainer Name="LogsContainer" Access="Public" Orientation="Vertical" VerticalExpand="True"/>
</ScrollContainer>
</BoxContainer>
</BoxContainer>
</SS14Window>

4
Content.Client/Administration/UI/Logs/AdminLogsWindow.xaml.cs
View File

@@ -5,8 +5,8 @@ using Content.Client.Administration.UI.CustomControls;
using Content.Shared.Administration.Logs; using Content.Shared.Administration.Logs;
using Content.Shared.Database; using Content.Shared.Database;
using Robust.Client.AutoGenerated; using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface.XAML;
using Robust.Shared.Localization; using Robust.Shared.Localization;
using static Robust.Client.UserInterface.Controls.BaseButton; using static Robust.Client.UserInterface.Controls.BaseButton;
@@ -15,7 +15,7 @@ using static Robust.Client.UserInterface.Controls.LineEdit;
namespace Content.Client.Administration.UI.Logs; namespace Content.Client.Administration.UI.Logs;
[GenerateTypedNameReferences] [GenerateTypedNameReferences]
public partial class AdminLogsWindow : SS14Window public partial class AdminLogsWindow : Control
{ {
private readonly Comparer<AdminLogTypeButton> _adminLogTypeButtonComparer = private readonly Comparer<AdminLogTypeButton> _adminLogTypeButtonComparer =
Comparer<AdminLogTypeButton>.Create((a, b) => Comparer<AdminLogTypeButton>.Create((a, b) =>