Skip to content

Fix some ui issues, allow 0 report length #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balbatross merged 1 commit into from
Jun 18, 2025
Merged

Fix some ui issues, allow 0 report length #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/app/hivecommand-backend/src/schema/devices/reports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default (prisma: PrismaClient) => {
recurring: args.input.recurring || false,
startDate: args.input.startDate,
endDate: args.input.endDate || null,
reportLength: mathUnit(args.input.reportLength).format({})
reportLength: args.input.reportLength ? mathUnit(args.input.reportLength).format({}) : undefined
// reports: [],
}]
}
Expand Down Expand Up @@ -151,7 +151,7 @@ export default (prisma: PrismaClient) => {
recurring: args.input.recurring,
startDate: args.input.startDate,
endDate: args.input.endDate || null,
reportLength: mathUnit(args.input.reportLength).format({})
reportLength: args.input.reportLength ? mathUnit(args.input.reportLength).format({}) : undefined
}
}
}
Expand Down
21 changes: 14 additions & 7 deletions packages/core-ui/command-surface/src/components/modals/device-report/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ export interface DeviceReportModalProps {

export const DeviceReportModal : React.FC<DeviceReportModalProps> = (props) => {

const [ report, setReport ] = useState<DeviceReport>({})
const [ report, setReport ] = useState<DeviceReport>({
recurring: false
})

const timeBucketError = useMemo(() => {
try{
Expand All @@ -38,9 +40,11 @@ export const DeviceReportModal : React.FC<DeviceReportModalProps> = (props) => {
}, [report.reportLength])

useEffect(() => {
setReport({...props.selected})
setReport({...props.selected, recurring: props.selected?.recurring || false})
}, [props.selected])

console.log("REC", {recurring: report.recurring})

return (
<Dialog
fullWidth
Expand All @@ -53,7 +57,7 @@ export const DeviceReportModal : React.FC<DeviceReportModalProps> = (props) => {
<Box sx={{marginTop: '8px', display: 'flex', flexDirection: 'column'}}>
<TextField
fullWidth
value={report.name}
value={report.name || ''}
onChange={(e) => {
setReport({...report, name: e.target.value})
}}
Expand All @@ -62,12 +66,12 @@ export const DeviceReportModal : React.FC<DeviceReportModalProps> = (props) => {

<FormControlLabel
control={
<Checkbox checked={report.recurring} onChange={(e) => {
setReport({...report, recurring: e.target.checked})
<Checkbox checked={report.recurring || false} onChange={(e) => {
setReport((r) => ({...r, recurring: e.target.checked}))
if(e.target.checked){
setReport({...report, endDate: null})
setReport((r) => ({...r, endDate: null}))
}else{
setReport({...report, endDate: new Date()})
setReport((r) => ({...r, endDate: new Date()}))
}
}} />
}
Expand All @@ -84,6 +88,7 @@ export const DeviceReportModal : React.FC<DeviceReportModalProps> = (props) => {
<Box sx={{marginTop: '8px'}}>
{report.recurring ?
(<TextField
key={'report-length'}
error={timeBucketError}
value={report.reportLength}
onChange={(e) => setReport({
Expand All @@ -94,6 +99,8 @@ export const DeviceReportModal : React.FC<DeviceReportModalProps> = (props) => {
size="small"
label="Report length" />) :
<DatePicker
key={'report-end'}

inputFormat='DD/MM/YYYY'
renderInput={(params) => <TextField {...params} fullWidth size="small" label="End Date" />}
value={report.endDate}
Expand Down
Loading