Stable Merge

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

@@ -28,6 +28,13 @@ public AccessLevelControl()
 
     public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototypeManager prototypeManager)
     {
+        // Starlight-edit: Start
+        RemoveAllChildren();
+        ButtonsList.Clear();
+
+        if (accessLevels.Count == 0)
+            return;
+        // Starlight-edit: End
         foreach (var access in accessLevels)
         {
             if (!prototypeManager.TryIndex(access, out var accessLevel))
@@ -45,27 +52,49 @@ public void Populate(List<ProtoId<AccessLevelPrototype>> accessLevels, IPrototyp
             ButtonsList.Add(accessLevel.ID, newButton);
         }
     }
-
+    // Starlight-edit: Start
     public void UpdateState(
         List<ProtoId<AccessLevelPrototype>> pressedList,
-        ProtoId<AccessGroupPrototype>? currentGroup, // Starlight-edit: access groups
-        IPrototypeManager? prototypeManager = null, // Starlight-edit: access groups
+        ProtoId<AccessGroupPrototype>? currentGroup,
+        IPrototypeManager? prototypeManager = null,
         List<ProtoId<AccessLevelPrototype>>? enabledList = null)
     {
-        // Starlight-start: Access groups
-        if (currentGroup != null && prototypeManager != null && prototypeManager.TryIndex(currentGroup.Value, out var group))
+        if (enabledList == null || enabledList.Count == 0)
+        {
+            RemoveAllChildren();
+            ButtonsList.Clear();
+            return;
+        }
+
+        if (prototypeManager == null)
         {
             RemoveAllChildren();
             ButtonsList.Clear();
+            return;
+        }
+
+        RemoveAllChildren();
+        ButtonsList.Clear();
 
-            Populate(group.Tags.ToList(), prototypeManager);
+        List<ProtoId<AccessLevelPrototype>> accessesToShow;
+
+        if (currentGroup != null && prototypeManager.TryIndex(currentGroup.Value, out var group))
+        {
+            accessesToShow = group.Tags.Where(tag => enabledList.Contains(tag)).ToList();
         }
-        // Starlight-end
+        else
+        {
+            accessesToShow = enabledList;
+        }
+
+        // Only show access levels that are allowed by the privileged ID
+        Populate(accessesToShow, prototypeManager);
+        // Starlight-edit: End
 
         foreach (var (accessName, button) in ButtonsList)
         {
             button.Pressed = pressedList.Contains(accessName);
-            button.Disabled = !(enabledList?.Contains(accessName) ?? true);
+            button.Disabled = false; // Starlight
         }
     }
 }

Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs

@@ -28,14 +28,15 @@ protected override void Open()
             RefreshAccess();
             _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
             _window.OnSubmit += SubmitData;
