From 851be377fff0195506f09a7d8aefa93c70afbaec Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Wed, 23 Nov 2022 18:44:51 -0500
Subject: [PATCH] some ui changes w/ burnettk

---
 .../components/ProcessInstanceListTable.tsx    |  2 +-
 .../src/components/ProcessInstanceRun.tsx      |  2 +-
 .../src/components/TasksForMyOpenProcesses.tsx | 14 ++++++--------
 .../src/components/TasksWaitingForMe.tsx       | 18 ++++++++----------
 .../src/components/TasksWaitingForMyGroups.tsx | 16 +++++++---------
 spiffworkflow-frontend/src/index.css           |  1 +
 .../src/routes/CreateNewInstance.tsx           |  4 +---
 .../src/routes/HomePageRoutes.tsx              |  6 +++---
 .../src/routes/ProcessModelShow.tsx            | 17 ++++++++++-------
 9 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
index 739c8948..78b67aaa 100644
--- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
@@ -608,7 +608,7 @@ export default function ProcessInstanceListTable({
   const buildTable = () => {
     const headerLabels: Record<string, string> = {
       id: 'Id',
-      process_model_identifier: 'Process Model',
+      process_model_identifier: 'Process',
       start_in_seconds: 'Start Time',
       end_in_seconds: 'End Time',
       status: 'Status',
diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceRun.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceRun.tsx
index c5d79abd..bcead73f 100644
--- a/spiffworkflow-frontend/src/components/ProcessInstanceRun.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessInstanceRun.tsx
@@ -119,7 +119,7 @@ export default function ProcessInstanceRun({
   return (
     <Can I="POST" a={processInstanceActionPath} ability={ability}>
       <Button onClick={processInstanceCreateAndRun} className={className}>
-        Run
+        Start
       </Button>
     </Can>
   );
diff --git a/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx b/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx
index 7a01a7c4..bfe9df6f 100644
--- a/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx
+++ b/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx
@@ -65,7 +65,6 @@ export default function MyOpenProcesses() {
           >
             {rowToUse.task_title}
           </td>
-          <td>{rowToUse.process_instance_status}</td>
           <td>{rowToUse.group_identifier || '-'}</td>
           <td>
             {convertSecondsToFormattedDateTime(
@@ -94,13 +93,12 @@ export default function MyOpenProcesses() {
       <Table striped bordered>
         <thead>
           <tr>
-            <th>Process Model</th>
-            <th>Process Instance</th>
-            <th>Task Name</th>
-            <th>Process Instance Status</th>
-            <th>Assigned Group</th>
-            <th>Process Started</th>
-            <th>Process Updated</th>
+            <th>Process</th>
+            <th>Id</th>
+            <th>Task</th>
+            <th>Waiting For</th>
+            <th>Date Started</th>
+            <th>Last Updated</th>
             <th>Actions</th>
           </tr>
         </thead>
diff --git a/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx b/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx
index cd0eb048..c34745e1 100644
--- a/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx
+++ b/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx
@@ -56,7 +56,7 @@ export default function TasksWaitingForMe() {
               data-qa="process-instance-show-link"
               to={`/admin/process-models/${modifiedProcessModelIdentifier}/process-instances/${rowToUse.process_instance_id}`}
             >
-              View {rowToUse.process_instance_id}
+              {rowToUse.process_instance_id}
             </Link>
           </td>
           <td
@@ -65,7 +65,6 @@ export default function TasksWaitingForMe() {
             {rowToUse.task_title}
           </td>
           <td>{rowToUse.username}</td>
-          <td>{rowToUse.process_instance_status}</td>
           <td>{rowToUse.group_identifier || '-'}</td>
           <td>
             {convertSecondsToFormattedDateTime(
@@ -94,14 +93,13 @@ export default function TasksWaitingForMe() {
       <Table striped bordered>
         <thead>
           <tr>
-            <th>Process Model</th>
-            <th>Process Instance</th>
-            <th>Task Name</th>
-            <th>Process Started By</th>
-            <th>Process Instance Status</th>
-            <th>Assigned Group</th>
-            <th>Process Started</th>
-            <th>Process Updated</th>
+            <th>Process</th>
+            <th>Id</th>
+            <th>Task</th>
+            <th>Started By</th>
+            <th>Waiting For</th>
+            <th>Date Started</th>
+            <th>Last Updated</th>
             <th>Actions</th>
           </tr>
         </thead>
diff --git a/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx b/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx
index 05a970ef..b62d6edd 100644
--- a/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx
+++ b/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx
@@ -66,7 +66,6 @@ export default function TasksWaitingForMyGroups() {
             {rowToUse.task_title}
           </td>
           <td>{rowToUse.username}</td>
-          <td>{rowToUse.process_instance_status}</td>
           <td>{rowToUse.group_identifier || '-'}</td>
           <td>
             {convertSecondsToFormattedDateTime(
@@ -95,14 +94,13 @@ export default function TasksWaitingForMyGroups() {
       <Table striped bordered>
         <thead>
           <tr>
-            <th>Process Model</th>
-            <th>Process Instance</th>
-            <th>Task Name</th>
-            <th>Process Started By</th>
-            <th>Process Instance Status</th>
-            <th>Assigned Group</th>
-            <th>Process Started</th>
-            <th>Process Updated</th>
+            <th>Process</th>
+            <th>Id</th>
+            <th>Task</th>
+            <th>Started By</th>
+            <th>Waiting For</th>
+            <th>Date Started</th>
+            <th>Last Updated</th>
             <th>Actions</th>
           </tr>
         </thead>
diff --git a/spiffworkflow-frontend/src/index.css b/spiffworkflow-frontend/src/index.css
index 6985ef9f..88202b6e 100644
--- a/spiffworkflow-frontend/src/index.css
+++ b/spiffworkflow-frontend/src/index.css
@@ -273,4 +273,5 @@ td.actions-cell {
   line-height: 18px;
   letter-spacing: 0.16px;
   color: #525252;
+  margin-bottom: 1em;
 }
diff --git a/spiffworkflow-frontend/src/routes/CreateNewInstance.tsx b/spiffworkflow-frontend/src/routes/CreateNewInstance.tsx
index fbb3f844..6d6d133f 100644
--- a/spiffworkflow-frontend/src/routes/CreateNewInstance.tsx
+++ b/spiffworkflow-frontend/src/routes/CreateNewInstance.tsx
@@ -2,8 +2,6 @@ import ProcessModelListTiles from '../components/ProcessModelListTiles';
 
 export default function CreateNewInstance() {
   return (
-    <ProcessModelListTiles
-      headerElement={<h1>Process models available to you</h1>}
-    />
+    <ProcessModelListTiles headerElement={<h2>Processes you can start</h2>} />
   );
 }
diff --git a/spiffworkflow-frontend/src/routes/HomePageRoutes.tsx b/spiffworkflow-frontend/src/routes/HomePageRoutes.tsx
index 10d98f95..872a7a69 100644
--- a/spiffworkflow-frontend/src/routes/HomePageRoutes.tsx
+++ b/spiffworkflow-frontend/src/routes/HomePageRoutes.tsx
@@ -35,12 +35,12 @@ export default function HomePageRoutes() {
         <Tabs selectedIndex={selectedTabIndex}>
           <TabList aria-label="List of tabs">
             {/* <Tab onClick={() => navigate('/tasks/my-tasks')}>My Tasks</Tab> */}
-            <Tab onClick={() => navigate('/tasks/grouped')}>Tasks</Tab>
+            <Tab onClick={() => navigate('/tasks/grouped')}>In Progress</Tab>
             <Tab onClick={() => navigate('/tasks/completed-instances')}>
-              Completed Instances
+              Completed
             </Tab>
             <Tab onClick={() => navigate('/tasks/create-new-instance')}>
-              Create New Instance +
+              Start New +
             </Tab>
           </TabList>
         </Tabs>
diff --git a/spiffworkflow-frontend/src/routes/ProcessModelShow.tsx b/spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
index d654a51e..32d122f7 100644
--- a/spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
@@ -101,6 +101,7 @@ export default function ProcessModelShow() {
             </Link>
             ).
           </p>
+          <br />
         </div>
       );
     }
@@ -544,16 +545,17 @@ export default function ProcessModelShow() {
             a={targetUris.processInstanceActionPath}
             ability={ability}
           >
-            <ProcessInstanceRun
-              processModel={processModel}
-              onSuccessCallback={setProcessInstance}
-            />
+            <>
+              <ProcessInstanceRun
+                processModel={processModel}
+                onSuccessCallback={setProcessInstance}
+              />
+              <br />
+              <br />
+            </>
           </Can>
         </Stack>
-        <br />
-        <br />
         {processInstanceRunResultTag()}
-        <br />
         <Can I="GET" a={targetUris.processInstanceListPath} ability={ability}>
           {processInstanceListTableButton()}
           <ProcessInstanceListTable
@@ -563,6 +565,7 @@ export default function ProcessModelShow() {
             showReports={false}
           />
           <br />
+          <br />
         </Can>
         {processModelButtons()}
       </>