DAC-315 Resolved bug in Certifying progress timeline

input-output-hk · Oct 27, 2022 · 774bb89 · 774bb89
1 parent fa0a1c4
commit 774bb89
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 40 deletions.
diff --git a/react-web/public/static/data/certifying.json b/react-web/public/static/data/certifying.json
@@ -1,30 +1,4 @@
 {
   "status": "certifying",
-  "state": "running",
-  "progress": {
-    "current-task": { "name": "double-satisfaction", "index": 2 },
-    "qc-progress": { "successes": 3, "failures": 1, "discarded": 0 },
-    "finished-tasks": [
-      {
-        "task": { "name": "standard-property", "index": 1 },
-        "qc-result": { "successes": 7, "failures": 2, "discarded": 0 },
-        "succeeded": false
-      },
-      {
-        "task": { "name": "unit-tests", "index": 0 },
-        "qc-result": { "successes": 0, "failures": 0, "discarded": 0 },
-        "succeeded": true
-      }
-    ],
-    "progress-index": 18
-  },
-  "plan": [
-    { "name": "unit-tests", "index": 0 },
-    { "name": "standard-property", "index": 1 },
-    { "name": "double-satisfaction", "index": 2 },
-    { "name": "no-locked-funds", "index": 3 },
-    { "name": "crash-tolerance", "index": 5 },
-    { "name": "white-list", "index": 6 },
-    { "name": "dl-tests", "index": 7 }
-  ]
+  "state": "running"
 }
diff --git a/react-web/src/components/TimelineItem/TimelineItem.tsx b/react-web/src/components/TimelineItem/TimelineItem.tsx
@@ -1,6 +1,5 @@
 import React, { FC } from "react";
 import classNames from "classnames";
-// TBD -  import PassedImg from 'assets/images/passed.svg' - while moving to assets instead of public
 
 export interface ITimelineItem {
   config: {
@@ -26,10 +25,15 @@ const TimelineItem: FC<ITimelineItem> = ({
     } else if (!unitTestSuccess && (status === "finished" || status === 'certifying')) {
       state = 'failed'
     }
-    // TBD - return PassedImg
     return "images/" + state + ".svg";
   };
 
+  const renderProgressPercentage = () => {
+    if (state === "running" && status === "certifying") {
+      return <span className="progress-percentage">{progress}%</span>
+    }
+  };
+
   return (
     <li
       data-value={status}
@@ -49,11 +53,7 @@ const TimelineItem: FC<ITimelineItem> = ({
         src={getURLFor(state)}
         alt={state}
       />
-      {
-        (state === 'running' && status === 'certifying') ?
-        <span className="progress-percentage">{progress}%</span>
-        : null
-      }
+      {renderProgressPercentage()}
       <span className="text" data-testid={text}>
         {text}
       </span>

diff --git a/react-web/src/pages/certification/Certification.tsx b/react-web/src/pages/certification/Certification.tsx
@@ -92,15 +92,17 @@ const Certification = () => {
                     let returnObj = { ...item, state: currentState };
                     if (
                       status === "certifying" &&
-                      currentState === "running" &&
-                      res.data.progress &&
-                      res.data.plan
+                      currentState === "running"
                     ) {
+                      if (res.data.progress && res.data.plan) {
                       returnObj["progress"] = Math.trunc(
                         (res.data.progress["finished-tasks"].length /
                           getPlannedCertificationTaskCount(res.data.plan)) *
                           100
                       );
+                      } else {
+                        returnObj["progress"] = 0
+                      }
                     }
                     return returnObj;
                   }
@@ -152,7 +154,7 @@ const Certification = () => {
         .then((response) => response.data)
         .then((uuid) => {
           // await fetchData.get("/run/" + uid)
-          fetchData.get("static/data/finished-escrow-UTFail.json").then((res) => {
+          fetchData.get("static/data/certifying.json").then((res) => {
 
             const status = res.data.status,
               state = res.data.hasOwnProperty("state") ? res.data.state : "";
@@ -161,8 +163,19 @@ const Certification = () => {
               if (item.status === status) {
                 const currentState = status === "finished" ? "passed" : (state || "running")
                 let returnObj = { ...item, state: currentState };
-                if (status === 'certifying' && currentState === 'running' && res.data.progress && res.data.plan) {
-                  returnObj['progress'] = Math.trunc((res.data.progress['finished-tasks'].length / getPlannedCertificationTaskCount(res.data.plan)) * 100)
+                if (
+                  status === "certifying" &&
+                  currentState === "running"
+                ) {
+                  if (res.data.progress && res.data.plan) {
+                    returnObj["progress"] = Math.trunc(
+                      (res.data.progress["finished-tasks"].length /
+                        getPlannedCertificationTaskCount(res.data.plan)) *
+                        100
+                    );
+                  } else {
+                    returnObj["progress"] = 0
+                  }
                 }
                 return returnObj;
               } else {