From 89a40e48259ce39959101b4f1f7dc5e26c630b74 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 24 Feb 2024 13:47:19 -0800
Subject: Unify settings styles

---
 modern/src/settings/DeviceConnectionsPage.jsx | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'modern/src/settings/DeviceConnectionsPage.jsx')

diff --git a/modern/src/settings/DeviceConnectionsPage.jsx b/modern/src/settings/DeviceConnectionsPage.jsx
index 88d47872..e6565058 100644
--- a/modern/src/settings/DeviceConnectionsPage.jsx
+++ b/modern/src/settings/DeviceConnectionsPage.jsx
@@ -7,7 +7,6 @@ import {
   Typography,
   Container,
 } from '@mui/material';
-import makeStyles from '@mui/styles/makeStyles';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import LinkField from '../common/components/LinkField';
 import { useTranslation } from '../common/components/LocalizationProvider';
@@ -15,21 +14,10 @@ import SettingsMenu from './components/SettingsMenu';
 import { formatNotificationTitle } from '../common/util/formatter';
 import PageLayout from '../common/components/PageLayout';
 import useFeatures from '../common/util/useFeatures';
-
-const useStyles = makeStyles((theme) => ({
-  container: {
-    marginTop: theme.spacing(2),
-  },
-  details: {
-    display: 'flex',
-    flexDirection: 'column',
-    gap: theme.spacing(2),
-    paddingBottom: theme.spacing(3),
-  },
-}));
+import useSettingsStyles from './common/useSettingsStyles';
 
 const DeviceConnectionsPage = () => {
-  const classes = useStyles();
+  const classes = useSettingsStyles();
   const t = useTranslation();
 
   const { id } = useParams();
-- 
cgit v1.2.3


From 3309317e3bb7db4f1eb3d9ae1803effb637a4faf Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Wed, 28 Feb 2024 04:59:19 -0800
Subject: Show uniqueId in connections

---
 modern/src/settings/DeviceConnectionsPage.jsx | 1 +
 modern/src/settings/GroupConnectionsPage.jsx  | 1 +
 modern/src/settings/UserConnectionsPage.jsx   | 2 ++
 3 files changed, 4 insertions(+)

(limited to 'modern/src/settings/DeviceConnectionsPage.jsx')

diff --git a/modern/src/settings/DeviceConnectionsPage.jsx b/modern/src/settings/DeviceConnectionsPage.jsx
index e6565058..10d0c3f6 100644
--- a/modern/src/settings/DeviceConnectionsPage.jsx
+++ b/modern/src/settings/DeviceConnectionsPage.jsx
@@ -61,6 +61,7 @@ const DeviceConnectionsPage = () => {
                 baseId={id}
                 keyBase="deviceId"
                 keyLink="driverId"
+                titleGetter={(it) => `${it.name} (${it.uniqueId})`}
                 label={t('sharedDrivers')}
               />
             )}
diff --git a/modern/src/settings/GroupConnectionsPage.jsx b/modern/src/settings/GroupConnectionsPage.jsx
index 498bb709..cd4e743b 100644
--- a/modern/src/settings/GroupConnectionsPage.jsx
+++ b/modern/src/settings/GroupConnectionsPage.jsx
@@ -61,6 +61,7 @@ const GroupConnectionsPage = () => {
                 baseId={id}
                 keyBase="groupId"
                 keyLink="driverId"
+                titleGetter={(it) => `${it.name} (${it.uniqueId})`}
                 label={t('sharedDrivers')}
               />
             )}
diff --git a/modern/src/settings/UserConnectionsPage.jsx b/modern/src/settings/UserConnectionsPage.jsx
index b7500ebf..3ca0bdc1 100644
--- a/modern/src/settings/UserConnectionsPage.jsx
+++ b/modern/src/settings/UserConnectionsPage.jsx
@@ -40,6 +40,7 @@ const UserConnectionsPage = () => {
               baseId={id}
               keyBase="userId"
               keyLink="deviceId"
+              titleGetter={(it) => `${it.name} (${it.uniqueId})`}
               label={t('deviceTitle')}
             />
             <LinkField
@@ -98,6 +99,7 @@ const UserConnectionsPage = () => {
               baseId={id}
               keyBase="userId"
               keyLink="driverId"
+              titleGetter={(it) => `${it.name} (${it.uniqueId})`}
               label={t('sharedDrivers')}
             />
             <LinkField
-- 
cgit v1.2.3