renamed home page table headers and added filter table link to the completed instances page w/ burnettk

This commit is contained in:
jasquat 2023-05-01 15:52:11 -04:00
parent 2084befdb0
commit 22138e1bf1
4 changed files with 40 additions and 49 deletions

View File

@ -1,16 +0,0 @@
import ProcessInstanceListTable from './ProcessInstanceListTable';
const paginationQueryParamPrefix = 'my_completed_instances';
export default function MyCompletedInstances() {
return (
<ProcessInstanceListTable
filtersEnabled={false}
paginationQueryParamPrefix={paginationQueryParamPrefix}
perPageOptions={[2, 5, 25]}
reportIdentifier="system_report_completed_instances_initiated_by_me"
showReports={false}
showActionsColumn
/>
);
}

View File

@ -1704,7 +1704,7 @@ export default function ProcessInstanceListTable({
}
return (
<Grid fullWidth condensed>
<Column sm={{ span: 3 }} md={{ span: 4 }} lg={{ span: 3 }}>
<Column sm={{ span: 3 }} md={{ span: 7 }} lg={{ span: 15 }}>
{headerElement}
</Column>
{filterButtonLink}

View File

@ -19,43 +19,54 @@ export default function CompletedInstances() {
return userGroups.map((userGroup: string) => {
const titleText = `This is a list of instances with tasks that were completed by the ${userGroup} group.`;
const headerElement = (
<h2 title={titleText} className="process-instance-table-header">
Instances with tasks completed by <strong>{userGroup}</strong>
</h2>
);
return (
<>
<h2 title={titleText} className="process-instance-table-header">
With tasks completed by <strong>{userGroup}</strong>
</h2>
<ProcessInstanceListTable
filtersEnabled={false}
paginationQueryParamPrefix="group_completed_instances"
paginationClassName="with-large-bottom-margin"
perPageOptions={[2, 5, 25]}
reportIdentifier="system_report_completed_instances"
showReports={false}
textToShowIfEmpty="This group has no completed instances at this time."
additionalReportFilters={[
{ field_name: 'user_group_identifier', field_value: userGroup },
]}
showActionsColumn
/>
</>
<ProcessInstanceListTable
headerElement={headerElement}
showLinkToReport
filtersEnabled={false}
paginationQueryParamPrefix="group_completed_instances"
paginationClassName="with-large-bottom-margin"
perPageOptions={[2, 5, 25]}
reportIdentifier="system_report_completed_instances"
showReports={false}
textToShowIfEmpty="This group has no completed instances at this time."
additionalReportFilters={[
{ field_name: 'user_group_identifier', field_value: userGroup },
]}
showActionsColumn
/>
);
});
};
const startedByMeTitleText =
'This is a list of instances you started that are now complete.';
const startedByMeHeaderElement = (
<h2 title={startedByMeTitleText} className="process-instance-table-header">
Started by me
</h2>
);
const withTasksCompletedByMeTitleText =
'This is a list of instances where you have completed tasks.';
const withTasksHeaderElement = (
<h2
title={withTasksCompletedByMeTitleText}
className="process-instance-table-header"
>
Instances with tasks completed by me
</h2>
);
return (
<>
<h2
title={startedByMeTitleText}
className="process-instance-table-header"
>
Started by me
</h2>
<ProcessInstanceListTable
headerElement={startedByMeHeaderElement}
showLinkToReport
filtersEnabled={false}
paginationQueryParamPrefix="my_completed_instances"
perPageOptions={[2, 5, 25]}
@ -66,13 +77,9 @@ export default function CompletedInstances() {
autoReload
showActionsColumn
/>
<h2
title={withTasksCompletedByMeTitleText}
className="process-instance-table-header"
>
With tasks completed by me
</h2>
<ProcessInstanceListTable
headerElement={withTasksHeaderElement}
showLinkToReport
filtersEnabled={false}
paginationQueryParamPrefix="my_completed_tasks"
perPageOptions={[2, 5, 25]}

View File

@ -22,7 +22,7 @@ export default function InProgressInstances() {
const titleText = `This is a list of instances with tasks that are waiting for the ${userGroup} group.`;
const headerElement = (
<h2 title={titleText} className="process-instance-table-header">
Waiting for <strong>{userGroup}</strong>
Instances with tasks waiting for <strong>{userGroup}</strong>
</h2>
);
return (
@ -61,7 +61,7 @@ export default function InProgressInstances() {
'This is a list of instances that have tasks that you can complete.';
const waitingForMeHeaderElement = (
<h2 title={waitingForMeTitleText} className="process-instance-table-header">
Waiting for me
Instances with tasks waiting for me
</h2>
);