From 1707396783c2571633f78666feee36a817dfdbcc Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Mon, 5 Dec 2022 14:56:55 -0500
Subject: [PATCH] updated tasks endpoint to task-data for easier permission
 setting w/ burnettk

---
 spiffworkflow-backend/src/spiffworkflow_backend/api.yml    | 2 +-
 .../config/permissions/development.yml                     | 7 ++++++-
 .../config/permissions/terraform_deployed_environment.yml  | 7 ++++++-
 .../src/components/ProcessInstanceListTable.tsx            | 4 +++-
 spiffworkflow-frontend/src/hooks/UriListForPermissions.tsx | 2 +-
 spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx  | 2 +-
 spiffworkflow-frontend/src/routes/TaskShow.tsx             | 4 ++--
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/api.yml b/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
index 5be50b8d1..fe7839184 100755
--- a/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/api.yml
@@ -1101,7 +1101,7 @@ paths:
                 items:
                   $ref: "#/components/schemas/Task"
 
-  /process-instances/{modified_process_model_id}/{process_instance_id}/tasks:
+  /task-data/{modified_process_model_id}/{process_instance_id}:
     parameters:
       - name: modified_process_model_id
         in: path
diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/development.yml b/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/development.yml
index e17e3f110..b404aa976 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/development.yml
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/development.yml
@@ -12,7 +12,6 @@ groups:
         mike,
         jason,
         j,
-        amir,
         jarrad,
         elizabeth,
         jon,
@@ -98,6 +97,12 @@ permissions:
     allowed_permissions: [read]
     uri: /v1.0/processes
 
+  task-data-read:
+    groups: [demo]
+    users: []
+    allowed_permissions: [read]
+    uri: /v1.0/task-data/*
+
 
   manage-procurement-admin:
     groups: ["Project Lead"]
diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/terraform_deployed_environment.yml b/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/terraform_deployed_environment.yml
index e60946b3c..ce2e2dba1 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/terraform_deployed_environment.yml
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/terraform_deployed_environment.yml
@@ -12,7 +12,6 @@ groups:
         mike,
         jason,
         j,
-        amir,
         jarrad,
         elizabeth,
         jon,
@@ -98,6 +97,12 @@ permissions:
     allowed_permissions: [read]
     uri: /v1.0/processes
 
+  task-data-read:
+    groups: [demo]
+    users: []
+    allowed_permissions: [read]
+    uri: /v1.0/task-data/*
+
 
   manage-procurement-admin:
     groups: ["Project Lead"]
diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
index cc5ad75a9..621c595cf 100644
--- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
@@ -1166,6 +1166,9 @@ export default function ProcessInstanceListTable({
     return (
       <>
         <Grid fullWidth>
+          <Column sm={2} md={4} lg={7}>
+            {reportSearchComponent()}
+          </Column>
           <Column
             className="filterIcon"
             sm={{ span: 1, offset: 3 }}
@@ -1204,7 +1207,6 @@ export default function ProcessInstanceListTable({
         {reportColumnForm()}
         {processInstanceReportSaveTag()}
         {filterComponent()}
-        {reportSearchComponent()}
         <PaginationForTable
           page={page}
           perPage={perPage}
diff --git a/spiffworkflow-frontend/src/hooks/UriListForPermissions.tsx b/spiffworkflow-frontend/src/hooks/UriListForPermissions.tsx
index 80c78987a..9496e9e0b 100644
--- a/spiffworkflow-frontend/src/hooks/UriListForPermissions.tsx
+++ b/spiffworkflow-frontend/src/hooks/UriListForPermissions.tsx
@@ -11,7 +11,7 @@ export const useUriListForPermissions = () => {
       processGroupShowPath: `/v1.0/process-groups/${params.process_group_id}`,
       processInstanceActionPath: `/v1.0/process-models/${params.process_model_id}/process-instances`,
       processInstanceListPath: '/v1.0/process-instances',
-      processInstanceTaskListPath: `/v1.0/process-instances/${params.process_model_id}/${params.process_instance_id}/tasks`,
+      processInstanceTaskListPath: `/v1.0/task-data/${params.process_model_id}/${params.process_instance_id}`,
       processInstanceReportListPath: '/v1.0/process-instances/reports',
       processModelCreatePath: `/v1.0/process-models/${params.process_group_id}`,
       processModelFileCreatePath: `/v1.0/process-models/${params.process_model_id}/files`,
diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
index c407c7713..0b0aca14a 100644
--- a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
@@ -85,7 +85,7 @@ export default function ProcessInstanceShow() {
       }
       if (ability.can('GET', targetUris.processInstanceTaskListPath)) {
         HttpService.makeCallToBackend({
-          path: `/process-instances/${modifiedProcessModelId}/${params.process_instance_id}/tasks${taskParams}`,
+          path: `${targetUris.processInstanceTaskListPath}${taskParams}`,
           successCallback: setTasks,
           failureCallback: processTaskFailure,
         });
diff --git a/spiffworkflow-frontend/src/routes/TaskShow.tsx b/spiffworkflow-frontend/src/routes/TaskShow.tsx
index 768043cd8..88e23de7f 100644
--- a/spiffworkflow-frontend/src/routes/TaskShow.tsx
+++ b/spiffworkflow-frontend/src/routes/TaskShow.tsx
@@ -39,9 +39,9 @@ export default function TaskShow() {
     const processResult = (result: any) => {
       setTask(result);
       HttpService.makeCallToBackend({
-        path: `/process-instances/${modifyProcessIdentifierForPathParam(
+        path: `/task-data/${modifyProcessIdentifierForPathParam(
           result.process_model_identifier
-        )}/${params.process_instance_id}/tasks`,
+        )}/${params.process_instance_id}`,
         successCallback: setUserTasks,
       });
     };