1 files changed, 7 insertions, 5 deletions
diff --git a/modern/src/reports/ReportFilter.js b/modern/src/reports/ReportFilter.js
index 23c7fc0..25b0af7 100644
--- a/modern/src/reports/ReportFilter.js
+++ b/modern/src/reports/ReportFilter.js
@@ -6,11 +6,11 @@ import { useSelector } from 'react-redux';
 import moment from 'moment';
 import { useTranslation } from '../LocalizationProvider';
 
-const ReportFilter = ({ children, handleSubmit, showOnly }) => {
+const ReportFilter = ({ children, handleSubmit, showOnly, defaultSelected }) => {
   const t = useTranslation();
 
   const devices = useSelector((state) => Object.values(state.devices.items));
-  const [deviceId, setDeviceId] = useState();
+  const [deviceId, setDeviceId] = useState(defaultSelected);
   const [period, setPeriod] = useState('today');
   const [from, setFrom] = useState(moment().subtract(1, 'hour'));
   const [to, setTo] = useState(moment());
@@ -65,9 +65,11 @@ const ReportFilter = ({ children, handleSubmit, showOnly }) => {
         <FormControl variant="filled" fullWidth>
           <InputLabel>{t('reportDevice')}</InputLabel>
           <Select value={deviceId} onChange={(e) => setDeviceId(e.target.value)}>
-            {devices.map((device) => (
-              <MenuItem value={device.id}>{device.name}</MenuItem>
-            ))}
+              {devices
+                .sort((a, b) => a.name.localeCompare(b.name))
+                .map((device) => (
+                  <MenuItem value={device.id}>{device.name}</MenuItem>
+                ))}
           </Select>
         </FormControl>
       </Grid>