farmcontrol/farmcontrol-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: farmcontrol:59632c30605d5c980ec1dc14003d3d836d4c6f69
Branches Tags
farmcontrol:main
..
compare: farmcontrol:97f0c816adc96a4e9d0a19d632730942a20ac4fe
Branches Tags
farmcontrol:main

No commits in common. "59632c30605d5c980ec1dc14003d3d836d4c6f69" and "97f0c816adc96a4e9d0a19d632730942a20ac4fe" have entirely different histories.
59632c3060 ... 97f0c816ad

21 changed files with 39 additions and 82 deletions
Show Stats Expand all files Collapse all files

7
src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx
View File

@ -18,7 +18,6 @@ import NoteIcon from '../../../Icons/NoteIcon'
import AuditLogIcon from '../../../Icons/AuditLogIcon'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder'
import DocumentPrintButton from '../../common/DocumentPrintButton'
import ScrollBox from '../../common/ScrollBox'
const FilamentStockInfo = () => {
const location = useLocation()
@ -113,12 +112,12 @@ const FilamentStockInfo = () => {
}}
editLoading={objectFormState.editLoading}
formValid={objectFormState.formValid}
disabled={true}
disabled={objectFormState.lock?.locked || objectFormState.loading}
loading={objectFormState.editLoading}
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -200,7 +199,7 @@ const FilamentStockInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx
View File

@ -20,7 +20,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('DocumentJobInfo')
log.setLevel(config.logLevel)
@ -121,7 +120,7 @@ const DocumentJobInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -187,7 +186,7 @@ const DocumentJobInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo.jsx
View File

@ -20,7 +20,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('DocumentPrinterInfo')
log.setLevel(config.logLevel)
@ -130,7 +129,7 @@ const DocumentPrinterInfo = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -200,7 +199,7 @@ const DocumentPrinterInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx
View File

@ -20,7 +20,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('DocumentSizeInfo')
log.setLevel(config.logLevel)
@ -121,7 +120,7 @@ const DocumentSizeInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -187,7 +186,7 @@ const DocumentSizeInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateDesign.jsx
View File

@ -13,7 +13,6 @@ 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 ScrollBox from '../../common/ScrollBox.jsx'
import TemplateEditor from '../../common/TemplateEditor.jsx'
@ -123,7 +122,7 @@ const DocumentTemplateDesign = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -165,7 +164,7 @@ const DocumentTemplateDesign = () => {
</Card>
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
)
}

5
src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateInfo.jsx
View File

@ -20,7 +20,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('DocumentTemplateInfo')
log.setLevel(config.logLevel)
@ -127,7 +126,7 @@ const DocumentTemplateInfo = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -202,7 +201,7 @@ const DocumentTemplateInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/Filaments/FilamentInfo.jsx
View File

@ -21,7 +21,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import FilamentIcon from '../../../Icons/FilamentIcon.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('FilamentInfo')
log.setLevel(config.logLevel)
@ -127,7 +126,7 @@ const FilamentInfo = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -219,7 +218,7 @@ const FilamentInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/Files/FileInfo.jsx
View File

@ -23,7 +23,6 @@ import FileIcon from '../../../Icons/FileIcon.jsx'
import FilePreview from '../../common/FilePreview.jsx'
import MissingPlaceholder from '../../common/MissingPlaceholder.jsx'
import { ApiServerContext } from '../../context/ApiServerContext.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('FileInfo')
log.setLevel(config.logLevel)
@ -131,7 +130,7 @@ const FileInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -215,7 +214,7 @@ const FileInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/Hosts/HostInfo.jsx
View File

@ -23,7 +23,6 @@ import HostOTP from './HostOtp.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import PrinterIcon from '../../../Icons/PrinterIcon.jsx'
import DocumentPrinterIcon from '../../../Icons/DocumentPrinterIcon.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('HostInfo')
log.setLevel(config.logLevel)
@ -133,7 +132,7 @@ const HostInfo = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -246,7 +245,7 @@ const HostInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
<Modal

5
src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx
View File

