diff --git a/frontend/src/js/component/wb-process-state.js b/frontend/src/js/component/wb-process-state.js index b334ae1..3aab5a4 100644 --- a/frontend/src/js/component/wb-process-state.js +++ b/frontend/src/js/component/wb-process-state.js @@ -1,5 +1,6 @@ import { h, Component } from 'preact'; import makeArvadosRequest from 'make-arvados-request'; +import wbProcessStateName from 'wb-process-state-name'; class WBProcessState extends Component { componentDidMount() { @@ -37,14 +38,13 @@ class WBProcessState extends Component { return (
- { process.state } + { wbProcessStateName(process, container) } { apiError ? { [ ' / ', apiError ] } : null } - { container ? [ " / ", container.state ] : null } - { !(error || warning) && container && container.state === 'Complete' ? " / Success" : null } { error ? [" / ", E ] : null } { warning ? [ " / ", W ] : null } { lazy && !container && !apiError ? ( + title={ warning }>W ] : null } {} + { lazy && !container && !apiError ? ( { e.preventDefault(); this.fetchData(); } }> diff --git a/frontend/src/js/misc/wb-process-state-name.js b/frontend/src/js/misc/wb-process-state-name.js index 876d529..2ecf5a3 100644 --- a/frontend/src/js/misc/wb-process-state-name.js +++ b/frontend/src/js/misc/wb-process-state-name.js @@ -1,9 +1,11 @@ function wbProcessStateName(containerRequest, container) { const cr = containerRequest; const c = container; + if (!c) + return cr.state; if (cr.state !== 'Uncommitted' && cr.priority === 0) return 'Cancelled'; - if (cr.state === 'Uncommitted' || !c || c.state === 'Queued' || c.state === 'Locked') + if (cr.state === 'Uncommitted' || !cr.container_uuid || c.state === 'Queued' || c.state === 'Locked') return 'Pending'; if (c.state === 'Running') return 'Running';