feat(rest): admin dashboard improvements (revert overview caches + bulk groups helper)

src/uds/REST/methods/users_groups.py

@@ -87,6 +87,41 @@ def get_service_pools_for_groups(
         yield servicepool
 
 
+def bulk_groups_of_users(users: list['User'], authenticator: 'Authenticator') -> dict[str, list[str]]:
+    """
+    Bulk equivalent of User.get_groups() for a list of users: direct non-meta groups
+    (resolved through the parent user, as get_groups does) plus the authenticator
+    metagroups each user belongs to.
+
+    Note: users must come from a queryset with prefetch_related('groups'), so the
+    whole computation costs a fixed number of queries (~6, regardless of the number
+    of users) instead of O(N) per-user ones.
+    """
+    direct: dict[str, list[str]] = {u.uuid: [g.uuid for g in u.groups.all() if not g.is_meta] for u in users}
+    parents: dict[str, list[str]] = {
+        u.uuid: [g.uuid for g in u.groups.all() if not g.is_meta]
+        for u in User.objects.filter(uuid__in={u.parent for u in users if u.parent}).prefetch_related('groups')
+    }
+    metagroups = [
+        (m.uuid, m.meta_if_any, {g.uuid for g in m.groups.all()})
+        for m in authenticator.groups.filter(is_meta=True).prefetch_related('groups')
+    ]
+
+    result: dict[str, list[str]] = {}
+    for u in users:
+        # If the parent is missing, get_groups falls back to the user's own groups
+        groups = parents.get(u.parent, direct[u.uuid]) if u.parent else direct[u.uuid]
+        direct_set = set(groups)
+        result[u.uuid] = groups + [
+            meta_uuid
+            for meta_uuid, meta_if_any, members in metagroups
+            if not members  # Empty metagroup: everyone belongs (0 == 0 on get_groups)
+            or (meta_if_any and not members.isdisjoint(direct_set))
+            or (not meta_if_any and members <= direct_set)
+        ]
+    return result
+
+
 @dataclasses.dataclass
 class UserItem(types.rest.BaseRestItem):
     id: str
@@ -149,7 +184,6 @@ def as_user_item(user: "User") -> UserItem:
             last_access=user.last_access,
             mfa_data=user.mfa_data,
             parent=user.parent,
-            groups=[i.uuid for i in user.get_groups()],
             role=user.get_role().as_str(),
         )
 
@@ -171,8 +205,15 @@ def get_item_position(self, parent: "Model", item_uuid: str) -> int:
     def get_items(self, parent: "Model") -> types.rest.ItemsResult[UserItem]:
         parent = ensure.is_instance(parent, Authenticator)
 
-        # Extract authenticator
-        return [self.as_user_item(i) for i in self.odata_filter(parent.users.all())]
+        users = self.odata_filter(parent.users.prefetch_related('groups'))
+        # groups filled in bulk; per-user get_groups() would cost O(N) extra queries
+        groups_of = bulk_groups_of_users(users, parent)
+        items: list[UserItem] = []
+        for u in users:
+            item = self.as_user_item(u)
+            item.groups = groups_of[u.uuid]
+            items.append(item)
+        return items
 
     @typing.override
     def get_item(self, parent: "Model", item: str) -> UserItem:

src/uds/static/admin/translations-fakejs.js

@@ -1,5 +1,6 @@
 // "Fake" javascript file for translations
 // Typescript
+gettext("Item changed by another administrator");
 gettext("Error saving element");
 gettext("Error handling your request");
 gettext("Search");
@@ -123,6 +124,28 @@ gettext("Edit server");
 gettext("Delete server");
 gettext("In Maintenance");
 gettext("Active");
+gettext("User");
+gettext("Name");
+gettext("Authenticator");
+gettext("State");
+gettext("Last access");
+gettext("Role");
+gettext("Group");
+gettext("Authenticator");
+gettext("Comments");
+gettext("State");
+gettext("Name");
+gettext("State");
+gettext("User services");
+gettext("In preparation");
+gettext("Usage");
+gettext("Pool group");
+gettext("Name");
+gettext("Service pool");
+gettext("Unique ID");
+gettext("State");
+gettext("IP");
+gettext("In use");
 gettext("Last 7 days");
 gettext("Last 30 days");
 gettext("Last 90 days");
@@ -308,12 +331,6 @@ gettext("In Maintenance");
 gettext("Active");
 gettext("Error");
 gettext("Please, select a valid server");
-gettext("Maintenance");
-gettext("Exit maintenance mode");
-gettext("Enter maintenance mode");
-gettext("Exit maintenance mode?");
-gettext("Enter maintenance mode?");
-gettext("Maintenance mode for");
 gettext("Error");
 gettext("This tunnel already has all the tunnel servers available");
 gettext("Remove member from tunnel");
@@ -482,15 +499,6 @@ gettext("Sessions");
 gettext("Pools used");
 gettext("Hours");
 gettext("Avg hours/session");
-gettext("total users");
-gettext("total groups");
-gettext("with services");
-gettext("View authenticators");
-gettext("total pools");
-gettext("View service pools");
-gettext("total services");
-gettext("assigned");
-gettext("View service pools");
 gettext("restrained services");
 gettext("View service pools");
 gettext("Summary");

tests/REST/methods/services_pools/test_services_pools.py

@@ -130,6 +130,18 @@ def test_service_pools(self) -> None:
             db_pool = models.ServicePool.objects.get(uuid=service_pool["id"])
             self.assertTrue(rest.assertions.assert_servicepool_is(db_pool, service_pool))
 
+    def test_overview_reflects_edit_immediately(self) -> None:
+        url = "servicespools/overview"
+
+        pool = models.ServicePool.objects.all()[0]
+        self.assertEqual(self.client.rest_get(url).status_code, 200)
+
+        pool.comments = "edited after a first listing"
+        pool.save()
+
+        edited = next(p for p in self.client.rest_get(url).json() if p["id"] == pool.uuid)
+        self.assertEqual(edited["comments"], pool.comments)
+
     # ------------------------------------------------------------------
     # CRUD smoke extension (Phase 1 — Safety net)
     # ------------------------------------------------------------------

tests/REST/methods/users_groups/test_users.py

@@ -73,6 +73,20 @@ def test_users(self) -> None:
             # Locate the user in the auth
             self.assertTrue(rest.assertions.assert_user_is(self.auth.users.get(name=user["name"]), user))
 
+    def test_users_overview_groups(self) -> None:
+        url = f'authenticators/{self.auth.uuid}/users'
+
+        response = self.client.rest_get(f'{url}/overview')
+        self.assertEqual(response.status_code, 200)
+        for user in response.json():
+            db_user = self.auth.users.get(name=user['name'])
+            # Bulk-computed overview groups must match per-user get_groups() semantics
+            self.assertEqual(
+                set(user['groups']),
+                {g.uuid for g in db_user.get_groups()},
+                f'Groups of user {user["name"]} do not match',
+            )
+
     def test_users_tableinfo(self) -> None:
         url = f"authenticators/{self.auth.uuid}/users/tableinfo"