Compare commits

..

No commits in common. "a6fce60d0486784017bc5a6aff485df8ed59a163" and "80ecc8a17518ec19594321bbf361275dfd4e0f11" have entirely different histories.

10 changed files with 12 additions and 74 deletions

View File

@ -341,7 +341,6 @@ const ControlPrinter = ({ slicerIntegration = false }) => {
createdAt: false, createdAt: false,
updatedAt: false, updatedAt: false,
state: !slicerIntegration, state: !slicerIntegration,
pendingSlicerUploads: false,
name: !slicerIntegration name: !slicerIntegration
}} }}
objectPropertyProps={{ objectPropertyProps={{

View File

@ -53,8 +53,7 @@ const NewPrinter = ({ onOk, defaultValues }) => {
'currentJob._id': false, 'currentJob._id': false,
currentSubJob: false, currentSubJob: false,
'currentSubJob._id': false, 'currentSubJob._id': false,
alerts: false, alerts: false
queue: false
}} }}
/> />
) )
@ -81,10 +80,7 @@ const NewPrinter = ({ onOk, defaultValues }) => {
'currentJob._id': false, 'currentJob._id': false,
currentSubJob: false, currentSubJob: false,
'currentSubJob._id': false, 'currentSubJob._id': false,
alerts: false, alerts: false
pendingSlicerUploads: false,
online: false,
queue: false
}} }}
isEditing={false} isEditing={false}
objectData={objectData} objectData={objectData}

View File

@ -171,8 +171,7 @@ const PrinterInfo = () => {
'currentJob._id': false, 'currentJob._id': false,
currentSubJob: false, currentSubJob: false,
'currentSubJob._id': false, 'currentSubJob._id': false,
alerts: false, alerts: false
pendingSlicerUploads: false
}} }}
/> />
)} )}

View File

