Add confirmation to kick and respawn in the admin player actions panel (#20542)

diff --git a/Content.Client/Administration/UI/AdminUIHelpers.cs b/Content.Client/Administration/UI/AdminUIHelpers.cs
new file mode 100644 (file)
index 0000000..89ab33e
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminUIHelpers.cs
@@ -0,0 +1,59 @@
+using System.Threading;
+using Content.Client.Stylesheets;
+using Robust.Client.UserInterface.Controls;
+using Timer = Robust.Shared.Timing.Timer;
+
+namespace Content.Client.Administration.UI;
+
+public static class AdminUIHelpers
+{
+    private static void ResetButton(Button button, ConfirmationData data)
+    {
+        data.Cancellation.Cancel();
+        button.ModulateSelfOverride = null;
+        button.Text = data.OriginalText;
+    }
+
+    public static bool RemoveConfirm(Button button, Dictionary<Button, ConfirmationData> confirmations)
+    {
+        if (confirmations.Remove(button, out var data))
+        {
+            ResetButton(button, data);
+            return true;
+        }
+
+        return false;
+    }
+
+    public static void RemoveAllConfirms(Dictionary<Button, ConfirmationData> confirmations)
+    {
+        foreach (var (button, confirmation) in confirmations)
+        {
+            ResetButton(button, confirmation);
+        }
+
+        confirmations.Clear();
+    }
+
+    public static bool TryConfirm(Button button, Dictionary<Button, ConfirmationData> confirmations)
+    {
+        if (RemoveConfirm(button, confirmations))
+            return true;
+
+        var data = new ConfirmationData(new CancellationTokenSource(), button.Text);
+        confirmations[button] = data;
+
+        Timer.Spawn(TimeSpan.FromSeconds(5), () =>
+        {
+            confirmations.Remove(button);
+            button.ModulateSelfOverride = null;
+            button.Text = data.OriginalText;
+        }, data.Cancellation.Token);
+
+        button.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault;
+        button.Text = Loc.GetString("admin-player-actions-confirm");
+        return false;
+    }
+}
+
+public readonly record struct ConfirmationData(CancellationTokenSource Cancellation, string? OriginalText);

diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index e1903c307b2252a4cd15a0ab5cc23a57b83fbddb..6d8bb7810644eb393dd8119497edba7b229aa8bb 100644 (file)
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -1,22 +1,16 @@
 using System.Linq;
 using System.Text;
-using System.Threading;
 using Content.Client.Administration.Managers;
 using Content.Client.Administration.UI.CustomControls;
-using Content.Client.Administration.UI.Tabs.AdminTab;
-using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Bwoink;
-using Content.Client.UserInterface.Systems.Chat.Controls;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
-using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Administration.UI.Bwoink
 {
@@ -31,8 +25,8 @@ namespace Content.Client.Administration.UI.Bwoink
         [Dependency] private readonly IUserInterfaceManager _ui = default!;
         public AdminAHelpUIHandler AHelpHelper = default!;
 
-        //private readonly BwoinkSystem _bwoinkSystem;
-        private PlayerInfo? _currentPlayer = default;
+        private PlayerInfo? _currentPlayer;
+        private readonly Dictionary<Button, ConfirmationData> _confirmations = new();
 
         public BwoinkControl()
         {
@@ -131,7 +125,7 @@ namespace Content.Client.Administration.UI.Bwoink
 
             Kick.OnPressed += _ =>
             {
-                if (!TryConfirm(Kick))
+                if (!AdminUIHelpers.TryConfirm(Kick, _confirmations))
                 {
                     return;
                 }
@@ -149,7 +143,7 @@ namespace Content.Client.Administration.UI.Bwoink
 
             Respawn.OnPressed += _ =>
             {
-                if (!TryConfirm(Respawn))
+                if (!AdminUIHelpers.TryConfirm(Respawn, _confirmations))
                 {
                     return;
                 }
@@ -164,8 +158,6 @@ namespace Content.Client.Administration.UI.Bwoink
             };
         }
 
-        private Dictionary<Control, (CancellationTokenSource cancellation, string? originalText)> Confirmations { get; } = new();
-
         public void OnBwoink(NetUserId channel)
         {
             ChannelSelector.PopulateList();
@@ -246,30 +238,5 @@ namespace Content.Client.Administration.UI.Bwoink
             var panel = AHelpHelper.EnsurePanel(ch);
             panel.Visible = true;
         }
-
-        private bool TryConfirm(Button button)
-        {
-            if (Confirmations.Remove(button, out var tuple))
-            {
-                tuple.cancellation.Cancel();
-                button.ModulateSelfOverride = null;
-                button.Text = tuple.originalText;
-                return true;
-            }
-
-            tuple = (new CancellationTokenSource(), button.Text);
-            Confirmations[button] = tuple;
-
-            Timer.Spawn(TimeSpan.FromSeconds(5), () =>
-            {
-                Confirmations.Remove(button);
-                button.ModulateSelfOverride = null;
-                button.Text = tuple.originalText;
-            }, tuple.cancellation.Token);
-
-            button.ModulateSelfOverride = StyleNano.ButtonColorCautionDefault;
-            button.Text = Loc.GetString("admin-player-actions-confirm");
-            return false;
-        }
     }
 }

diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
index 3532609fec119e2216b67bb177718e23191bf0c8..6f960aaae19fc87fda5fce3f4e9bb0888472d4a2 100644 (file)
--- a/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/PlayerActionsWindow.xaml.cs
@@ -4,8 +4,7 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.IoC;
-using Robust.Shared.Players;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
 
 namespace Content.Client.Administration.UI.Tabs.AdminTab
@@ -15,9 +14,12 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
     public sealed partial class PlayerActionsWindow : DefaultWindow
     {
         private PlayerInfo? _selectedPlayer;
+        private readonly Dictionary<Button, ConfirmationData> _confirmations = new();
 
-        protected override void EnteredTree()
+        public PlayerActionsWindow()
         {
+            RobustXamlLoader.Load(this);
+
             SubmitKickButton.OnPressed += SubmitKickButtonOnPressed;
             SubmitAHelpButton.OnPressed += SubmitAhelpButtonOnPressed;
             SubmitRespawnButton.OnPressed += SubmitRespawnButtonOnPressed;
@@ -26,6 +28,9 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
 
         private void OnListOnOnSelectionChanged(PlayerInfo? obj)
         {
+            if (_selectedPlayer != obj)
+                AdminUIHelpers.RemoveAllConfirms(_confirmations);
+
             _selectedPlayer = obj;
             var disableButtons = _selectedPlayer == null;
             SubmitKickButton.Disabled = disableButtons;
@@ -37,6 +42,10 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
         {
             if (_selectedPlayer == null)
                 return;
+
+            if (!AdminUIHelpers.TryConfirm(SubmitKickButton, _confirmations))
+                return;
+
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
                 $"kick \"{_selectedPlayer.Username}\" \"{CommandParsing.Escape(ReasonLine.Text)}\"");
         }
@@ -54,6 +63,10 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab
         {
             if (_selectedPlayer == null)
                 return;
+
+            if (!AdminUIHelpers.TryConfirm(SubmitRespawnButton, _confirmations))
+                return;
+
             IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand(
                 $"respawn \"{_selectedPlayer.Username}\"");
         }