Merge pull request #55 from jtomasek/writing-image-step-fix

Fix Writing image progress step
openshift-assisted · Jun 30, 2020 · e9c684a · e9c684a
2 parents 4e59910 + fb4b7a5
commit e9c684a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/components/clusterDetail/ClusterProgress.tsx b/src/components/clusterDetail/ClusterProgress.tsx
@@ -3,6 +3,7 @@ import { Cluster, Host } from '../../api/types';
 import { Progress, ProgressVariant, ProgressMeasureLocation } from '@patternfly/react-core';
 import { CLUSTER_STATUS_LABELS } from '../../config/constants';
 import { getHostInstallationSteps } from '../hosts/HostStatus';
+import { getHostInstallationStepNumber } from '../hosts/HostProgress';
 
 const getProgressVariant = (status: Cluster['status']) => {
   switch (status) {
@@ -37,7 +38,7 @@ const getProgressPercent = (hosts: Host[] = []) => {
     if (['installed', 'error'].includes(host.status)) {
       return steps + hostInstallationSteps.length;
     } else {
-      return steps + (hostInstallationSteps.indexOf(host.statusInfo) + 1);
+      return steps + getHostInstallationStepNumber(hostInstallationSteps, host.statusInfo);
     }
   }, 0);
   return (completedSteps / totalSteps) * 100;

diff --git a/src/components/hosts/HostProgress.tsx b/src/components/hosts/HostProgress.tsx
@@ -7,6 +7,9 @@ import {
   ProgressSize,
 } from '@patternfly/react-core';
 
+export const getHostInstallationStepNumber = (steps: string[], currentStep: string) =>
+  steps.findIndex((s) => currentStep.match(s)) + 1;
+
 const getProgressVariant = (status: Host['status']) => {
   switch (status) {
     case 'error':
@@ -32,7 +35,7 @@ type HostProgressProps = {
 
 const HostProgress: React.FC<HostProgressProps> = ({ status, progressInfo }) => {
   const { steps, currentStep } = progressInfo;
-  const currentStepNumber = steps.indexOf(currentStep) + 1;
+  const currentStepNumber = getHostInstallationStepNumber(steps, currentStep);
 
   return (
     <Progress

diff --git a/src/components/hosts/HostStatus.tsx b/src/components/hosts/HostStatus.tsx
@@ -16,7 +16,7 @@ import {
   UnknownIcon,
 } from '@patternfly/react-icons';
 import { Host } from '../../api/types';
-import HostProgress from './HostProgress';
+import HostProgress, { getHostInstallationStepNumber } from './HostProgress';
 import { HOST_STATUS_LABELS, HOST_STATUS_DETAILS } from '../../config/constants';
 
 import './HostStatus.css';
@@ -80,7 +80,10 @@ const HostStatus: React.FC<HostStatusProps> = ({ host }) => {
     currentStep: statusInfo || 'Starting Installation',
   };
 
-  const currentStepNumber = progressInfo.steps.indexOf(progressInfo.currentStep) + 1;
+  const currentStepNumber = getHostInstallationStepNumber(
+    progressInfo.steps,
+    progressInfo.currentStep,
+  );
   const bodyContent = React.useMemo(
     () => (
       <div>