diff --git a/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx b/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx index 0f4b747..51853c7 100644 --- a/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx +++ b/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx @@ -2,7 +2,7 @@ import { useRef, useState } from 'react' import { useLocation } from 'react-router-dom' import { Space, Flex, Card } from 'antd' import useCollapseState from '../../hooks/useCollapseState' -import EditObjectForm from '../../common/EditObjectForm' +import ObjectForm from '../../common/ObjectForm' import ObjectInfo from '../../common/ObjectInfo' import ObjectTable from '../../common/ObjectTable' import ObjectActions from '../../common/ObjectActions' @@ -123,7 +123,7 @@ const FilamentStockInfo = () => { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { objectData={objectData} /> )} - + { ) return ( - { ) }} - + ) } diff --git a/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx b/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx index 936c9fa..0295859 100644 --- a/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx +++ b/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx @@ -12,7 +12,7 @@ import ViewButton from '../../common/ViewButton.jsx' import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import NoteIcon from '../../../Icons/NoteIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' -import EditObjectForm from '../../common/EditObjectForm.jsx' +import ObjectForm from '../../common/ObjectForm.jsx' import EditButtons from '../../common/EditButtons.jsx' import LockIndicator from '../../common/LockIndicator.jsx' import ActionHandler from '../../common/ActionHandler.jsx' @@ -126,7 +126,7 @@ const DocumentSizeInfo = () => { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { objectData={objectData} /> )} - + { loading={editFormState.loading} ref={actionHandlerRef} > - { /> ) }} - + { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { /> ) }} - + diff --git a/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx b/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx index 34488df..e729bf0 100644 --- a/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx +++ b/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx @@ -12,7 +12,7 @@ import ViewButton from '../../common/ViewButton' import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import NoteIcon from '../../../Icons/NoteIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' -import EditObjectForm from '../../common/EditObjectForm' +import ObjectForm from '../../common/ObjectForm' import EditButtons from '../../common/EditButtons' import LockIndicator from '../../common/LockIndicator.jsx' import ActionHandler from '../../common/ActionHandler' @@ -132,7 +132,7 @@ const FilamentInfo = () => { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { /> ) }} - + diff --git a/src/components/Dashboard/Management/Hosts/HostInfo.jsx b/src/components/Dashboard/Management/Hosts/HostInfo.jsx index 96ad36e..b665c37 100644 --- a/src/components/Dashboard/Management/Hosts/HostInfo.jsx +++ b/src/components/Dashboard/Management/Hosts/HostInfo.jsx @@ -12,7 +12,7 @@ import ViewButton from '../../common/ViewButton.jsx' import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import NoteIcon from '../../../Icons/NoteIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' -import EditObjectForm from '../../common/EditObjectForm.jsx' +import ObjectForm from '../../common/ObjectForm.jsx' import EditButtons from '../../common/EditButtons.jsx' import LockIndicator from '../../common/LockIndicator.jsx' import ActionHandler from '../../common/ActionHandler.jsx' @@ -133,7 +133,7 @@ const HostInfo = () => { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { /> ) }} - + diff --git a/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx b/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx index 14b257c..c3fc45f 100644 --- a/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx +++ b/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx @@ -8,7 +8,7 @@ import ObjectInfo from '../../common/ObjectInfo' import ViewButton from '../../common/ViewButton' import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' -import EditObjectForm from '../../common/EditObjectForm' +import ObjectForm from '../../common/ObjectForm' import EditButtons from '../../common/EditButtons' import LockIndicator from '../../common/LockIndicator.jsx' import ActionHandler from '../../common/ActionHandler.jsx' @@ -115,7 +115,7 @@ const NoteTypeInfo = () => { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { objectData={objectData} /> )} - + { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { objectData={objectData} /> )} - + { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { objectData={objectData} /> )} - + { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { objectData={objectData} /> )} - + { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { objectData={objectData} /> )} - + { loading={editFormState.loading} ref={actionHandlerRef} > - { ) }} - + { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { objectData={objectData} /> )} - + diff --git a/src/components/Dashboard/Production/Printers/PrinterInfo.jsx b/src/components/Dashboard/Production/Printers/PrinterInfo.jsx index bc66bb4..0f4f12a 100644 --- a/src/components/Dashboard/Production/Printers/PrinterInfo.jsx +++ b/src/components/Dashboard/Production/Printers/PrinterInfo.jsx @@ -12,7 +12,7 @@ import ViewButton from '../../common/ViewButton.jsx' import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx' import NoteIcon from '../../../Icons/NoteIcon.jsx' import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx' -import EditObjectForm from '../../common/EditObjectForm.jsx' +import ObjectForm from '../../common/ObjectForm.jsx' import EditButtons from '../../common/EditButtons.jsx' import LockIndicator from '../../common/LockIndicator.jsx' import ActionHandler from '../../common/ActionHandler.jsx' @@ -128,7 +128,7 @@ const PrinterInfo = () => { onToggle={(expanded) => updateCollapseState('info', expanded)} collapseKey='info' > - { /> ) }} - + diff --git a/src/components/Dashboard/common/EditObjectForm.jsx b/src/components/Dashboard/common/ObjectForm.jsx similarity index 97% rename from src/components/Dashboard/common/EditObjectForm.jsx rename to src/components/Dashboard/common/ObjectForm.jsx index b19c0e4..238ddd1 100644 --- a/src/components/Dashboard/common/EditObjectForm.jsx +++ b/src/components/Dashboard/common/ObjectForm.jsx @@ -14,7 +14,7 @@ import DeleteObjectModal from './DeleteObjectModal' import merge from 'lodash/merge' /** - * EditObjectForm is a reusable form component for editing any object type. + * ObjectForm is a reusable form component for editing any object type. * It handles fetching, updating, locking, unlocking, and validation logic. * * Props: @@ -25,7 +25,7 @@ import merge from 'lodash/merge' * loading, isEditing, startEditing, cancelEditing, handleUpdate, form, formValid, objectData, setIsEditing, setObjectData * }) => ReactNode */ -const EditObjectForm = forwardRef( +const ObjectForm = forwardRef( ({ id, type, style, children, onEdit, onStateChange }, ref) => { const [objectData, setObjectData] = useState(null) const [serverObjectData, setServerObjectData] = useState(null) @@ -272,9 +272,9 @@ const EditObjectForm = forwardRef( } ) -EditObjectForm.displayName = 'EditObjectForm' +ObjectForm.displayName = 'ObjectForm' -EditObjectForm.propTypes = { +ObjectForm.propTypes = { id: PropTypes.string.isRequired, type: PropTypes.string.isRequired, children: PropTypes.func.isRequired, @@ -283,4 +283,4 @@ EditObjectForm.propTypes = { onStateChange: PropTypes.func } -export default EditObjectForm +export default ObjectForm