Revert "[PORT] Система обмена сообщениями в КПК (#153)" (#154)

This reverts commit a95d724.

Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs

@@ -26,16 +26,8 @@ protected override void Open()
             _window.OnNameChanged += OnNameChanged;
             _window.OnJobChanged += OnJobChanged;
             _window.OnJobIconChanged += OnJobIconChanged;
-            _window.OnNumberChanged += OnNumberChanged; // Corvax-Next-PDAChat
         }
 
-        // Corvax-Next-PDAChat-Start
-        private void OnNumberChanged(uint newNumber)
-        {
-            SendMessage(new AgentIDCardNumberChangedMessage(newNumber));
-        }
-        // Corvax-Next-PDAChat-End
-
         private void OnNameChanged(string newName)
         {
             SendMessage(new AgentIDCardNameChangedMessage(newName));
@@ -64,7 +56,6 @@ protected override void UpdateState(BoundUserInterfaceState state)
             _window.SetCurrentName(cast.CurrentName);
             _window.SetCurrentJob(cast.CurrentJob);
             _window.SetAllowedIcons(cast.CurrentJobIconId);
-            _window.SetCurrentNumber(cast.CurrentNumber); // Corvax-Next-PDAChat
         }
     }
 }

Content.Client/Access/UI/AgentIDCardWindow.xaml

@@ -6,10 +6,6 @@
         <LineEdit Name="NameLineEdit" />
         <Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
         <LineEdit Name="JobLineEdit" />
-        <!-- Corvax-Next-PDAChat-Start - Add NanoChat number field -->
-        <Label Name="CurrentNumber" Text="{Loc 'agent-id-card-current-number'}" />
-        <LineEdit Name="NumberLineEdit" PlaceHolder="#0000" />
-        <!-- Corvax-Next-PDAChat-End- -->
         <Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
         <GridContainer Name="IconGrid" Columns="10">
             <!-- Job icon buttons are generated in the code -->

Content.Client/Access/UI/AgentIDCardWindow.xaml.cs

@@ -20,13 +20,9 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
         private readonly SpriteSystem _spriteSystem;
 
         private const int JobIconColumnCount = 10;
-
-        private const int MaxNumberLength = 4; // Corvax-Next-PDAChat - Same as NewChatPopup
 
         public event Action<string>? OnNameChanged;
         public event Action<string>? OnJobChanged;
-
-        public event Action<uint>? OnNumberChanged; // Corvax-Next-PDAChat - Add event for number changes
 
         public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;
 
@@ -39,42 +35,9 @@ public AgentIDCardWindow()
             NameLineEdit.OnTextEntered += e => OnNameChanged?.Invoke(e.Text);
             NameLineEdit.OnFocusExit += e => OnNameChanged?.Invoke(e.Text);
 
-            // Corvax-Next-PDAChat-Start
             JobLineEdit.OnTextEntered += e => OnJobChanged?.Invoke(e.Text);
             JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
-
-            // Corvax-Next-PDAChat - Add handlers for number changes
-            NumberLineEdit.OnTextEntered += OnNumberEntered;
-            NumberLineEdit.OnFocusExit += OnNumberEntered;
-
-            // Corvax-Next-PDAChat - Filter to only allow digits
-            NumberLineEdit.OnTextChanged += args =>
-            {
-                if (args.Text.Length > MaxNumberLength)
-                {
-                    NumberLineEdit.Text = args.Text[..MaxNumberLength];
-                }
-
-                // Filter to digits only
-                var newText = string.Concat(args.Text.Where(char.IsDigit));
-                if (newText != args.Text)
-                    NumberLineEdit.Text = newText;
-            };
-        }
-
-        // Corvax-Next-PDAChat - Add number validation and event
-        private void OnNumberEntered(LineEdit.LineEditEventArgs args)
-        {
-            if (uint.TryParse(args.Text, out var number) && number > 0)
-                OnNumberChanged?.Invoke(number);
-        }
-
-        // Corvax-Next-PDAChat - Add setter for current number
-        public void SetCurrentNumber(uint? number)
-        {
-            NumberLineEdit.Text = number?.ToString("D4") ?? "";
         }
-            // Corvax-Next-PDAChat-End
 
         public void SetAllowedIcons(string currentJobIconId)
         {

Content.Client/CartridgeLoader/Cartridges/LogProbeUi.cs

@@ -23,6 +23,6 @@ public override void UpdateState(BoundUserInterfaceState state)
         if (state is not LogProbeUiState logProbeUiState)
             return;
 
-        _fragment?.UpdateState(logProbeUiState); // Corvax-Next-PDAChat - just take the state
+        _fragment?.UpdateState(logProbeUiState.PulledLogs);
     }
 }

Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml

@@ -9,28 +9,10 @@
                               BorderColor="#5a5a5a"
                               BorderThickness="0 0 0 1"/>
         </PanelContainer.PanelOverride>
