Compare commits
3 Commits
80ecc8a175
...
a6fce60d04
| Author | SHA1 | Date | |
|---|---|---|---|
| a6fce60d04 | |||
| 70456d945d | |||
| c201d26744 |
@ -341,6 +341,7 @@ const ControlPrinter = ({ slicerIntegration = false }) => {
|
|||||||
createdAt: false,
|
createdAt: false,
|
||||||
updatedAt: false,
|
updatedAt: false,
|
||||||
state: !slicerIntegration,
|
state: !slicerIntegration,
|
||||||
|
pendingSlicerUploads: false,
|
||||||
name: !slicerIntegration
|
name: !slicerIntegration
|
||||||
}}
|
}}
|
||||||
objectPropertyProps={{
|
objectPropertyProps={{
|
||||||
|
|||||||
@ -53,7 +53,8 @@ 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
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
@ -80,7 +81,10 @@ 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}
|
||||||
|
|||||||
@ -171,7 +171,8 @@ const PrinterInfo = () => {
|
|||||||
'currentJob._id': false,
|
'currentJob._id': false,
|
||||||
currentSubJob: false,
|
currentSubJob: false,
|
||||||
'currentSubJob._id': false,
|
'currentSubJob._id': false,
|
||||||
alerts: false
|
alerts: false,
|
||||||
|
pendingSlicerUploads: false
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@ -67,14 +67,22 @@ const FileList = ({
|
|||||||
<Flex
|
<Flex
|
||||||
vertical
|
vertical
|
||||||
gap='10px'
|
gap='10px'
|
||||||
style={{ maxWidth: '100%', minWidth: 0, width: card ? '100%' : 'fit-content' }}
|
style={{
|
||||||
|
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={{ maxWidth: '100%', minWidth: 0, width: card ? '100%' : 'fit-content' }}
|
style={{
|
||||||
|
maxWidth: '100%',
|
||||||
|
minWidth: 0,
|
||||||
|
width: card ? '100%' : 'fit-content'
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Flex
|
<Flex
|
||||||
gap={'small'}
|
gap={'small'}
|
||||||
|
|||||||
@ -35,7 +35,8 @@ 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)
|
||||||
@ -138,11 +139,17 @@ 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 }}>
|
<Space.Compact style={{ flexGrow: 1, minWidth: 0 }}>
|
||||||
<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 />}
|
||||||
@ -157,6 +164,9 @@ 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
|
||||||
@ -209,7 +219,8 @@ 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
|
||||||
|
|||||||
@ -621,6 +621,7 @@ const ObjectProperty = ({
|
|||||||
showPreview={showPreview}
|
showPreview={showPreview}
|
||||||
showInfo={showHyperlink}
|
showInfo={showHyperlink}
|
||||||
showDownload={showDownload}
|
showDownload={showDownload}
|
||||||
|
masterFilter={masterFilter}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -635,6 +636,7 @@ const ObjectProperty = ({
|
|||||||
defaultPreviewOpen={previewOpen}
|
defaultPreviewOpen={previewOpen}
|
||||||
showPreview={showPreview}
|
showPreview={showPreview}
|
||||||
showInfo={showHyperlink}
|
showInfo={showHyperlink}
|
||||||
|
masterFilter={masterFilter}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -947,6 +949,7 @@ const ObjectProperty = ({
|
|||||||
defaultPreviewOpen={previewOpen}
|
defaultPreviewOpen={previewOpen}
|
||||||
showPreview={showPreview}
|
showPreview={showPreview}
|
||||||
showInfo={showHyperlink}
|
showInfo={showHyperlink}
|
||||||
|
masterFilter={masterFilter}
|
||||||
{...inputProps}
|
{...inputProps}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
@ -958,6 +961,7 @@ const ObjectProperty = ({
|
|||||||
defaultPreviewOpen={previewOpen}
|
defaultPreviewOpen={previewOpen}
|
||||||
showPreview={showPreview}
|
showPreview={showPreview}
|
||||||
showInfo={showHyperlink}
|
showInfo={showHyperlink}
|
||||||
|
masterFilter={masterFilter}
|
||||||
{...inputProps}
|
{...inputProps}
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -46,6 +46,7 @@ const ObjectSelect = ({
|
|||||||
value,
|
value,
|
||||||
onChange,
|
onChange,
|
||||||
disabled = false,
|
disabled = false,
|
||||||
|
style = {},
|
||||||
...rest
|
...rest
|
||||||
}) => {
|
}) => {
|
||||||
const { fetchObjectsByProperty, fetchObject, connected, searchObjects } =
|
const { fetchObjectsByProperty, fetchObject, connected, searchObjects } =
|
||||||
@ -719,7 +720,7 @@ const ObjectSelect = ({
|
|||||||
|
|
||||||
// --- Main TreeSelect UI ---
|
// --- Main TreeSelect UI ---
|
||||||
return (
|
return (
|
||||||
<div>
|
<div style={style}>
|
||||||
<TreeSelect
|
<TreeSelect
|
||||||
key={treeVersion}
|
key={treeVersion}
|
||||||
treeDataSimpleMode={false}
|
treeDataSimpleMode={false}
|
||||||
@ -773,7 +774,8 @@ 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
|
||||||
|
|||||||
@ -161,7 +161,7 @@ export const GCodeFile = {
|
|||||||
required: true,
|
required: true,
|
||||||
showPreview: false,
|
showPreview: false,
|
||||||
showHyperlink: true,
|
showHyperlink: true,
|
||||||
filter: ['.gcode', '.g'],
|
masterFilter: ['.gcode', '.g'],
|
||||||
columnWidth: 200
|
columnWidth: 200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -406,6 +406,36 @@ 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: [
|
||||||
|
|||||||
@ -116,7 +116,8 @@ export const User = {
|
|||||||
fileType: 'image',
|
fileType: 'image',
|
||||||
previewOpen: true,
|
previewOpen: true,
|
||||||
showPreview: false,
|
showPreview: false,
|
||||||
columnWidth: 150
|
columnWidth: 150,
|
||||||
|
masterFilter: ['.png', '.jpg', '.jpeg']
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user