From 1fca4b1abdeda46c0fdbbc19cced11244b34b3cb Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 7 Apr 2025 14:05:31 +0000
Subject: [PATCH] Cleanup display

---
 src/frontend/src/pages/core/UserDetail.tsx | 70 +++++++++++++++++-----
 1 file changed, 55 insertions(+), 15 deletions(-)

diff --git a/src/frontend/src/pages/core/UserDetail.tsx b/src/frontend/src/pages/core/UserDetail.tsx
index 469a5f8861..5fa15234de 100644
--- a/src/frontend/src/pages/core/UserDetail.tsx
+++ b/src/frontend/src/pages/core/UserDetail.tsx
@@ -1,5 +1,5 @@
 import { t } from '@lingui/core/macro';
-import { Badge, Grid, Skeleton, Stack } from '@mantine/core';
+import { Badge, Group, Skeleton, Stack } from '@mantine/core';
 import { IconInfoCircle } from '@tabler/icons-react';
 import { type ReactNode, useMemo } from 'react';
 import { useParams } from 'react-router-dom';
@@ -34,6 +34,8 @@ export default function UserDetail() {
     pk: id
   });
 
+  const userGroups: any[] = useMemo(() => instance?.groups ?? [], [instance]);
+
   const detailsPanel = useMemo(() => {
     if (instanceQuery.isFetching) {
       return <Skeleton />;
@@ -73,6 +75,44 @@ export default function UserDetail() {
     ];
 
     const tr: DetailsField[] = [
+      {
+        type: 'boolean',
+        name: 'is_active',
+        label: t`Active`,
+        icon: 'info'
+      },
+      {
+        type: 'boolean',
+        name: 'is_staff',
+        label: t`Staff`,
+        icon: 'info'
+      },
+      {
+        type: 'boolean',
+        name: 'is_superuser',
+        label: t`Superuser`,
+        icon: 'info'
+      },
+      {
+        type: 'text',
+        name: 'groups',
+        label: t`Groups`,
+        icon: 'group',
+        copy: false,
+        hidden: !userGroups,
+        value_formatter: () => {
+          return (
+            <Group gap='xs'>
+              {userGroups?.map((group) => (
+                <Badge key={group.pk}>{group.name}</Badge>
+              ))}
+            </Group>
+          );
+        }
+      }
+    ];
+
+    const br: DetailsField[] = [
       {
         type: 'text',
         name: 'displayname',
@@ -88,12 +128,7 @@ export default function UserDetail() {
         icon: 'info',
         hidden: !instance.position
       },
-      {
-        type: 'boolean',
-        name: 'is_active',
-        label: t`Active`,
-        icon: 'info'
-      },
+
       {
         type: 'text',
         name: 'contact',
@@ -127,19 +162,24 @@ export default function UserDetail() {
       }
     ];
 
+    const hasProfile =
+      instance.displayname ||
+      instance.position ||
+      instance.contact ||
+      instance.organisation ||
+      instance.status ||
+      instance.location;
+
     return (
       <ItemDetailsGrid>
-        <Grid grow>
-          <Grid.Col span={{ base: 12, sm: 8 }}>
-            <DetailsTable fields={tl} item={instance} />
-          </Grid.Col>
-        </Grid>
-        {settings.isSet('DISPLAY_PROFILE_INFO') && (
-          <DetailsTable fields={tr} item={instance} />
+        <DetailsTable fields={tl} item={instance} />
+        <DetailsTable fields={tr} item={instance} />
+        {hasProfile && settings.isSet('DISPLAY_PROFILE_INFO') && (
+          <DetailsTable fields={br} item={instance} />
         )}
       </ItemDetailsGrid>
     );
-  }, [instance, instanceQuery]);
+  }, [instance, userGroups, instanceQuery]);
 
   const userPanels: PanelType[] = useMemo(() => {
     return [