+            _window.OnGroupSelected += group => SendMessage(new AccessGroupSelectedMessage(group)); // Starlight-edit
 
             _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
         }
 
         public override void OnProtoReload(PrototypesReloadedEventArgs args)
         {
             base.OnProtoReload(args);
-            if (!args.WasModified<AccessLevelPrototype>())
+            if (!args.WasModified<AccessLevelPrototype>() && !args.WasModified<AccessGroupPrototype>()) // Starlight-edit
                 return;
 
             RefreshAccess();
@@ -47,19 +48,31 @@ public override void OnProtoReload(PrototypesReloadedEventArgs args)
         private void RefreshAccess()
         {
             List<ProtoId<AccessLevelPrototype>> accessLevels;
+            // Starlight-edit: Start
+            List<ProtoId<AccessGroupPrototype>> accessGroups; 
+            ProtoId<AccessGroupPrototype>? currentGroup = null; 
+            // Starlight-edit: End
 
             if (EntMan.TryGetComponent<AccessOverriderComponent>(Owner, out var accessOverrider))
             {
                 accessLevels = accessOverrider.AccessLevels;
                 accessLevels.Sort();
+
+                // Starlight-edit: Start
+                accessGroups = accessOverrider.AccessGroups;
+                accessGroups.Sort();
+                // Starlight-edit: End
+
+                currentGroup = accessOverrider.CurrentAccessGroup;
             }
             else
             {
                 accessLevels = new List<ProtoId<AccessLevelPrototype>>();
+                accessGroups = new List<ProtoId<AccessGroupPrototype>>(); // Starlight-edit
                 _accessOverriderSystem.Log.Error($"No AccessOverrider component found for {EntMan.ToPrettyString(Owner)}!");
             }
 
-            _window?.SetAccessLevels(_prototypeManager, accessLevels);
+            _window?.SetAccess(_prototypeManager, accessGroups, currentGroup, accessLevels); // Starlight-edit
         }
 
         protected override void UpdateState(BoundUserInterfaceState state)

Content.Client/Access/UI/AccessOverriderWindow.xaml

@@ -1,4 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
+            xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls" 
             MinSize="650 290">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="2">
@@ -10,11 +11,13 @@
         </GridContainer>
         <Label Name="TargetNameLabel" />
         <Control MinSize="0 8"/>
-        <GridContainer Name="AccessLevelGrid" Columns="5" HorizontalAlignment="Center">
-
-            <!-- Access level buttons are added here by the C# code -->
-
-        </GridContainer>
+        <!-- Starlight-start: Access Groups -->
+        <BoxContainer Orientation="Horizontal">
+            <Control Name="AccessGroupControlContainer" /> <!-- Access Groups Buttons -->
+            <cc:VSeparator Color="#a88b5e" Margin="5 0 5 0" /> <!-- Separator -->
+            <Control Name="AccessLevelControlContainer" /> <!-- Access Level Buttons -->
+        </BoxContainer>
+        <!-- Starlight-end: Access Groups -->
         <Control MinSize="0 8"/>
         <Label Name="MissingPrivilegesLabel" />
         <Control MinSize="0 4"/>

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

@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client._Starlight.Access.UI; // Starlight-edit
 using Content.Shared.Access;
 using Content.Shared.Access.Systems;
 using Robust.Client.AutoGenerated;
@@ -13,40 +14,51 @@ namespace Content.Client.Access.UI
     [GenerateTypedNameReferences]
     public sealed partial class AccessOverriderWindow : DefaultWindow
     {
-        private readonly Dictionary<string, Button> _accessButtons = new();
+        // Starlight-edit: Start
+        private readonly AccessLevelControl _accessButtons = new();
+        private readonly AccessGroupControl _accessGroups = new();
+        private readonly Dictionary<string, Button> _legacyAccessButtons = new();
+        // Starlight-edit: End
 
         public event Action<List<ProtoId<AccessLevelPrototype>>>? OnSubmit;
+        public event Action<ProtoId<AccessGroupPrototype>>? OnGroupSelected; // Starlight-edit
 
         public AccessOverriderWindow()
         {
             RobustXamlLoader.Load(this);
         }
 
-        public void SetAccessLevels(IPrototypeManager protoManager, List<ProtoId<AccessLevelPrototype>> accessLevels)
+        // Starlight-edit: Start
+        public void SetAccess(IPrototypeManager protoManager, List<ProtoId<AccessGroupPrototype>> accessGroups, ProtoId<AccessGroupPrototype>? currentGroup, List<ProtoId<AccessLevelPrototype>> accessLevels)
         {
-            _accessButtons.Clear();
-            AccessLevelGrid.DisposeAllChildren();
+            // Clear existing containers
+            AccessGroupControlContainer.RemoveAllChildren();
+            AccessLevelControlContainer.RemoveAllChildren();
 
-            foreach (var access in accessLevels)
-            {
-                if (!protoManager.Resolve(access, out var accessLevel))
-                {
-                    continue;
-                }
+            // Groups
+            _accessGroups.Populate(accessGroups, currentGroup ?? accessGroups.FirstOrDefault(), protoManager);
+            AccessGroupControlContainer.AddChild(_accessGroups);
 
-                var newButton = new Button
-                {
-                    Text = accessLevel.GetAccessLevelName(),
-                    ToggleMode = true,
-                };
+            // Levels
+            _accessButtons.Populate(accessLevels, protoManager);
+            AccessLevelControlContainer.AddChild(_accessButtons);
+
+            // Wire up group selection events
+            foreach (var (id, button) in _accessGroups.ButtonsList)
+            {
+                button.OnPressed += _ => OnGroupSelected?.Invoke(id);
+            }
 
-                AccessLevelGrid.AddChild(newButton);
-                _accessButtons.Add(accessLevel.ID, newButton);
-                newButton.OnPressed += _ =>
+            // Wire up level presses -> submit list
+            foreach (var (id, button) in _accessButtons.ButtonsList)
+            {
+                button.OnPressed += _ =>
                 {
                     OnSubmit?.Invoke(
-                        // Iterate over the buttons dictionary, filter by `Pressed`, only get key from the key/value pair
-                        _accessButtons.Where(x => x.Value.Pressed).Select(x => new ProtoId<AccessLevelPrototype>(x.Key)).ToList());
+                        _accessButtons.ButtonsList.Where(x => x.Value.Pressed)
+                            .Select(x => new ProtoId<AccessLevelPrototype>(x.Key))
+                            .ToList());
+                    // Starlight-edit: End
                 };
             }
         }
@@ -83,16 +95,76 @@ public void UpdateState(IPrototypeManager protoManager, AccessOverriderBoundUser
 
             var interfaceEnabled = state.IsPrivilegedIdPresent && state.IsPrivilegedIdAuthorized;
 
-            foreach (var (accessName, button) in _accessButtons)
+            // Starlight-edit: Start
+            var allowedAccess = interfaceEnabled && state.AllowedModifyAccessList != null
+                ? state.AllowedModifyAccessList.ToList()
+                : new List<ProtoId<AccessLevelPrototype>>();
+
+            var groupsWithCoverage = new List<ProtoId<AccessGroupPrototype>>();
+            if (allowedAccess.Count > 0 && state.AccessGroups != null)
             {
-                button.Disabled = !interfaceEnabled;
-                if (interfaceEnabled)
+                foreach (var g in state.AccessGroups)
                 {
-                    // Explicit cast because Rider gives a false error otherwise.
-                    button.Pressed = state.TargetAccessReaderIdAccessList?.Contains((ProtoId<AccessLevelPrototype>) accessName) ?? false;
-                    button.Disabled = (!state.AllowedModifyAccessList?.Contains((ProtoId<AccessLevelPrototype>) accessName)) ?? true;
+                    if (!protoManager.TryIndex(g, out AccessGroupPrototype? gp))
+                        continue;
+
+                    var groupTags = gp.Tags.Where(tag => 
+                        protoManager.TryIndex<AccessLevelPrototype>(tag, out var accessProto) && 
+                        accessProto.CanAddToIdCard).ToList();
+
+                    if (groupTags.Count == 0)
+                        continue;
+
+                    var matchingTags = groupTags.Count(tag => allowedAccess.Contains(tag));
+                    var threshold = Math.Max(1, Math.Min(3, groupTags.Count / 2));
+
+                    if (matchingTags >= threshold)
+                        groupsWithCoverage.Add(gp.ID);
                 }
             }
+
+            var showGroups = groupsWithCoverage.Count > 1;
+
+            AccessGroupControlContainer.RemoveAllChildren();
+            AccessLevelControlContainer.RemoveAllChildren();
+
+            if (showGroups)
+            {
+                ProtoId<AccessGroupPrototype> selectedGroup =
+                    state.CurrentAccessGroup.HasValue && groupsWithCoverage.Contains(state.CurrentAccessGroup.Value)
+                        ? state.CurrentAccessGroup.Value
+                        : groupsWithCoverage.First();
+
+                _accessGroups.Populate(groupsWithCoverage, selectedGroup, protoManager);
+                AccessGroupControlContainer.Visible = true;
+                AccessGroupControlContainer.AddChild(_accessGroups);
+
+                foreach (var (id, button) in _accessGroups.ButtonsList)
+                    button.OnPressed += _ => OnGroupSelected?.Invoke(id);
+            }
+            else
+            {
+                AccessGroupControlContainer.Visible = false;
+            }
+
+            ProtoId<AccessGroupPrototype>? effectiveGroup =
+                showGroups ? state.CurrentAccessGroup : null;
+
+            _accessButtons.UpdateState(
+                state.TargetAccessReaderIdAccessList?.ToList() ?? new List<ProtoId<AccessLevelPrototype>>(),
+                effectiveGroup,
+                protoManager,
+                allowedAccess);
+            AccessLevelControlContainer.AddChild(_accessButtons);
+
+            foreach (var (id, button) in _accessButtons.ButtonsList)
+            {
+                button.OnPressed += _ => OnSubmit?.Invoke(
+                    _accessButtons.ButtonsList.Where(x => x.Value.Pressed)
+                        .Select(x => new ProtoId<AccessLevelPrototype>(x.Key))
+                        .ToList());
+            // Starlight-edit: End
+            }
         }
     }
 }

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

