From 4aeac5d263ee0f649733e6ba24133c31ef379735 Mon Sep 17 00:00:00 2001
From: Zoltan Runyo <zoltan.runyo@ess.eu>
Date: Fri, 3 Feb 2023 15:01:40 +0100
Subject: [PATCH] Fix job status handling
---
src/api/DataTypes.js | 2 +-
src/views/jobs/JobDetailsContainer.js | 4 +---
src/views/jobs/JobListView.js | 2 --
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/api/DataTypes.js b/src/api/DataTypes.js
index 9cea6592..a1930675 100644
--- a/src/api/DataTypes.js
+++ b/src/api/DataTypes.js
@@ -53,7 +53,7 @@ export class AWXJobDetails {
message() {
const stem = `The ${this.typeLabel()} `;
- const info = jobMessages[this.job?.status.toLowerCase()];
+ const info = jobMessages[this.job ? this.job.status.toLowerCase() : "new"];
const message = stem + info;
return message;
}
diff --git a/src/views/jobs/JobDetailsContainer.js b/src/views/jobs/JobDetailsContainer.js
index 3d9bce94..acafce27 100644
--- a/src/views/jobs/JobDetailsContainer.js
+++ b/src/views/jobs/JobDetailsContainer.js
@@ -3,7 +3,6 @@ import { JobDetailsView } from "./JobDetailsView";
import { LinearProgress } from "@material-ui/core";
import { useOperation, useJobById } from "../../api/SwaggerApi";
import { useSafePolling } from "../../hooks/Polling";
-import { AWXJobDetails } from "../../api/DataTypes";
import NotFound from "../../components/navigation/NotFound";
import { onFetchEntityError } from "../../components/common/Helper";
@@ -18,8 +17,7 @@ export function JobDetailsContainer({ id }) {
const [job, getJobById, , /* reset*/ jobLoading] = useJobById();
const firstTime = useRef(true);
- const awxJob = new AWXJobDetails(job);
- const jobFinished = awxJob.isFinished();
+ const jobFinished = job?.finished;
const getOperationUntilFinished = useCallback(() => {
if (!jobFinished) {
diff --git a/src/views/jobs/JobListView.js b/src/views/jobs/JobListView.js
index a0ad1460..5cfdb5f4 100644
--- a/src/views/jobs/JobListView.js
+++ b/src/views/jobs/JobListView.js
@@ -54,8 +54,6 @@ export function JobListView() {
const [deploymentStatus, setDeploymentStatus] = useState(null);
const [jobList, setJobList] = useState([]);
- console.log("JobListView:", operations, jobList);
-
const handleTabChange = (event, tab) => {
setState((s) =>
serialize(s.tab) === serialize(tab)
--
GitLab