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 {getWaitingForTableCellComponent(row)}; + return ( + // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions + + {getWaitingForTableCellComponent(row)} + + ); } if (column.accessor === 'updated_at_in_seconds') { return ( ); } @@ -1409,7 +1419,7 @@ export default function ProcessInstanceListTable({ // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions {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 ( - + // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions + {timeInSeconds ? TimeAgo.inWords(timeInSeconds) : '-'} );