@ -67,22 +67,14 @@ const FileList = ({
<Flex <Flex
vertical vertical
gap='10px' gap='10px'
style={{ style={{ maxWidth: '100%', minWidth: 0, width: card ? '100%' : 'fit-content' }}
maxWidth: '100%',
minWidth: 0,
width: card ? '100%' : 'fit-content'
}}
> >
<Flex <Flex
justify={card ? 'space-between' : 'start'} justify={card ? 'space-between' : 'start'}
align='center' align='center'
gap='small' gap='small'
wrap={false} wrap={false}
style={{ style={{ maxWidth: '100%', minWidth: 0, width: card ? '100%' : 'fit-content' }}
maxWidth: '100%',
minWidth: 0,
width: card ? '100%' : 'fit-content'
}}
> >
<Flex <Flex
gap={'small'} gap={'small'}

View File

@ -35,8 +35,7 @@ const FileUpload = ({
multiple = true, multiple = true,
defaultPreviewOpen = false, defaultPreviewOpen = false,
showPreview = true, showPreview = true,
showInfo, showInfo
masterFilter = []
}) => { }) => {
const { uploadFile } = useContext(ApiServerContext) const { uploadFile } = useContext(ApiServerContext)
const [uploading, setUploading] = useState(false) const [uploading, setUploading] = useState(false)
@ -139,17 +138,11 @@ const FileUpload = ({
<Flex gap={'small'} vertical> <Flex gap={'small'} vertical>
{hasNoItems && uploading == false ? ( {hasNoItems && uploading == false ? (
<Flex gap={'small'} align='center' wrap> <Flex gap={'small'} align='center' wrap>
<Space.Compact style={{ flexGrow: 1, minWidth: 0 }}> <Space.Compact style={{ flexGrow: 1 }}>
<ObjectSelect <ObjectSelect
type={'file'} type={'file'}
value={selectedFile} value={selectedFile}
onChange={setSelectedFile} onChange={setSelectedFile}
style={{ width: '100%', minWidth: 0 }}
masterFilter={
masterFilter.length > 0
? { extension: { $in: masterFilter } }
: {}
}
/> />
<Button <Button
icon={<PlusIcon />} icon={<PlusIcon />}
@ -164,9 +157,6 @@ const FileUpload = ({
beforeUpload={handleFileUpload} beforeUpload={handleFileUpload}
showUploadList={false} showUploadList={false}
multiple={multiple} multiple={multiple}
accept={
masterFilter.length > 0 ? masterFilter.join(',') : undefined
}
> >
<Button style={{ width: '100%' }} icon={<UploadIcon />}> <Button style={{ width: '100%' }} icon={<UploadIcon />}>
Upload Upload
@ -219,8 +209,7 @@ FileUpload.propTypes = {
showPreview: PropTypes.bool, showPreview: PropTypes.bool,
showInfo: PropTypes.bool, showInfo: PropTypes.bool,
defaultPreviewOpen: PropTypes.bool, defaultPreviewOpen: PropTypes.bool,
minimal: PropTypes.bool, minimal: PropTypes.bool
masterFilter: PropTypes.array
} }
export default FileUpload export default FileUpload

View File

@ -621,7 +621,6 @@ const ObjectProperty = ({
showPreview={showPreview} showPreview={showPreview}
showInfo={showHyperlink} showInfo={showHyperlink}
showDownload={showDownload} showDownload={showDownload}
masterFilter={masterFilter}
/> />
) )
} }
@ -636,7 +635,6 @@ const ObjectProperty = ({
defaultPreviewOpen={previewOpen} defaultPreviewOpen={previewOpen}
showPreview={showPreview} showPreview={showPreview}
showInfo={showHyperlink} showInfo={showHyperlink}
masterFilter={masterFilter}
/> />
) )
} }
@ -949,7 +947,6 @@ const ObjectProperty = ({
defaultPreviewOpen={previewOpen} defaultPreviewOpen={previewOpen}
showPreview={showPreview} showPreview={showPreview}
showInfo={showHyperlink} showInfo={showHyperlink}
masterFilter={masterFilter}
{...inputProps} {...inputProps}
/> />
) )
@ -961,7 +958,6 @@ const ObjectProperty = ({
defaultPreviewOpen={previewOpen} defaultPreviewOpen={previewOpen}
showPreview={showPreview} showPreview={showPreview}
showInfo={showHyperlink} showInfo={showHyperlink}
masterFilter={masterFilter}
{...inputProps} {...inputProps}
/> />
) )

View File

@ -46,7 +46,6 @@ const ObjectSelect = ({
value, value,
onChange, onChange,
disabled = false, disabled = false,
style = {},
...rest ...rest
}) => { }) => {
const { fetchObjectsByProperty, fetchObject, connected, searchObjects } = const { fetchObjectsByProperty, fetchObject, connected, searchObjects } =
@ -720,7 +719,7 @@ const ObjectSelect = ({
// --- Main TreeSelect UI --- // --- Main TreeSelect UI ---
return ( return (
<div style={style}> <div>
<TreeSelect <TreeSelect
key={treeVersion} key={treeVersion}
treeDataSimpleMode={false} treeDataSimpleMode={false}
@ -774,8 +773,7 @@ ObjectSelect.propTypes = {
multiple: PropTypes.bool, multiple: PropTypes.bool,
treeSelectProps: PropTypes.object, treeSelectProps: PropTypes.object,
type: PropTypes.string.isRequired, type: PropTypes.string.isRequired,
disabled: PropTypes.bool, disabled: PropTypes.bool
style: PropTypes.object
} }
export default ObjectSelect export default ObjectSelect

View File

@ -161,7 +161,7 @@ export const GCodeFile = {
required: true, required: true,
showPreview: false, showPreview: false,
showHyperlink: true, showHyperlink: true,
masterFilter: ['.gcode', '.g'], filter: ['.gcode', '.g'],
columnWidth: 200 columnWidth: 200
}, },
{ {

View File

@ -406,36 +406,6 @@ export const Printer = {
required: false, required: false,
readOnly: true, readOnly: true,
columnWidth: 200 columnWidth: 200
},
{
name: 'pendingSlicerUploads',
type: 'objectChildren',
label: 'Pending Slicer Uploads',
properties: [
{
name: 'file',
label: 'File',
type: 'object',
objectType: 'file',
required: true,
showHyperlink: true
},
{
name: 'shouldPrint',
label: 'Should Print',
type: 'bool',
required: true,
columnWidth: 125
},
{
name: 'job',
label: 'Job',
type: 'object',
objectType: 'job',
required: false,
showHyperlink: true
}
]
} }
], ],
stats: [ stats: [

View File

@ -116,8 +116,7 @@ export const User = {
fileType: 'image', fileType: 'image',
previewOpen: true, previewOpen: true,
showPreview: false, showPreview: false,
columnWidth: 150, columnWidth: 150
masterFilter: ['.png', '.jpg', '.jpeg']
} }
] ]
} }