Compare commits
3 Commits
80ecc8a175
...
a6fce60d04
| Author | SHA1 | Date | |
|---|---|---|---|
| a6fce60d04 | |||
| 70456d945d | |||
| c201d26744 |
@ -341,6 +341,7 @@ const ControlPrinter = ({ slicerIntegration = false }) => {
|
||||
createdAt: false,
|
||||
updatedAt: false,
|
||||
state: !slicerIntegration,
|
||||
pendingSlicerUploads: false,
|
||||
name: !slicerIntegration
|
||||
}}
|
||||
objectPropertyProps={{
|
||||
|
||||
@ -53,7 +53,8 @@ const NewPrinter = ({ onOk, defaultValues }) => {
|
||||
'currentJob._id': false,
|
||||
currentSubJob: false,
|
||||
'currentSubJob._id': false,
|
||||
alerts: false
|
||||
alerts: false,
|
||||
queue: false
|
||||
}}
|
||||
/>
|
||||
)
|
||||
@ -80,7 +81,10 @@ const NewPrinter = ({ onOk, defaultValues }) => {
|
||||
'currentJob._id': false,
|
||||
currentSubJob: false,
|
||||
'currentSubJob._id': false,
|
||||
alerts: false
|
||||
alerts: false,
|
||||
pendingSlicerUploads: false,
|
||||
online: false,
|
||||
queue: false
|
||||
}}
|
||||
isEditing={false}
|
||||
objectData={objectData}
|
||||
|
||||
@ -171,7 +171,8 @@ const PrinterInfo = () => {
|
||||
'currentJob._id': false,
|
||||
currentSubJob: false,
|
||||
'currentSubJob._id': false,
|
||||
alerts: false
|
||||
alerts: false,
|
||||
pendingSlicerUploads: false
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
@ -67,14 +67,22 @@ const FileList = ({
|
||||
<Flex
|
||||
vertical
|
||||
gap='10px'
|
||||
style={{ maxWidth: '100%', minWidth: 0, width: card ? '100%' : 'fit-content' }}
|
||||
style={{
|
||||
maxWidth: '100%',
|
||||
minWidth: 0,
|
||||
width: card ? '100%' : 'fit-content'
|
||||
}}
|
||||
>
|
||||
<Flex
|
||||
justify={card ? 'space-between' : 'start'}
|
||||
align='center'
|
||||
gap='small'
|
||||
wrap={false}
|
||||
style={{ maxWidth: '100%', minWidth: 0, width: card ? '100%' : 'fit-content' }}
|
||||
style={{
|
||||
maxWidth: '100%',
|
||||
minWidth: 0,
|
||||
width: card ? '100%' : 'fit-content'
|
||||
}}
|
||||
>
|
||||
<Flex
|
||||
gap={'small'}
|
||||
|
||||
@ -35,7 +35,8 @@ const FileUpload = ({
|
||||
multiple = true,
|
||||
defaultPreviewOpen = false,
|
||||
showPreview = true,
|
||||
showInfo
|
||||
showInfo,
|
||||
masterFilter = []
|
||||
}) => {
|
||||
const { uploadFile } = useContext(ApiServerContext)
|
||||
const [uploading, setUploading] = useState(false)
|
||||
@ -138,11 +139,17 @@ const FileUpload = ({
|
||||
<Flex gap={'small'} vertical>
|
||||
{hasNoItems && uploading == false ? (
|
||||
<Flex gap={'small'} align='center' wrap>
|
||||
<Space.Compact style={{ flexGrow: 1 }}>
|
||||
<Space.Compact style={{ flexGrow: 1, minWidth: 0 }}>
|
||||
<ObjectSelect
|
||||
type={'file'}
|
||||
value={selectedFile}
|
||||
onChange={setSelectedFile}
|
||||
style={{ width: '100%', minWidth: 0 }}
|
||||
masterFilter={
|
||||
masterFilter.length > 0
|
||||
? { extension: { $in: masterFilter } }
|
||||
: {}
|
||||
}
|
||||
/>
|
||||
<Button
|
||||
icon={<PlusIcon />}
|
||||
@ -157,6 +164,9 @@ const FileUpload = ({
|
||||
beforeUpload={handleFileUpload}
|
||||
showUploadList={false}
|
||||
multiple={multiple}
|
||||
accept={
|
||||
masterFilter.length > 0 ? masterFilter.join(',') : undefined
|
||||
}
|
||||
>
|
||||
<Button style={{ width: '100%' }} icon={<UploadIcon />}>
|
||||
Upload
|
||||
@ -209,7 +219,8 @@ FileUpload.propTypes = {
|
||||
showPreview: PropTypes.bool,
|
||||
showInfo: PropTypes.bool,
|
||||
defaultPreviewOpen: PropTypes.bool,
|
||||
minimal: PropTypes.bool
|
||||
minimal: PropTypes.bool,
|
||||
masterFilter: PropTypes.array
|
||||
}
|
||||
|
||||
export default FileUpload
|
||||
|
||||
@ -621,6 +621,7 @@ const ObjectProperty = ({
|
||||
showPreview={showPreview}
|
||||
showInfo={showHyperlink}
|
||||
showDownload={showDownload}
|
||||
masterFilter={masterFilter}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@ -635,6 +636,7 @@ const ObjectProperty = ({
|
||||
defaultPreviewOpen={previewOpen}
|
||||
showPreview={showPreview}
|
||||
showInfo={showHyperlink}
|
||||
masterFilter={masterFilter}
|
||||
/>
|
||||
)
|
||||
}
|
||||
@ -947,6 +949,7 @@ const ObjectProperty = ({
|
||||
defaultPreviewOpen={previewOpen}
|
||||
showPreview={showPreview}
|
||||
showInfo={showHyperlink}
|
||||
masterFilter={masterFilter}
|
||||
{...inputProps}
|
||||
/>
|
||||
)
|
||||
@ -958,6 +961,7 @@ const ObjectProperty = ({
|
||||
defaultPreviewOpen={previewOpen}
|
||||
showPreview={showPreview}
|
||||
showInfo={showHyperlink}
|
||||
masterFilter={masterFilter}
|
||||
{...inputProps}
|
||||
/>
|
||||
)
|
||||
|
||||
@ -46,6 +46,7 @@ const ObjectSelect = ({
|
||||
value,
|
||||
onChange,
|
||||
disabled = false,
|
||||
style = {},
|
||||
...rest
|
||||
}) => {
|
||||
const { fetchObjectsByProperty, fetchObject, connected, searchObjects } =
|
||||
@ -719,7 +720,7 @@ const ObjectSelect = ({
|
||||
|
||||
// --- Main TreeSelect UI ---
|
||||
return (
|
||||
<div>
|
||||
<div style={style}>
|
||||
<TreeSelect
|
||||
key={treeVersion}
|
||||
treeDataSimpleMode={false}
|
||||
@ -773,7 +774,8 @@ ObjectSelect.propTypes = {
|
||||
multiple: PropTypes.bool,
|
||||
treeSelectProps: PropTypes.object,
|
||||
type: PropTypes.string.isRequired,
|
||||
disabled: PropTypes.bool
|
||||
disabled: PropTypes.bool,
|
||||
style: PropTypes.object
|
||||
}
|
||||
|
||||
export default ObjectSelect
|
||||
|
||||
@ -161,7 +161,7 @@ export const GCodeFile = {
|
||||
required: true,
|
||||
showPreview: false,
|
||||
showHyperlink: true,
|
||||
filter: ['.gcode', '.g'],
|
||||
masterFilter: ['.gcode', '.g'],
|
||||
columnWidth: 200
|
||||
},
|
||||
{
|
||||
|
||||
@ -406,6 +406,36 @@ export const Printer = {
|
||||
required: false,
|
||||
readOnly: true,
|
||||
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: [
|
||||
|
||||
@ -116,7 +116,8 @@ export const User = {
|
||||
fileType: 'image',
|
||||
previewOpen: true,
|
||||
showPreview: false,
|
||||
columnWidth: 150
|
||||
columnWidth: 150,
|
||||
masterFilter: ['.png', '.jpg', '.jpeg']
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user