-        <BoxContainer Orientation="Vertical" Margin="4 8">
-            <!-- Corvax-Next-PDAChat-Start - Add title label -->
-            <Label Name="TitleLabel"
-                   Text="{Loc 'log-probe-header-access'}"
-                   StyleClasses="LabelHeading"
-                   HorizontalAlignment="Center"
-                   Margin="0 0 0 8"/>
-
-            <!-- Add card number display -->
-            <Label Name="CardNumberLabel"
-                   StyleClasses="LabelSubText"
-                   HorizontalAlignment="Center"
-                   Margin="0 0 0 8"
-                   Visible="False"/>
-
-            <!-- Adjust column headers -->
-            <BoxContainer Orientation="Horizontal">
-                <Label Align="Right" SetWidth="26" ClipText="True" Text="{Loc 'log-probe-label-number'}"/>
-                <Label Align="Center" SetWidth="100" ClipText="True" Text="{Loc 'log-probe-label-time'}"/>
-                <Label Name="ContentLabel" Align="Left" SetWidth="390" ClipText="True" Text="{Loc 'log-probe-label-accessor'}"/>
-            </BoxContainer>
-            <!-- Corvax-Next-PDAChat-End -->
+        <BoxContainer Orientation="Horizontal" Margin="4 8">
+            <Label Align="Right" SetWidth="26" ClipText="True" Text="{Loc 'log-probe-label-number'}"/>
+            <Label Align="Center" SetWidth="100" ClipText="True" Text="{Loc 'log-probe-label-time'}"/>
+            <Label Align="Left" SetWidth="390" ClipText="True" Text="{Loc 'log-probe-label-accessor'}"/>
         </BoxContainer>
     </PanelContainer>
     <ScrollContainer VerticalExpand="True" HScrollEnabled="True">

Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs

@@ -1,7 +1,4 @@
-using System.Linq;
-using Content.Client._CorvaxNext.CartridgeLoader.Cartridges;
-using Content.Shared.CartridgeLoader.Cartridges;
-using Content.Shared._CorvaxNext.CartridgeLoader.Cartridges;
+using Content.Shared.CartridgeLoader.Cartridges;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
@@ -16,112 +13,10 @@ public LogProbeUiFragment()
         RobustXamlLoader.Load(this);
     }
 
-    // Corvax-Next-PDAChat-Start - Update to handle both types of data
-    public void UpdateState(LogProbeUiState state)
+    public void UpdateState(List<PulledAccessLog> logs)
     {
         ProbedDeviceContainer.RemoveAllChildren();
 
-        if (state.NanoChatData != null)
-        {
-            SetupNanoChatView(state.NanoChatData.Value);
-            DisplayNanoChatData(state.NanoChatData.Value);
-        }
-        else
-        {
-            SetupAccessLogView();
-            if (state.PulledLogs.Count > 0)
-                DisplayAccessLogs(state.PulledLogs);
-        }
-    }
-
-    private void SetupNanoChatView(NanoChatData data)
-    {
-        TitleLabel.Text = Loc.GetString("log-probe-header-nanochat");
-        ContentLabel.Text = Loc.GetString("log-probe-label-message");
-
-        // Show card info if available
-        var cardInfo = new List<string>();
-        if (data.CardNumber != null)
-            cardInfo.Add(Loc.GetString("log-probe-card-number", ("number", $"#{data.CardNumber:D4}")));
-
-        // Add recipient count
-        cardInfo.Add(Loc.GetString("log-probe-recipients", ("count", data.Recipients.Count)));
-
-        CardNumberLabel.Text = string.Join(" | ", cardInfo);
-        CardNumberLabel.Visible = true;
-    }
-
-    private void SetupAccessLogView()
-    {
-        TitleLabel.Text = Loc.GetString("log-probe-header-access");
-        ContentLabel.Text = Loc.GetString("log-probe-label-accessor");
-        CardNumberLabel.Visible = false;
-    }
-
-    private void DisplayNanoChatData(NanoChatData data)
-    {
-        // First add a recipient list entry
-        var recipientsList = Loc.GetString("log-probe-recipient-list") + "\n" + string.Join("\n",
-            data.Recipients.Values
-                .OrderBy(r => r.Name)
-                .Select(r => $"    {r.Name}" +
-                             (string.IsNullOrEmpty(r.JobTitle) ? "" : $" ({r.JobTitle})") +
-                             $" | #{r.Number:D4}"));
-
-        var recipientsEntry = new LogProbeUiEntry(0, "---", recipientsList);
-        ProbedDeviceContainer.AddChild(recipientsEntry);
-
-        var count = 1;
-        foreach (var (partnerId, messages) in data.Messages)
-        {
-            // Show only successfully delivered incoming messages
-            var incomingMessages = messages
-                .Where(msg => msg.SenderId == partnerId && !msg.DeliveryFailed)
-                .OrderByDescending(msg => msg.Timestamp);
-
-            foreach (var msg in incomingMessages)
-            {
-                var messageText = Loc.GetString("log-probe-message-format",
-                    ("sender", $"#{msg.SenderId:D4}"),
-                    ("recipient", $"#{data.CardNumber:D4}"),
-                    ("content", msg.Content));
-
-                var entry = new NanoChatLogEntry(
-                    count,
-                    TimeSpan.FromSeconds(Math.Truncate(msg.Timestamp.TotalSeconds)).ToString(),
-                    messageText);
-
-                ProbedDeviceContainer.AddChild(entry);
-                count++;
-            }
-
-            // Show only successfully delivered outgoing messages
-            var outgoingMessages = messages
-                .Where(msg => msg.SenderId == data.CardNumber && !msg.DeliveryFailed)
-                .OrderByDescending(msg => msg.Timestamp);
-
-            foreach (var msg in outgoingMessages)
-            {
-                var messageText = Loc.GetString("log-probe-message-format",
-                    ("sender", $"#{msg.SenderId:D4}"),
-                    ("recipient", $"#{partnerId:D4}"),
-                    ("content", msg.Content));
-
-                var entry = new NanoChatLogEntry(
-                    count,
-                    TimeSpan.FromSeconds(Math.Truncate(msg.Timestamp.TotalSeconds)).ToString(),
-                    messageText);
-
-                ProbedDeviceContainer.AddChild(entry);
-                count++;
-            }
-        }
-    }
-    // Corvax-Next-PDAChat-End
-
-    // Corvax-Next-PDAChat - Handle this in a separate method
-    private void DisplayAccessLogs(List<PulledAccessLog> logs)
-    {
         //Reverse the list so the oldest entries appear at the bottom
         logs.Reverse();