Station Records: Populate job list whenever possible (#1954)

* station rcrds: populate all args when possible * Assign jobList properly --------- Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Sep 14, 2024 · 753435e · 753435e
1 parent 3ae595d
commit 753435e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
@@ -24,10 +24,12 @@ public sealed partial class GeneralStationRecordConsoleWindow : DefaultWindow
     private bool _isPopulating;
 
     private StationRecordFilterType _currentFilterType;
+    [Dependency] private readonly IPrototypeManager _prototype = default!; // Frontier
 
     public GeneralStationRecordConsoleWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this); // Frontier
 
         _currentFilterType = StationRecordFilterType.Name;
 
@@ -178,10 +180,21 @@ private void PopulateJobsContainer(IReadOnlyDictionary<ProtoId<JobPrototype>, in
         JobListing.RemoveAllChildren();
         foreach (var (job, amount) in jobList)
         {
+            // Skip overflow jobs.
+            if (amount < 0 || amount is null)
+                continue;
+
+            // Get proper job names when possible
+            string jobName;
+            if (_prototype.TryIndex(job, out var jobProto))
+                jobName = jobProto.LocalizedName;
+            else
+                jobName = job;
+
             var jobEntry = new JobRow
             {
                 Job = job,
-                JobName = { Text = job },
+                JobName = { Text = jobName },
                 JobAmount = { Text = amount.ToString() },
             };
             jobEntry.DecreaseJobSlot.OnPressed += (args) => { OnJobSubtract?.Invoke(args); };

diff --git a/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs b/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs
@@ -5,6 +5,7 @@
 using Robust.Server.GameObjects;
 using System.Linq;
 using Content.Shared.Roles;
+using Robust.Shared.Prototypes; // Frontier
 
 namespace Content.Server.StationRecords.Systems;
 
@@ -82,20 +83,23 @@ private void UpdateUserInterface(Entity<GeneralStationRecordConsoleComponent> en
         var (uid, console) = ent;
         var owningStation = _station.GetOwningStation(uid);
 
+        IReadOnlyDictionary<ProtoId<JobPrototype>, int?>? jobList = null; // Frontier
+        if (owningStation != null) // Frontier
+            jobList = _stationJobsSystem.GetJobs(owningStation.Value); // Frontier: moved this up - populate whenever possible.
+
         if (!TryComp<StationRecordsComponent>(owningStation, out var stationRecords))
         {
-            _ui.SetUiState(uid, GeneralStationRecordConsoleKey.Key, new GeneralStationRecordConsoleState());
+            _ui.SetUiState(uid, GeneralStationRecordConsoleKey.Key, new GeneralStationRecordConsoleState(null, null, null, jobList, console.Filter, ent.Comp.CanDeleteEntries)); // Frontier: add as many args as we can
             return;
         }
 
-        var jobList = _stationJobsSystem.GetJobs(owningStation.Value);
-
         var listing = _stationRecords.BuildListing((owningStation.Value, stationRecords), console.Filter);
 
         switch (listing.Count)
         {
             case 0:
-                _ui.SetUiState(uid, GeneralStationRecordConsoleKey.Key, new GeneralStationRecordConsoleState());
+                var consoleState = new GeneralStationRecordConsoleState(null, null, null, jobList, console.Filter, ent.Comp.CanDeleteEntries); // Frontier: add as many args as we can
+                _ui.SetUiState(uid, GeneralStationRecordConsoleKey.Key, consoleState);
                 return;
             default:
                 if (console.ActiveKey == null)
@@ -104,7 +108,10 @@ private void UpdateUserInterface(Entity<GeneralStationRecordConsoleComponent> en
         }
 
         if (console.ActiveKey is not { } id)
+        {
+            _ui.SetUiState(uid, GeneralStationRecordConsoleKey.Key, new GeneralStationRecordConsoleState(null, null, listing, jobList, console.Filter, ent.Comp.CanDeleteEntries)); // Frontier: add as many args as we can
             return;
+        }
 
         var key = new StationRecordKey(id, owningStation.Value);
         _stationRecords.TryGetRecord<GeneralStationRecord>(key, out var record, stationRecords);