some initial work for home page refactor w/ burnettk

spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_report_service.py

@@ -47,6 +47,7 @@ class ProcessInstanceReportFilter:
     initiated_by_me: Optional[bool] = None
     has_terminal_status: Optional[bool] = None
     with_tasks_completed_by_me: Optional[bool] = None
+    with_tasks_i_can_complete: Optional[bool] = None
     with_tasks_assigned_to_my_group: Optional[bool] = None
     with_relation_to_me: Optional[bool] = None
     process_initiator_username: Optional[str] = None
@@ -77,6 +78,8 @@ class ProcessInstanceReportFilter:
             d["has_terminal_status"] = str(self.has_terminal_status).lower()
         if self.with_tasks_completed_by_me is not None:
             d["with_tasks_completed_by_me"] = str(self.with_tasks_completed_by_me).lower()
+        if self.with_tasks_i_can_complete is not None:
+            d["with_tasks_i_can_complete"] = str(self.with_tasks_i_can_complete).lower()
         if self.with_tasks_assigned_to_my_group is not None:
             d["with_tasks_assigned_to_my_group"] = str(self.with_tasks_assigned_to_my_group).lower()
         if self.with_relation_to_me is not None:
@@ -140,6 +143,31 @@ class ProcessInstanceReportService:
                 ],
                 "order_by": ["-start_in_seconds", "-id"],
             },
+            "system_report_in_progress_instances_initiated_by_me": {
+                "columns": [
+                    {"Header": "id", "accessor": "id"},
+                    {
+                        "Header": "process_model_display_name",
+                        "accessor": "process_model_display_name",
+                    },
+                    {"Header": "start_in_seconds", "accessor": "start_in_seconds"},
+                    {"Header": "end_in_seconds", "accessor": "end_in_seconds"},
+                    {"Header": "status", "accessor": "status"},
+                ],
+                "filter_by": [
+                    {"field_name": "initiated_by_me", "field_value": "true"},
+                    {"field_name": "has_terminal_status", "field_value": "false"},
+                ],
+                "order_by": ["-start_in_seconds", "-id"],
+            },
+            "system_report_in_progress_instances_with_tasks_for_me": {
+                "columns": cls.builtin_column_options(),
+                "filter_by": [
+                    {"field_name": "with_tasks_i_can_complete", "field_value": "true"},
+                    {"field_name": "has_terminal_status", "field_value": "false"},
+                ],
+                "order_by": ["-start_in_seconds", "-id"],
+            },
         }
 
         if metadata_key not in temp_system_metadata_map:
@@ -199,7 +227,12 @@ class ProcessInstanceReportService:
 
         def bool_value(key: str) -> Optional[bool]:
             """Bool_value."""
-            return bool(filters[key]) if key in filters else None
+            if key not in filters:
+                return None
+            # bool returns True if not an empty string so check explicitly for false
+            if filters[key] in ['false', 'False']:
+                return False
+            return bool(filters[key])
 
         def int_value(key: str) -> Optional[int]:
             """Int_value."""
@@ -219,6 +252,7 @@ class ProcessInstanceReportService:
         initiated_by_me = bool_value("initiated_by_me")
         has_terminal_status = bool_value("has_terminal_status")
         with_tasks_completed_by_me = bool_value("with_tasks_completed_by_me")
+        with_tasks_i_can_complete = bool_value("with_tasks_i_can_complete")
         with_tasks_assigned_to_my_group = bool_value("with_tasks_assigned_to_my_group")
         with_relation_to_me = bool_value("with_relation_to_me")
         process_initiator_username = filters.get("process_initiator_username")
@@ -236,6 +270,7 @@ class ProcessInstanceReportService:
             initiated_by_me=initiated_by_me,
             has_terminal_status=has_terminal_status,
             with_tasks_completed_by_me=with_tasks_completed_by_me,
+            with_tasks_i_can_complete=with_tasks_i_can_complete,
             with_tasks_assigned_to_my_group=with_tasks_assigned_to_my_group,
             with_relation_to_me=with_relation_to_me,
             process_initiator_username=process_initiator_username,
@@ -259,6 +294,7 @@ class ProcessInstanceReportService:
         initiated_by_me: Optional[bool] = None,
         has_terminal_status: Optional[bool] = None,
         with_tasks_completed_by_me: Optional[bool] = None,
+        with_tasks_i_can_complete: Optional[bool] = None,
         with_tasks_assigned_to_my_group: Optional[bool] = None,
         with_relation_to_me: Optional[bool] = None,
         process_initiator_username: Optional[str] = None,
@@ -288,6 +324,8 @@ class ProcessInstanceReportService:
             report_filter.has_terminal_status = has_terminal_status
         if with_tasks_completed_by_me is not None:
             report_filter.with_tasks_completed_by_me = with_tasks_completed_by_me
+        if with_tasks_i_can_complete is not None:
+            report_filter.with_tasks_i_can_complete = with_tasks_i_can_complete
         if process_initiator_username is not None:
             report_filter.process_initiator_username = process_initiator_username
         if report_column_list is not None:
@@ -405,6 +443,10 @@ class ProcessInstanceReportService:
             process_instance_query = process_instance_query.filter(
                 ProcessInstanceModel.status.in_(ProcessInstanceModel.terminal_statuses())  # type: ignore
             )
