From 6aac21ebef2a57fa907e8657bc04e004dbf358fd Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Tue, 18 Apr 2023 10:27:38 -0400
Subject: [PATCH] updated missing columns on homepage to go to instance page
 and fixed waiting for me table returning incorrect tasks

---
 .../services/process_instance_report_service.py    |  4 ++++
 .../src/components/ProcessInstanceListTable.tsx    | 14 ++++++++++++--
 .../src/components/TableCellWithTimeAgoInWords.tsx | 11 ++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py
index a16d9d7c..04510969 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py
@@ -617,6 +617,10 @@ class ProcessInstanceReportService:
                 HumanTaskUserModel,
                 and_(HumanTaskUserModel.human_task_id == HumanTaskModel.id, HumanTaskUserModel.user_id == user.id),
             )
+            if report_filter.has_active_status:
+                process_instance_query = process_instance_query.filter(
+                    HumanTaskModel.completed.is_(False)  # type: ignore
+                )
 
         if report_filter.with_tasks_assigned_to_my_group is True:
             group_model_join_conditions = [GroupModel.id == HumanTaskModel.lane_assignment_id]
diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
index 227ae1bc..8dff5b2d 100644
--- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
@@ -1396,12 +1396,22 @@ export default function ProcessInstanceListTable({
       );
     }
     if (column.accessor === 'waiting_for') {
-      return <td>{getWaitingForTableCellComponent(row)}</td>;
+      return (
+        // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+        <td
+          onClick={navigateToProcessInstance}
+          onKeyDown={navigateToProcessInstance}
+        >
+          {getWaitingForTableCellComponent(row)}
+        </td>
+      );
     }
     if (column.accessor === 'updated_at_in_seconds') {
       return (
         <TableCellWithTimeAgoInWords
           timeInSeconds={row.updated_at_in_seconds}
+          onClick={navigateToProcessInstance}
+          onKeyDown={navigateToProcessInstance}
         />
       );
     }
@@ -1409,7 +1419,7 @@ export default function ProcessInstanceListTable({
       // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
       <td
         data-qa={`process-instance-show-link-${column.accessor}`}
-        onKeyDown={navigateToProcessModel}
+        onKeyDown={navigateToProcessInstance}
         onClick={navigateToProcessInstance}
       >
         {formatter(row, value)}
diff --git a/spiffworkflow-frontend/src/components/TableCellWithTimeAgoInWords.tsx b/spiffworkflow-frontend/src/components/TableCellWithTimeAgoInWords.tsx
index 9952c056..fb3ddf54 100644
--- a/spiffworkflow-frontend/src/components/TableCellWithTimeAgoInWords.tsx
+++ b/spiffworkflow-frontend/src/components/TableCellWithTimeAgoInWords.tsx
@@ -4,13 +4,22 @@ import { convertSecondsToFormattedDateTime } from '../helpers';
 
 type OwnProps = {
   timeInSeconds: number;
+  onClick?: any;
+  onKeyDown?: any;
 };
 
 export default function TableCellWithTimeAgoInWords({
   timeInSeconds,
+  onClick = null,
+  onKeyDown = null,
 }: OwnProps) {
   return (
-    <td title={convertSecondsToFormattedDateTime(timeInSeconds) || '-'}>
+    // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
+    <td
+      title={convertSecondsToFormattedDateTime(timeInSeconds) || '-'}
+      onClick={onClick}
+      onKeyDown={onKeyDown}
+    >
       {timeInSeconds ? TimeAgo.inWords(timeInSeconds) : '-'}
     </td>
   );