diff --git a/src/common/attributes/useCommonUserAttributes.js b/src/common/attributes/useCommonUserAttributes.js index 43983fbc99..f01f16f675 100644 --- a/src/common/attributes/useCommonUserAttributes.js +++ b/src/common/attributes/useCommonUserAttributes.js @@ -37,6 +37,10 @@ export default (t) => useMemo(() => ({ name: t('deviceSecondaryInfo'), type: 'string', }, + deviceShowAttribute: { + name: t('deviceShowAttribute'), + type: 'string', + }, soundEvents: { name: t('eventsSoundEvents'), type: 'string', diff --git a/src/main/DeviceRow.jsx b/src/main/DeviceRow.jsx index d9c1a18978..c90a8c35cc 100644 --- a/src/main/DeviceRow.jsx +++ b/src/main/DeviceRow.jsx @@ -22,6 +22,7 @@ import { mapIconKey, mapIcons } from '../map/core/preloadImages'; import { useAdministrator } from '../common/util/permissions'; import EngineIcon from '../resources/images/data/engine.svg?react'; import { useAttributePreference } from '../common/util/preferences'; +import PositionValue from '../common/components/PositionValue'; dayjs.extend(relativeTime); @@ -62,6 +63,7 @@ const DeviceRow = ({ data, index, style }) => { const devicePrimary = useAttributePreference('devicePrimary', 'name'); const deviceSecondary = useAttributePreference('deviceSecondary', ''); + const deviceShowAttribute = useAttributePreference('deviceShowAttribute', ''); const secondaryText = () => { let status; @@ -74,6 +76,16 @@ const DeviceRow = ({ data, index, style }) => { <> {deviceSecondary && item[deviceSecondary] && `${item[deviceSecondary]} • `} {status} + {position && position.hasOwnProperty(deviceShowAttribute) && ( + <> + {' • '} + + + )} ); }; diff --git a/src/resources/l10n/en.json b/src/resources/l10n/en.json index f541b3a28e..4cc96a0184 100644 --- a/src/resources/l10n/en.json +++ b/src/resources/l10n/en.json @@ -121,6 +121,7 @@ "calendarFriday": "Friday", "calendarSaturday": "Saturday", "attributeShowGeofences": "Show Geofences", + "deviceShowAttribute": "Show Attribute on SideBar", "attributeSpeedLimit": "Speed Limit", "attributeFuelDropThreshold": "Fuel Drop Threshold", "attributeFuelIncreaseThreshold": "Fuel Increase Threshold", diff --git a/src/settings/PreferencesPage.jsx b/src/settings/PreferencesPage.jsx index a8e3de884b..50e3d6f65a 100644 --- a/src/settings/PreferencesPage.jsx +++ b/src/settings/PreferencesPage.jsx @@ -258,6 +258,23 @@ const PreferencesPage = () => { titleGetter={(it) => t(it.name)} label={t('deviceSecondaryInfo')} /> + + {t('deviceShowAttribute')} + +