From bf2c17247e59a3ee4bdc88647b167918253d231c Mon Sep 17 00:00:00 2001 From: Matjaž Črnko Date: Fri, 19 Jan 2024 19:20:02 +0100 Subject: feat: Change from Select to Autocomplete for single select in Reports --- modern/src/reports/components/ReportFilter.jsx | 46 +++++++++++++++++++------- 1 file changed, 34 insertions(+), 12 deletions(-) (limited to 'modern/src/reports/components/ReportFilter.jsx') diff --git a/modern/src/reports/components/ReportFilter.jsx b/modern/src/reports/components/ReportFilter.jsx index eab7d0eb..de64188c 100644 --- a/modern/src/reports/components/ReportFilter.jsx +++ b/modern/src/reports/components/ReportFilter.jsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { - FormControl, InputLabel, Select, MenuItem, Button, TextField, Typography, + FormControl, InputLabel, Select, MenuItem, Button, TextField, Typography, Autocomplete } from '@mui/material'; import { useDispatch, useSelector } from 'react-redux'; import dayjs from 'dayjs'; @@ -93,17 +93,39 @@ const ReportFilter = ({ children, handleSubmit, handleSchedule, showOnly, ignore {!ignoreDevice && (
- {t(multiDevice ? 'deviceTitle' : 'reportDevice')} - + {multiDevice ? ( + <> + {t('deviceTitle')} + + + ) : ( + <> + a.name.localeCompare(b.name))} + getOptionLabel={(option) => option?.name ?? ''} + renderOption={(props, option) => ( + + {option.name} + + )} + value={devices[deviceId] || null} + onChange={(event, newValue) => { + dispatch(devicesActions.selectId(newValue?.id ?? null)) + }} + renderInput={(params) => } + /> + + )}
)} -- cgit v1.2.3