diff options
Diffstat (limited to 'modern/src/DevicesList.js')
| -rw-r--r-- | modern/src/DevicesList.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/modern/src/DevicesList.js b/modern/src/DevicesList.js index b7222a2..be24641 100644 --- a/modern/src/DevicesList.js +++ b/modern/src/DevicesList.js @@ -25,7 +25,7 @@ import EditCollectionView from './EditCollectionView'; import { useEffectAsync } from './reactHelper'; import { formatPosition, formatSpeed, formatDate, formatHours } from './common/formatter'; import { useAttributePreference } from './common/preferences'; -import { getDevices, getFilteredDevices, getPosition } from './common/selectors'; +import { getDevices, getFilteredDevices, getFilterTerm, getPosition } from './common/selectors'; import { useTranslation } from './LocalizationProvider'; const useStyles = makeStyles((theme) => ({ @@ -141,7 +141,11 @@ const DeviceRow = ({ data, index, style }) => { </>} secondary={( <> {/* Contact */} - <PersonIcon fontSize="inherit" /> {item.contact}<br /> + {item.contact && ( + <> + <PersonIcon fontSize="inherit" /> {item.contact}<br /> + </> + )} {position && ( <> {/* Speed */} @@ -187,10 +191,11 @@ const DeviceView = ({ updateTimestamp, onMenuClick }) => { const dispatch = useDispatch(); const listInnerEl = useRef(null); + const filterTerm = useSelector(getFilterTerm); const filteredItems = useSelector(getFilteredDevices); const unfilteredItems = useSelector(getDevices); - const items = filteredItems.length > 0 ? filteredItems : unfilteredItems; + const items = (filterTerm.length > 0 ? filteredItems : unfilteredItems).sort((a, b) => a.name.localeCompare(b.name)); if (listInnerEl.current) { listInnerEl.current.className = classes.listInner; |