Refactor PrinterJobsTree component to enhance state display

- Replaced JobState and SubJobState components with a unified StateDisplay component for improved consistency in state representation.
- Updated the rendering logic to utilize StateDisplay for both job and sub-job states, enhancing code clarity and maintainability.
This commit is contained in:
Tom Butcher 2025-08-18 01:03:44 +01:00
parent 9a406bb7df
commit 11c76a0725

View File

@ -3,15 +3,14 @@ import { Card, Tree, Spin, Space, Button, message } from 'antd'
import { LoadingOutlined } from '@ant-design/icons' import { LoadingOutlined } from '@ant-design/icons'
import React, { useState, useEffect, useContext } from 'react' import React, { useState, useEffect, useContext } from 'react'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import SubJobState from './SubJobState'
import { PrintServerContext } from '../context/PrintServerContext' import { PrintServerContext } from '../context/PrintServerContext'
import axios from 'axios' import axios from 'axios'
import JobState from './JobState'
import JobIcon from '../../Icons/JobIcon' import JobIcon from '../../Icons/JobIcon'
import SubJobIcon from '../../Icons/SubJobIcon' import SubJobIcon from '../../Icons/SubJobIcon'
import ReloadIcon from '../../Icons/ReloadIcon' import ReloadIcon from '../../Icons/ReloadIcon'
import config from '../../../config' import config from '../../../config'
import StateDisplay from './StateDisplay'
const PrinterJobsTree = ({ const PrinterJobsTree = ({
subJobs: initialSubJobs, subJobs: initialSubJobs,
@ -62,7 +61,7 @@ const PrinterJobsTree = ({
<Space size={5}> <Space size={5}>
<JobIcon /> <JobIcon />
{'Job'} {'Job'}
<JobState state={job?.state} /> <StateDisplay state={job?.state} />
</Space> </Space>
), ),
key: `job-${job._id}`, key: `job-${job._id}`,
@ -71,8 +70,8 @@ const PrinterJobsTree = ({
<Space> <Space>
<SubJobIcon /> <SubJobIcon />
{'Sub Job'} {'Sub Job'}
<SubJobState <StateDisplay
subJob={subJob} state={subJob?.state}
showProgress={false} showProgress={false}
showControls={false} showControls={false}
/> />