Refactor PrinterInfo component for improved state management and UI consistency

- Updated the PrinterInfo component to utilize React hooks for managing edit form state and actions.
- Replaced the previous job-related collapsible sections with a unified audit logs section for better clarity.
- Enhanced the layout and structure of the component to improve user experience and maintainability.
- Updated imports to ensure consistency with file extensions and component organization.
This commit is contained in:
Tom Butcher 2025-08-18 01:05:07 +01:00
parent 2eccf6736f
commit ee90e75133

View File

@ -1,81 +1,77 @@
import React from 'react' import React, { useRef, useState } from 'react'
import { useLocation } from 'react-router-dom' import { useLocation } from 'react-router-dom'
import { Space, Flex, Card } from 'antd' import { Space, Flex, Card } from 'antd'
import { LoadingOutlined } from '@ant-design/icons' import { LoadingOutlined } from '@ant-design/icons'
import useCollapseState from '../../hooks/useCollapseState' import loglevel from 'loglevel'
import NotesPanel from '../../common/NotesPanel' import config from '../../../../config.js'
import InfoCollapse from '../../common/InfoCollapse' import useCollapseState from '../../hooks/useCollapseState.js'
import ObjectInfo from '../../common/ObjectInfo' import NotesPanel from '../../common/NotesPanel.jsx'
import ViewButton from '../../common/ViewButton' import InfoCollapse from '../../common/InfoCollapse.jsx'
import EditObjectForm from '../../common/EditObjectForm' import ObjectInfo from '../../common/ObjectInfo.jsx'
import EditButtons from '../../common/EditButtons' import ViewButton from '../../common/ViewButton.jsx'
import LockIndicator from '../../common/LockIndicator.jsx'
import PrinterJobsTree from '../../common/PrinterJobsTree'
import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
import NoteIcon from '../../../Icons/NoteIcon.jsx' import NoteIcon from '../../../Icons/NoteIcon.jsx'
import PrinterIcon from '../../../Icons/PrinterIcon.jsx'
import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
import ActionHandler from '../../common/ActionHandler' import EditObjectForm from '../../common/EditObjectForm.jsx'
import EditButtons from '../../common/EditButtons.jsx'
import LockIndicator from '../../common/LockIndicator.jsx'
import ActionHandler from '../../common/ActionHandler.jsx'
import ObjectActions from '../../common/ObjectActions.jsx' import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx' import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx' import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
const log = loglevel.getLogger('PrinterInfo')
log.setLevel(config.logLevel)
const PrinterInfo = () => { const PrinterInfo = () => {
const location = useLocation() const location = useLocation()
const editFormRef = useRef(null)
const actionHandlerRef = useRef(null)
const printerId = new URLSearchParams(location.search).get('printerId') const printerId = new URLSearchParams(location.search).get('printerId')
const [collapseState, updateCollapseState] = useCollapseState('PrinterInfo', { const [collapseState, updateCollapseState] = useCollapseState('PrinterInfo', {
info: true, info: true,
jobs: true, stocks: true,
notes: true, notes: true,
auditLogsParent: true, auditLogs: true
auditLogsOwner: true })
const [editFormState, setEditFormState] = useState({
isEditing: false,
editLoading: false,
formValid: false,
locked: false,
loading: false
}) })
return (
<EditObjectForm
id={printerId}
type='printer'
style={{ height: 'calc(var(--unit-100vh) - 155px)', minHeight: 0 }}
>
{({
loading,
isEditing,
startEditing,
cancelEditing,
handleUpdate,
formValid,
objectData,
editLoading,
lock,
fetchObject
}) => {
// Define actions for ActionHandler
const actions = { const actions = {
reload: () => { reload: () => {
fetchObject() editFormRef?.current.handleFetchObject()
return true return true
}, },
edit: () => { edit: () => {
startEditing() editFormRef?.current.startEditing()
console.log('CALLING START EDITING')
return false return false
}, },
cancelEdit: () => { cancelEdit: () => {
cancelEditing() editFormRef?.current.cancelEditing()
return true return true
}, },
finishEdit: () => { finishEdit: () => {
handleUpdate() editFormRef?.current.handleUpdate()
return true return true
} }
} }
return ( return (
<ActionHandler actions={actions} loading={loading}> <>
{({ callAction }) => (
<Flex <Flex
gap='large' gap='large'
vertical='true' vertical='true'
style={{ height: '100%', minHeight: 0 }} style={{
height: 'calc(var(--unit-100vh) - 155px)',
minHeight: 0
}}
> >
<Flex justify={'space-between'}> <Flex justify={'space-between'}>
<Space size='middle'> <Space size='middle'>
@ -83,60 +79,67 @@ const PrinterInfo = () => {
<ObjectActions <ObjectActions
type='printer' type='printer'
id={printerId} id={printerId}
disabled={loading} disabled={editFormState.loading}
/> />
<ViewButton <ViewButton
disabled={loading} disabled={editFormState.loading}
items={[ items={[
{ key: 'info', label: 'Printer Information' }, { key: 'info', label: 'Printer Information' },
{ key: 'jobs', label: 'Printer Jobs' },
{ key: 'notes', label: 'Notes' }, { key: 'notes', label: 'Notes' },
{ { key: 'auditLogs', label: 'Audit Logs' }
key: 'auditLogsParent',
label: 'Audit Logs (By Parent)'
},
{
key: 'auditLogsOwner',
label: 'Audit Logs (By Owner)'
}
]} ]}
visibleState={collapseState} visibleState={collapseState}
updateVisibleState={updateCollapseState} updateVisibleState={updateCollapseState}
/> />
</Space> </Space>
<LockIndicator lock={lock} /> <LockIndicator lock={editFormState.lock} />
</Space> </Space>
<Space> <Space>
<EditButtons <EditButtons
isEditing={isEditing} isEditing={editFormState.isEditing}
handleUpdate={() => { handleUpdate={() => {
callAction('finishEdit') actionHandlerRef.current.callAction('finishEdit')
}} }}
cancelEditing={() => { cancelEditing={() => {
callAction('cancelEdit') actionHandlerRef.current.callAction('cancelEdit')
}} }}
startEditing={() => { startEditing={() => {
callAction('edit') actionHandlerRef.current.callAction('edit')
}} }}
editLoading={editLoading} editLoading={editFormState.editLoading}
formValid={formValid} formValid={editFormState.formValid}
disabled={lock?.locked || loading} disabled={editFormState.lock?.locked || editFormState.loading}
loading={editLoading} loading={editFormState.editLoading}
/> />
</Space> </Space>
</Flex> </Flex>
<div style={{ height: '100%', overflow: 'auto' }}> <div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}> <Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
loading={editFormState.loading}
ref={actionHandlerRef}
>
<InfoCollapse <InfoCollapse
title='Printer Information' title='Printer Information'
icon={<InfoCircleIcon />} icon={<InfoCircleIcon />}
active={collapseState.info} active={collapseState.info}
onToggle={(expanded) => onToggle={(expanded) => updateCollapseState('info', expanded)}
updateCollapseState('info', expanded)
}
collapseKey='info' collapseKey='info'
> >
<EditObjectForm
id={printerId}
type='printer'
style={{ height: '100%' }}
ref={editFormRef}
onStateChange={(state) => {
console.log('Got edit form state change', state)
setEditFormState((prev) => ({ ...prev, ...state }))
}}
>
{({ loading, isEditing, objectData }) => {
return (
<ObjectInfo <ObjectInfo
loading={loading} loading={loading}
indicator={<LoadingOutlined />} indicator={<LoadingOutlined />}
@ -144,30 +147,17 @@ const PrinterInfo = () => {
type='printer' type='printer'
objectData={objectData} objectData={objectData}
/> />
)
}}
</EditObjectForm>
</InfoCollapse> </InfoCollapse>
</ActionHandler>
<InfoCollapse
title='Printer Jobs'
icon={<PrinterIcon />}
active={collapseState.jobs}
onToggle={(expanded) =>
updateCollapseState('jobs', expanded)
}
collapseKey='jobs'
>
<PrinterJobsTree
subJobs={objectData?.subJobs}
loading={loading}
/>
</InfoCollapse>
<InfoCollapse <InfoCollapse
title='Notes' title='Notes'
icon={<NoteIcon />} icon={<NoteIcon />}
active={collapseState.notes} active={collapseState.notes}
onToggle={(expanded) => onToggle={(expanded) => updateCollapseState('notes', expanded)}
updateCollapseState('notes', expanded)
}
collapseKey='notes' collapseKey='notes'
> >
<Card> <Card>
@ -176,15 +166,15 @@ const PrinterInfo = () => {
</InfoCollapse> </InfoCollapse>
<InfoCollapse <InfoCollapse
title='Audit Logs (By Parent)' title='Audit Logs'
icon={<AuditLogIcon />} icon={<AuditLogIcon />}
active={collapseState.auditLogsParent} active={collapseState.auditLogs}
onToggle={(expanded) => onToggle={(expanded) =>
updateCollapseState('auditLogsParent', expanded) updateCollapseState('auditLogs', expanded)
} }
collapseKey='auditLogs' collapseKey='auditLogs'
> >
{loading ? ( {editFormState.loading ? (
<InfoCollapsePlaceholder /> <InfoCollapsePlaceholder />
) : ( ) : (
<ObjectTable <ObjectTable
@ -194,33 +184,10 @@ const PrinterInfo = () => {
/> />
)} )}
</InfoCollapse> </InfoCollapse>
<InfoCollapse
title='Audit Logs (By Owner)'
icon={<AuditLogIcon />}
active={collapseState.auditLogsOwner}
onToggle={(expanded) =>
updateCollapseState('auditLogsOwner', expanded)
}
collapseKey='auditLogs'
>
{loading ? (
<InfoCollapsePlaceholder />
) : (
<ObjectTable
type='auditLog'
masterFilter={{ 'owner._id': printerId }}
visibleColumns={{ _id: false, 'owner._id': false }}
/>
)}
</InfoCollapse>
</Flex> </Flex>
</div> </div>
</Flex> </Flex>
)} </>
</ActionHandler>
)
}}
</EditObjectForm>
) )
} }