@ -16,7 +16,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const NoteTypeInfo = () => {
const location = useLocation()
@ -110,7 +109,7 @@ const NoteTypeInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -165,7 +164,7 @@ const NoteTypeInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/Notes/NoteInfo.jsx
View File

@ -19,7 +19,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('NoteInfo')
log.setLevel(config.logLevel)
@ -119,7 +118,7 @@ const NoteInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -184,7 +183,7 @@ const NoteInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/Parts/PartInfo.jsx
View File

@ -17,7 +17,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const PartInfo = () => {
const location = useLocation()
@ -110,7 +109,7 @@ const PartInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -175,7 +174,7 @@ const PartInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/Products/ProductInfo.jsx
View File

@ -18,7 +18,6 @@ import ActionHandler from '../../common/ActionHandler.jsx'
import ObjectActions from '../../common/ObjectActions.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const ProductInfo = () => {
const location = useLocation()
@ -112,7 +111,7 @@ const ProductInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -193,7 +192,7 @@ const ProductInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/Users/UserInfo.jsx
View File

@ -18,7 +18,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const UserInfo = () => {
const location = useLocation()
@ -111,7 +110,7 @@ const UserInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -177,7 +176,7 @@ const UserInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Management/Vendors/VendorInfo.jsx
View File

@ -19,7 +19,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('VendorInfo')
log.setLevel(config.logLevel)
@ -119,7 +118,7 @@ const VendorInfo = () => {
/>
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflow: 'auto' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -184,7 +183,7 @@ const VendorInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx
View File

@ -23,7 +23,6 @@ import EyeIcon from '../../../Icons/EyeIcon.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import MissingPlaceholder from '../../common/MissingPlaceholder.jsx'
import FilePreview from '../../common/FilePreview.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('GCodeFileInfo')
log.setLevel(config.logLevel)
@ -129,7 +128,7 @@ const GCodeFileInfo = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -225,7 +224,7 @@ const GCodeFileInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

5
src/components/Dashboard/Production/Jobs/JobInfo.jsx
View File

@ -22,7 +22,6 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import JobIcon from '../../../Icons/JobIcon.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import DeployJob from './DeployJob.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('JobInfo')
log.setLevel(config.logLevel)
@ -133,7 +132,7 @@ const JobInfo = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -215,7 +214,7 @@ const JobInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
<Modal
destroyOnHidden

5
src/components/Dashboard/Production/Printers/ControlPrinter.jsx
View File

@ -30,7 +30,6 @@ import { ApiServerContext } from '../../context/ApiServerContext.jsx'
import LoadFilamentStock from '../../Inventory/FilamentStocks/LoadFilamentStock.jsx'
import UnloadFilamentStock from '../../Inventory/FilamentStocks/UnloadFilamentStock.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('ControlPrinter')
log.setLevel(config.logLevel)
@ -264,7 +263,7 @@ const ControlPrinter = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -487,7 +486,7 @@ const ControlPrinter = () => {
</Card>
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
<Modal
open={loadFilamentStockOpen}

5
src/components/Dashboard/Production/Printers/PrinterInfo.jsx
View File

@ -20,7 +20,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
import ObjectTable from '../../common/ObjectTable.jsx'
import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
import ScrollBox from '../../common/ScrollBox.jsx'
const log = loglevel.getLogger('PrinterInfo')
log.setLevel(config.logLevel)
@ -123,7 +122,7 @@ const PrinterInfo = () => {
</Space>
</Flex>
<ScrollBox>
<div style={{ height: '100%', overflowY: 'scroll' }}>
<Flex vertical gap={'large'}>
<ActionHandler
actions={actions}
@ -203,7 +202,7 @@ const PrinterInfo = () => {
)}
</InfoCollapse>
</Flex>
</ScrollBox>
</div>
</Flex>
</>
)

20
src/components/Dashboard/common/ScrollBox.jsx
View File

@ -1,20 +0,0 @@
import PropTypes from 'prop-types'
import SimpleBar from 'simplebar-react'
import 'simplebar-react/dist/simplebar.min.css'
const ScrollBox = ({ children, style, ...rest }) => {
return (
<div style={{ height: '100%', minHeight: '0' }}>
<SimpleBar style={{ height: '100%', ...style }} {...rest}>
{children}
</SimpleBar>
</div>
)
}
ScrollBox.propTypes = {
children: PropTypes.node,
style: PropTypes.object
}
export default ScrollBox

4
src/components/Dashboard/common/StateTag.jsx
View File

@ -92,10 +92,6 @@ const StateTag = ({ state, showBadge = true, style = {} }) => {
status = 'warning'
text = 'Used'
break
case 'unconsumed':
status = 'success'
text = 'Unconsumed'
break
default:
status = 'default'
text = state || 'Unknown'