0.12.0-13 Job Log fix
This commit is contained in:
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster-backend",
|
"name": "ripster-backend",
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ripster-backend",
|
"name": "ripster-backend",
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"archiver": "^7.0.1",
|
"archiver": "^7.0.1",
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster-backend",
|
"name": "ripster-backend",
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "commonjs",
|
"type": "commonjs",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster-frontend",
|
"name": "ripster-frontend",
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ripster-frontend",
|
"name": "ripster-frontend",
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"primeicons": "^7.0.0",
|
"primeicons": "^7.0.0",
|
||||||
"primereact": "^10.9.2",
|
"primereact": "^10.9.2",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster-frontend",
|
"name": "ripster-frontend",
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -960,19 +960,15 @@ export default function DashboardPage({
|
|||||||
const state = String(pipeline?.state || 'IDLE').trim().toUpperCase();
|
const state = String(pipeline?.state || 'IDLE').trim().toUpperCase();
|
||||||
const currentPipelineJobId = normalizeJobId(pipeline?.activeJobId || pipeline?.context?.jobId);
|
const currentPipelineJobId = normalizeJobId(pipeline?.activeJobId || pipeline?.context?.jobId);
|
||||||
const isProcessing = processingStates.includes(state);
|
const isProcessing = processingStates.includes(state);
|
||||||
// When the pipeline transitions to METADATA_SELECTION for a new job while another job
|
// Always prefer the ENCODING job from dashboardJobs for the live log.
|
||||||
// is still encoding in the background, isProcessing becomes false and the log clears.
|
// When a second job enters ANALYZING, isProcessing becomes true (ANALYZING is a processingState)
|
||||||
// Track the background encoding job so its live log keeps polling.
|
// and currentPipelineJobId switches to job2 — but job1 is still ENCODING and its log must stay visible.
|
||||||
const backgroundProcessingJobId = useMemo(() => {
|
const encodingJobId = useMemo(() => {
|
||||||
if (isProcessing) return null;
|
const bg = dashboardJobs.find((job) => normalizeStatus(job?.status) === 'ENCODING');
|
||||||
const bg = dashboardJobs.find((job) => {
|
|
||||||
const s = normalizeStatus(job?.status);
|
|
||||||
return processingStates.includes(s);
|
|
||||||
});
|
|
||||||
return bg ? normalizeJobId(bg.id) : null;
|
return bg ? normalizeJobId(bg.id) : null;
|
||||||
}, [isProcessing, dashboardJobs]);
|
}, [dashboardJobs]);
|
||||||
const liveLogJobId = backgroundProcessingJobId || currentPipelineJobId;
|
const liveLogJobId = encodingJobId || currentPipelineJobId;
|
||||||
const liveLogActive = isProcessing || Boolean(backgroundProcessingJobId);
|
const liveLogActive = isProcessing || Boolean(encodingJobId);
|
||||||
const monitoringState = useMemo(
|
const monitoringState = useMemo(
|
||||||
() => normalizeHardwareMonitoringPayload(hardwareMonitoring),
|
() => normalizeHardwareMonitoringPayload(hardwareMonitoring),
|
||||||
[hardwareMonitoring]
|
[hardwareMonitoring]
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster",
|
"name": "ripster",
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ripster",
|
"name": "ripster",
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"concurrently": "^9.1.2"
|
"concurrently": "^9.1.2"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "ripster",
|
"name": "ripster",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.12.0-12",
|
"version": "0.12.0-13",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "concurrently \"npm run dev --prefix backend\" \"npm run dev --prefix frontend\"",
|
"dev": "concurrently \"npm run dev --prefix backend\" \"npm run dev --prefix frontend\"",
|
||||||
"dev:backend": "npm run dev --prefix backend",
|
"dev:backend": "npm run dev --prefix backend",
|
||||||
|
|||||||
Reference in New Issue
Block a user