fix(orchestrator): fix search and filter for 'running' and 'failed' (#978)

Signed-off-by: Lior Soffer <liorsoffer1@gmail.com>

Author: LiorSoffer

workspaces/orchestrator/.changeset/grumpy-houses-switch.md

@@ -0,0 +1,5 @@
+---
+'@red-hat-developer-hub/backstage-plugin-orchestrator': patch
+---
+
+fix search and filter for "running" and "failed"

workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/WorkflowRunsTabContent.tsx

@@ -51,19 +51,13 @@ import { mapProcessInstanceToDetails } from '../WorkflowInstancePage/WorkflowIns
 import { WorkflowInstanceStatusIndicator } from '../WorkflowInstanceStatusIndicator';
 import { WorkflowRunDetail } from '../WorkflowRunDetail';
 
-const makeSelectItemsFromProcessInstanceValues = () =>
-  [
-    ProcessInstanceStatusDTO.Active,
-    ProcessInstanceStatusDTO.Error,
-    ProcessInstanceStatusDTO.Completed,
-    ProcessInstanceStatusDTO.Aborted,
-    ProcessInstanceStatusDTO.Suspended,
-  ].map(
-    (status): SelectItem => ({
-      label: capitalize(status),
-      value: status,
-    }),
-  );
+const makeSelectItemsFromProcessInstanceValues = (): SelectItem[] => [
+  { label: 'Running', value: ProcessInstanceStatusDTO.Active },
+  { label: 'Failed', value: ProcessInstanceStatusDTO.Error },
+  { label: 'Completed', value: ProcessInstanceStatusDTO.Completed },
+  { label: 'Aborted', value: ProcessInstanceStatusDTO.Aborted },
+  { label: 'Suspended', value: ProcessInstanceStatusDTO.Suspended },
+];
 
 const statuses = makeSelectItemsFromProcessInstanceValues();
 const started = ['Today', 'Yesterday', 'Last 7 days', 'This month'].map(

workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/WorkflowsTable.tsx

@@ -37,7 +37,6 @@ import {
   WorkflowOverviewDTO,
 } from '@red-hat-developer-hub/backstage-plugin-orchestrator-common';
 
-import { VALUE_UNAVAILABLE } from '../../constants';
 import WorkflowOverviewFormatter, {
   FormattedWorkflowOverview,
 } from '../../dataFormatters/WorkflowOverviewFormatter';
@@ -257,22 +256,25 @@ export const WorkflowsTable = ({ items }: WorkflowsTableProps) => {
       {
         title: 'Last run status',
         field: 'lastRunStatus',
-        render: rowData =>
-          rowData.lastRunStatus !== VALUE_UNAVAILABLE &&
-          rowData.lastRunId !== VALUE_UNAVAILABLE ? (
+        render: rowData => {
+          const originalRawData = items.find(
+            item => item.workflowId === rowData.id,
+          );
+          return (
             <WorkflowInstanceStatusIndicator
-              status={rowData.lastRunStatus as ProcessInstanceStatusDTO}
+              status={
+                originalRawData?.lastRunStatus as ProcessInstanceStatusDTO
+              }
               lastRunId={
                 canViewInstance(rowData.id) ? rowData.lastRunId : undefined
               }
             />
-          ) : (
-            VALUE_UNAVAILABLE
-          ),
+          );
+        },
       },
       { title: 'Description', field: 'description', minWidth: '25vw' },
     ],
-    [canViewInstance, canViewWorkflow, definitionLink],
+    [canViewInstance, canViewWorkflow, definitionLink, items],
   );
 
   const options = useMemo<TableProps['options']>(

workspaces/orchestrator/plugins/orchestrator/src/dataFormatters/WorkflowOverviewFormatter.ts

@@ -42,6 +42,13 @@ const formatIsAvailable = (availablity: boolean | undefined) => {
   return VALUE_UNAVAILABLE;
 };
 
+const formatLastRunStatus = (lastRunStatus: string | undefined) => {
+  if (lastRunStatus === 'ERROR') return 'FAILED';
+  else if (lastRunStatus === 'ACTIVE') return 'RUNNING';
+  else if (lastRunStatus) return lastRunStatus?.toString();
+  return VALUE_UNAVAILABLE;
+};
+
 const WorkflowOverviewFormatter: DataFormatter<
   WorkflowOverviewDTO,
   FormattedWorkflowOverview
@@ -53,7 +60,7 @@ const WorkflowOverviewFormatter: DataFormatter<
       lastTriggered: data.lastTriggeredMs
         ? moment(data.lastTriggeredMs).toDate().toLocaleString()
         : VALUE_UNAVAILABLE,
-      lastRunStatus: data.lastRunStatus?.toString() ?? VALUE_UNAVAILABLE,
+      lastRunStatus: formatLastRunStatus(data.lastRunStatus),
       lastRunId: data.lastRunId ?? VALUE_UNAVAILABLE,
       category: data.category ?? VALUE_UNAVAILABLE,
       description: data.description ?? VALUE_UNAVAILABLE,