@@ -41,7 +41,7 @@ public AgentIDCardWindow()
 
         public void SetAllowedIcons(string currentJobIconId)
         {
-            IconGrid.DisposeAllChildren();
+            IconGrid.RemoveAllChildren(); // Starlight-edit
 
             var jobIconButtonGroup = new ButtonGroup();
             var i = 0;

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

@@ -99,8 +99,10 @@ private void ArrangeAccessControls()
 
     private bool TryRebuildAccessGroupControls()
     {
-        AccessGroupList.DisposeAllChildren();
-        AccessLevelChecklist.DisposeAllChildren();
+        // Starlight-edit: Start
+        AccessGroupList.RemoveAllChildren();
+        AccessLevelChecklist.RemoveAllChildren();
+        // Starlight-edit: End
 
         // No access level prototypes were assigned to any of the access level groups.
         // Either the turret controller has no assigned access levels or their names were invalid.
@@ -165,7 +167,7 @@ private bool TryRebuildAccessGroupControls()
     /// </summary>
     public void RebuildAccessLevelsControls()
     {
-        AccessLevelChecklist.DisposeAllChildren();
+        AccessLevelChecklist.RemoveAllChildren(); // Starlight
         _accessLevelEntries.Clear();
 
         // No access level prototypes were assigned to any of the access level groups

Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs

@@ -4,11 +4,14 @@
 using Content.Shared.CCVar;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
-using Content.Shared._Starlight.Access; // Starlight-edit
 using Content.Shared.Roles;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using static Content.Shared.Access.Components.IdCardConsoleComponent;
+// Starlight-edit: Start
+using Robust.Client.UserInterface;
+using Content.Shared._Starlight.Access; 
+// Starlight-edit: End
 
 namespace Content.Client.Access.UI
 {
@@ -35,24 +38,11 @@ public IdCardConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner
         protected override void Open()
         {
             base.Open();
-            List<ProtoId<AccessGroupPrototype>> accessGroups; // Starlight-edit
-
-            if (EntMan.TryGetComponent<IdCardConsoleComponent>(Owner, out var idCard))
-            {
-                accessGroups = idCard.AccessGroups; // Starlight-edit
-            }
-            else
-            {
-                accessGroups = new List<ProtoId<AccessGroupPrototype>>(); // Starlight-edit
-                _idCardConsoleSystem.Log.Error($"No IdCardConsole component found for {EntMan.ToPrettyString(Owner)}!");
-            }
-
-            _window = new IdCardConsoleWindow(this, _prototypeManager, accessGroups) // Starlight-edit
-            {
-                Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName
-            };
-
-            _window.OnGroupSelected += group => SendMessage(new AccessGroupSelectedMessage(group)); // Starlight-edit
+            // Starlight-edit: Start
+            _window = this.CreateWindow<IdCardConsoleWindow>();
+            _window.Initialize(this);
+            _window.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
+            // Starlight-edit: End
             _window.CrewManifestButton.OnPressed += _ => SendMessage(new CrewManifestOpenUiMessage());
             _window.PrivilegedIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(PrivilegedIdCardSlotId));
             _window.TargetIdButton.OnPressed += _ => SendMessage(new ItemSlotButtonPressedEvent(TargetIdCardSlotId));
@@ -91,5 +81,12 @@ public void SubmitData(string newFullName, string newJobTitle, List<ProtoId<Acce
                 newAccessList,
                 newJobPrototype));
         }
+        // Starlight-edit: Start
+
+        public void OnGroupSelected(ProtoId<AccessGroupPrototype> group)
+        {
+            SendMessage(new IdCardConsoleComponent.AccessGroupSelectedMessage(group)); // Starlight-edit
+        }
+        // Starlight-edit: End
     }
 }