diff --git a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx index 28cfd3c8..739c8948 100644 --- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx +++ b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx @@ -23,7 +23,6 @@ import { TimePicker, // @ts-ignore } from '@carbon/react'; -import { ReactElement } from 'react-markdown/lib/react-markdown'; import { PROCESS_STATUSES, DATE_FORMAT, DATE_FORMAT_CARBON } from '../config'; import { convertDateAndTimeStringsToSeconds, @@ -59,7 +58,7 @@ type OwnProps = { perPageOptions?: number[]; showReports?: boolean; reportIdentifier?: string; - textToShowIfEmpty?: ReactElement; + textToShowIfEmpty?: string; }; interface dateParameters { @@ -784,7 +783,7 @@ export default function ProcessInstanceListTable({ ); } if (textToShowIfEmpty) { - return textToShowIfEmpty; + return

{textToShowIfEmpty}

; } return null; diff --git a/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx b/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx index a60f7d83..7a01a7c4 100644 --- a/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx +++ b/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx @@ -111,7 +111,11 @@ export default function MyOpenProcesses() { const tasksComponent = () => { if (pagination && pagination.total < 1) { - return

No tasks waiting for you

; + return ( +

+ There are no tasks for processes you started at this time. +

+ ); } const { page, perPage } = getPageInfoFromSearchParams( searchParams, @@ -120,23 +124,25 @@ export default function MyOpenProcesses() { paginationQueryParamPrefix ); return ( - <> -

Tasks for my open processes

- - + ); }; return ( <> -

Tasks for my open processes

+

Tasks for my open processes

+

+ These tasks are for processes you started which are not complete. You + may not have an action to take at this time. See below for tasks waiting + on you. +

{tasksComponent()} ); diff --git a/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx b/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx index d4765ef9..cd0eb048 100644 --- a/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx +++ b/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx @@ -112,7 +112,11 @@ export default function TasksWaitingForMe() { const tasksComponent = () => { if (pagination && pagination.total < 1) { - return

No tasks waiting for you

; + return ( +

+ You have no task assignments at this time. +

+ ); } const { page, perPage } = getPageInfoFromSearchParams( searchParams, @@ -134,7 +138,11 @@ export default function TasksWaitingForMe() { return ( <> -

Tasks waiting for me

+

Tasks waiting for me

+

+ These processes are waiting on you to complete the next task. All are + processes created by others that are now actionable by you. +

{tasksComponent()} ); diff --git a/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx b/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx index 993ad800..05a970ef 100644 --- a/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx +++ b/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx @@ -113,7 +113,11 @@ export default function TasksWaitingForMyGroups() { const tasksComponent = () => { if (pagination && pagination.total < 1) { - return

No tasks waiting for you

; + return ( +

+ Your groups have no task assignments at this time. +

+ ); } const { page, perPage } = getPageInfoFromSearchParams( searchParams, @@ -135,7 +139,11 @@ export default function TasksWaitingForMyGroups() { return ( <> -

Tasks waiting for my groups

+

Tasks waiting for my groups

+

+ This is a list of tasks for groups you belong to that can be completed + by any member of the group. +

{tasksComponent()} ); diff --git a/spiffworkflow-frontend/src/index.css b/spiffworkflow-frontend/src/index.css index 00f94768..6985ef9f 100644 --- a/spiffworkflow-frontend/src/index.css +++ b/spiffworkflow-frontend/src/index.css @@ -260,3 +260,17 @@ in on this with the react-jsonschema-form repo. This is just a patch fix to allo td.actions-cell { width: 1em; } + +.no-results-message { + font-style: italic; + margin-left: 2em; + margin-top: 1em; + font-size: 14px; +} + +.data-table-description { + font-size: 14px; + line-height: 18px; + letter-spacing: 0.16px; + color: #525252; +} diff --git a/spiffworkflow-frontend/src/routes/CompletedInstances.tsx b/spiffworkflow-frontend/src/routes/CompletedInstances.tsx index 62b3ca86..734e80d5 100644 --- a/spiffworkflow-frontend/src/routes/CompletedInstances.tsx +++ b/spiffworkflow-frontend/src/routes/CompletedInstances.tsx @@ -3,32 +3,37 @@ import ProcessInstanceListTable from '../components/ProcessInstanceListTable'; export default function CompletedInstances() { return ( <> -

Initiated By Me

+

My completed instances

+

+ This is a list of instances you started that are now complete. +

No completed instances

} + textToShowIfEmpty="No completed instances" /> -

With Tasks Completed By Me

+

Tasks actions by me

+

No completed instances

} + textToShowIfEmpty="No completed instances" /> -

With Tasks Completed By My Group

+

With Tasks Completed By My Group

+

No completed instances

} + textToShowIfEmpty="No completed instances" /> );