Enhance NewDocumentJob Component with Job Update Handling and Progress Display
Some checks reported errors
farmcontrol/farmcontrol-ui/pipeline/head Something is wrong with the build of this commit
Some checks reported errors
farmcontrol/farmcontrol-ui/pipeline/head Something is wrong with the build of this commit
- Integrated ProgressDisplay component to manage job deployment progress within the NewDocumentJob component. - Added subscription to object updates for real-time job status tracking, improving user feedback during document processing. - Refactored state management to handle job updates and deployment actions more effectively, enhancing overall functionality and user experience.
This commit is contained in:
parent
8035c2ba59
commit
7833b1dbce
@ -3,14 +3,72 @@ import ObjectInfo from '../../common/ObjectInfo'
|
|||||||
import NewObjectForm from '../../common/NewObjectForm'
|
import NewObjectForm from '../../common/NewObjectForm'
|
||||||
import WizardView from '../../common/WizardView'
|
import WizardView from '../../common/WizardView'
|
||||||
import TemplatePreview from '../../common/TemplatePreview'
|
import TemplatePreview from '../../common/TemplatePreview'
|
||||||
|
import ProgressDisplay from '../../common/ProgressDisplay'
|
||||||
import { ApiServerContext } from '../../context/ApiServerContext'
|
import { ApiServerContext } from '../../context/ApiServerContext'
|
||||||
import { useContext, useRef, useState } from 'react'
|
import { useCallback, useContext, useEffect, useRef, useState } from 'react'
|
||||||
|
import { Modal } from 'antd'
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
|
|
||||||
const NewDocumentJob = ({ onOk, defaultValues = {} }) => {
|
const NewDocumentJob = ({ onOk, defaultValues = {} }) => {
|
||||||
const { sendObjectAction, downloadTemplate, formatFileName } =
|
const {
|
||||||
useContext(ApiServerContext)
|
sendObjectAction,
|
||||||
|
downloadTemplate,
|
||||||
|
formatFileName,
|
||||||
|
subscribeToObjectUpdates,
|
||||||
|
connected
|
||||||
|
} = useContext(ApiServerContext)
|
||||||
const [downloading, setDownloading] = useState(false)
|
const [downloading, setDownloading] = useState(false)
|
||||||
|
const [deployingJob, setDeployingJob] = useState(null)
|
||||||
|
const onOkRef = useRef(onOk)
|
||||||
|
const pendingJobRef = useRef(null)
|
||||||
|
const deploySentRef = useRef(false)
|
||||||
|
const sendObjectActionRef = useRef(sendObjectAction)
|
||||||
|
|
||||||
|
onOkRef.current = onOk
|
||||||
|
sendObjectActionRef.current = sendObjectAction
|
||||||
|
|
||||||
|
const deployingJobId = deployingJob?._id
|
||||||
|
? String(deployingJob._id).toLowerCase()
|
||||||
|
: null
|
||||||
|
|
||||||
|
const handleJobUpdate = useCallback((updatedJob) => {
|
||||||
|
setDeployingJob((prev) => (prev ? { ...prev, ...updatedJob } : updatedJob))
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!deployingJobId || connected != true) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const unsubscribe = subscribeToObjectUpdates(
|
||||||
|
deployingJobId,
|
||||||
|
'documentJob',
|
||||||
|
handleJobUpdate
|
||||||
|
)
|
||||||
|
|
||||||
|
if (!deploySentRef.current && pendingJobRef.current) {
|
||||||
|
deploySentRef.current = true
|
||||||
|
sendObjectActionRef.current(
|
||||||
|
pendingJobRef.current.documentPrinter._id,
|
||||||
|
'documentPrinter',
|
||||||
|
{
|
||||||
|
type: 'deploy',
|
||||||
|
data: pendingJobRef.current
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
if (unsubscribe) unsubscribe()
|
||||||
|
}
|
||||||
|
}, [deployingJobId, connected, subscribeToObjectUpdates, handleJobUpdate])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const stateType = deployingJob?.state?.type
|
||||||
|
if (stateType === 'queued' || stateType === 'error') {
|
||||||
|
onOkRef.current?.()
|
||||||
|
}
|
||||||
|
}, [deployingJob?.state?.type])
|
||||||
|
|
||||||
// Capture initial default values so later prop changes don't re-initialize the form
|
// Capture initial default values so later prop changes don't re-initialize the form
|
||||||
const defaultValuesRef = useRef({
|
const defaultValuesRef = useRef({
|
||||||
@ -20,6 +78,7 @@ const NewDocumentJob = ({ onOk, defaultValues = {} }) => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<>
|
||||||
<NewObjectForm
|
<NewObjectForm
|
||||||
type={'documentJob'}
|
type={'documentJob'}
|
||||||
defaultValues={defaultValuesRef.current}
|
defaultValues={defaultValuesRef.current}
|
||||||
@ -72,19 +131,16 @@ const NewDocumentJob = ({ onOk, defaultValues = {} }) => {
|
|||||||
}
|
}
|
||||||
onSubmit={async () => {
|
onSubmit={async () => {
|
||||||
const newDocumentJob = await handleSubmit()
|
const newDocumentJob = await handleSubmit()
|
||||||
if (newDocumentJob) {
|
if (!newDocumentJob?._id) {
|
||||||
await sendObjectAction(
|
return
|
||||||
newDocumentJob.documentPrinter._id,
|
|
||||||
'documentPrinter',
|
|
||||||
{
|
|
||||||
type: 'deploy',
|
|
||||||
data: newDocumentJob
|
|
||||||
}
|
|
||||||
)
|
|
||||||
if (onOk) {
|
|
||||||
onOk()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pendingJobRef.current = newDocumentJob
|
||||||
|
deploySentRef.current = false
|
||||||
|
setDeployingJob({
|
||||||
|
...newDocumentJob,
|
||||||
|
state: { type: 'deploying', progress: 0 }
|
||||||
|
})
|
||||||
}}
|
}}
|
||||||
actions={[
|
actions={[
|
||||||
{
|
{
|
||||||
@ -168,6 +224,29 @@ const NewDocumentJob = ({ onOk, defaultValues = {} }) => {
|
|||||||
)
|
)
|
||||||
}}
|
}}
|
||||||
</NewObjectForm>
|
</NewObjectForm>
|
||||||
|
<Modal
|
||||||
|
open={Boolean(deployingJob)}
|
||||||
|
footer={null}
|
||||||
|
closable={false}
|
||||||
|
maskClosable={false}
|
||||||
|
centered
|
||||||
|
destroyOnHidden={true}
|
||||||
|
zIndex={2000}
|
||||||
|
width={320}
|
||||||
|
getContainer={() => document.body}
|
||||||
|
>
|
||||||
|
<ProgressDisplay
|
||||||
|
percent={Math.round(
|
||||||
|
(Number(deployingJob?.state?.progress) || 0) * 100
|
||||||
|
)}
|
||||||
|
status={
|
||||||
|
deployingJob?.state?.type === 'error' ? 'exception' : 'active'
|
||||||
|
}
|
||||||
|
>
|
||||||
|
Please wait...
|
||||||
|
</ProgressDisplay>
|
||||||
|
</Modal>
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user