From bf86ce7b69a9f94237234b7b911a674902074c10 Mon Sep 17 00:00:00 2001
From: Marek Libra <marek.libra@gmail.com>
Date: Mon, 11 Nov 2024 12:49:37 +0100
Subject: [PATCH] fix(orchestrator): remove completedWith status  (#2511)

fix(orchestrator): remove completedWith status

FLPATH-1845

Signed-off-by: Marek Libra <mlibra@redhat.com>
---
 .changeset/unlucky-jars-protect.md            |  2 ++
 .../WorkflowInstancePageContent.tsx           |  1 -
 .../WorkflowInstanceStatusIndicator.tsx       | 21 +++----------------
 .../src/components/WorkflowRunDetails.tsx     |  4 ----
 4 files changed, 5 insertions(+), 23 deletions(-)
 create mode 100644 .changeset/unlucky-jars-protect.md

diff --git a/.changeset/unlucky-jars-protect.md b/.changeset/unlucky-jars-protect.md
new file mode 100644
index 0000000000..a845151cc8
--- /dev/null
+++ b/.changeset/unlucky-jars-protect.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/plugins/orchestrator/src/components/WorkflowInstancePageContent.tsx b/plugins/orchestrator/src/components/WorkflowInstancePageContent.tsx
index b13113b8bf..830710d83d 100644
--- a/plugins/orchestrator/src/components/WorkflowInstancePageContent.tsx
+++ b/plugins/orchestrator/src/components/WorkflowInstancePageContent.tsx
@@ -100,7 +100,6 @@ export const WorkflowInstancePageContent: React.FC<{
             <WorkflowRunDetails
               details={details}
               assessedBy={assessedInstance.assessedBy}
-              completedWith={workflowdata?.result?.completedWith}
             />
           </InfoCard>
         </Grid>
diff --git a/plugins/orchestrator/src/components/WorkflowInstanceStatusIndicator.tsx b/plugins/orchestrator/src/components/WorkflowInstanceStatusIndicator.tsx
index 0bde12c694..5cfa31cdc6 100644
--- a/plugins/orchestrator/src/components/WorkflowInstanceStatusIndicator.tsx
+++ b/plugins/orchestrator/src/components/WorkflowInstanceStatusIndicator.tsx
@@ -8,7 +8,6 @@ import DotIcon from '@material-ui/icons/FiberManualRecord';
 import {
   capitalize,
   ProcessInstanceStatusDTO,
-  WorkflowResultDTOCompletedWithEnum,
 } from '@janus-idp/backstage-plugin-orchestrator-common';
 
 import { VALUE_UNAVAILABLE } from '../constants';
@@ -18,40 +17,26 @@ import { workflowInstanceRouteRef } from '../routes';
 export const WorkflowInstanceStatusIndicator = ({
   status,
   lastRunId,
-  completedWith,
 }: {
   status?: ProcessInstanceStatusDTO;
   lastRunId?: string;
-  completedWith?: WorkflowResultDTOCompletedWithEnum;
 }) => {
-  const iconColor = useWorkflowInstanceStateColors(
-    status === ProcessInstanceStatusDTO.Completed && completedWith === 'error'
-      ? ProcessInstanceStatusDTO.Error
-      : status,
-  );
+  const iconColor = useWorkflowInstanceStateColors(status);
   const workflowInstanceLink = useRouteRef(workflowInstanceRouteRef);
 
   if (!status) {
     return VALUE_UNAVAILABLE;
   }
 
-  let statusText: string = status;
-  if (
-    status === ProcessInstanceStatusDTO.Completed &&
-    completedWith === 'error'
-  ) {
-    statusText = 'Completed with error';
-  }
-
   return (
     <>
       <DotIcon style={{ fontSize: '0.75rem' }} className={iconColor} />{' '}
       {lastRunId ? (
         <Link to={workflowInstanceLink({ instanceId: lastRunId })}>
-          {capitalize(statusText)}
+          {capitalize(status)}
         </Link>
       ) : (
-        <>{capitalize(statusText)}</>
+        <>{capitalize(status)}</>
       )}
     </>
   );
diff --git a/plugins/orchestrator/src/components/WorkflowRunDetails.tsx b/plugins/orchestrator/src/components/WorkflowRunDetails.tsx
index 34d3a5982e..e02328149d 100644
--- a/plugins/orchestrator/src/components/WorkflowRunDetails.tsx
+++ b/plugins/orchestrator/src/components/WorkflowRunDetails.tsx
@@ -10,7 +10,6 @@ import {
   capitalize,
   ProcessInstanceDTO,
   ProcessInstanceStatusDTO,
-  WorkflowResultDTOCompletedWithEnum,
 } from '@janus-idp/backstage-plugin-orchestrator-common';
 
 import { VALUE_UNAVAILABLE } from '../constants';
@@ -21,7 +20,6 @@ import { WorkflowRunDetail } from './WorkflowRunDetail';
 type WorkflowDetailsCardProps = {
   assessedBy?: ProcessInstanceDTO;
   details: WorkflowRunDetail;
-  completedWith?: WorkflowResultDTOCompletedWithEnum;
 };
 
 const useStyles = makeStyles({
@@ -34,7 +32,6 @@ const useStyles = makeStyles({
 export const WorkflowRunDetails: React.FC<WorkflowDetailsCardProps> = ({
   assessedBy,
   details,
-  completedWith,
 }) => {
   const styles = useStyles();
   const workflowInstanceLink = useRouteRef(workflowInstanceRouteRef);
@@ -54,7 +51,6 @@ export const WorkflowRunDetails: React.FC<WorkflowDetailsCardProps> = ({
             <b>
               <WorkflowInstanceStatusIndicator
                 status={details.status as ProcessInstanceStatusDTO}
-                completedWith={completedWith}
               />
             </b>
           </Typography>