+        elif report_filter.has_terminal_status is False:
+            process_instance_query = process_instance_query.filter(
+                ProcessInstanceModel.status.not_in(ProcessInstanceModel.terminal_statuses())  # type: ignore
+            )
 
         if report_filter.process_initiator_username is not None:
             initiator = UserModel.query.filter_by(username=report_filter.process_initiator_username).first()
@@ -416,6 +458,7 @@ class ProcessInstanceReportService:
         if (
             not report_filter.with_tasks_completed_by_me
             and not report_filter.with_tasks_assigned_to_my_group
+            and not report_filter.with_tasks_i_can_complete
             and report_filter.with_relation_to_me is True
         ):
             process_instance_query = process_instance_query.outerjoin(HumanTaskModel).outerjoin(
@@ -444,6 +487,21 @@ class ProcessInstanceReportService:
                 ),
             )
 
+        if report_filter.with_tasks_i_can_complete is True:
+            process_instance_query = process_instance_query.filter(
+                ProcessInstanceModel.process_initiator_id != user.id
+            )
+            process_instance_query = process_instance_query.join(
+                HumanTaskModel,
+                HumanTaskModel.process_instance_id == ProcessInstanceModel.id,
+            ).join(
+                HumanTaskUserModel,
+                and_(
+                    HumanTaskUserModel.human_task_id == HumanTaskModel.id,
+                    HumanTaskUserModel.user_id == user.id
+                )
+            )
+
         if report_filter.with_tasks_assigned_to_my_group is True:
             group_model_join_conditions = [GroupModel.id == HumanTaskModel.lane_assignment_id]
             if report_filter.user_group_identifier:

spiffworkflow-frontend/src/routes/HomePageRoutes.tsx

@@ -7,6 +7,7 @@ import MyTasks from './MyTasks';
 import GroupedTasks from './GroupedTasks';
 import CompletedInstances from './CompletedInstances';
 import CreateNewInstance from './CreateNewInstance';
+import InProgressInstances from './InProgressInstances';
 
 export default function HomePageRoutes() {
   const location = useLocation();
@@ -51,10 +52,10 @@ export default function HomePageRoutes() {
     <>
       {renderTabs()}
       <Routes>
-        <Route path="/" element={<GroupedTasks />} />
+        <Route path="/" element={<InProgressInstances />} />
         <Route path="my-tasks" element={<MyTasks />} />
         <Route path=":process_instance_id/:task_id" element={<TaskShow />} />
-        <Route path="grouped" element={<GroupedTasks />} />
+        <Route path="grouped" element={<InProgressInstances />} />
         <Route path="completed-instances" element={<CompletedInstances />} />
         <Route path="create-new-instance" element={<CreateNewInstance />} />
       </Routes>

spiffworkflow-frontend/src/routes/InProgressInstances.tsx

@@ -0,0 +1,79 @@
+import { useEffect, useState } from 'react';
+import ProcessInstanceListTable from '../components/ProcessInstanceListTable';
+import HttpService from '../services/HttpService';
+
+export default function InProgressInstances() {
+  const [userGroups, setUserGroups] = useState<string[] | null>(null);
+
+  useEffect(() => {
+    HttpService.makeCallToBackend({
+      path: `/user-groups/for-current-user`,
+      successCallback: setUserGroups,
+    });
+  }, [setUserGroups]);
+
+  const groupTableComponents = () => {
+    if (!userGroups) {
+      return null;
+    }
+
+    return userGroups.map((userGroup: string) => {
+      return (
+        <>
+          <h2>With tasks completed by group: {userGroup}</h2>
+          <p className="data-table-description">
+            This is a list of instances with tasks that were completed by the{' '}
+            {userGroup} group.
+          </p>
+          <ProcessInstanceListTable
+            filtersEnabled={false}
+            paginationQueryParamPrefix="group_completed_instances"
+            paginationClassName="with-large-bottom-margin"
+            perPageOptions={[2, 5, 25]}
+            reportIdentifier="system_report_completed_instances_with_tasks_completed_by_my_groups"
+            showReports={false}
+            textToShowIfEmpty="This group has no completed instances at this time."
+            additionalParams={`user_group_identifier=${userGroup}`}
+            autoReload={false}
+          />
+        </>
+      );
+    });
+  };
+
+  return (
+    <>
+      <h2>My open instances</h2>
+      <p className="data-table-description">
+        This is a list of instances you started that are now complete.
+      </p>
+      <ProcessInstanceListTable
+        filtersEnabled={false}
+        paginationQueryParamPrefix="my_completed_instances"
+        perPageOptions={[2, 5, 25]}
+        reportIdentifier="system_report_in_progress_instances_initiated_by_me"
+        showReports={false}
+        textToShowIfEmpty="There are no open instances you started at this time."
+        paginationClassName="with-large-bottom-margin"
+        autoReload={false}
+      />
+      <h2>With tasks I can complete</h2>
+      <p className="data-table-description">
+        This is a list of instances that have tasks that you can complete.
+      </p>
+      <ProcessInstanceListTable
+        filtersEnabled={false}
+        paginationQueryParamPrefix="my_completed_tasks"
+        perPageOptions={[2, 5, 25]}
+        reportIdentifier="system_report_in_progress_instances_with_tasks_for_me"
+        showReports={false}
+        textToShowIfEmpty="You have no completed instances at this time."
+        paginationClassName="with-large-bottom-margin"
+        autoReload={false}
+      />
+      {/**
+      {groupTableComponents()}
+      * */}
+    </>
+  );
+}