some ui changes w/ burnettk

This commit is contained in:
jasquat 2022-11-23 18:44:51 -05:00
parent b0e5950405
commit 851be377ff
9 changed files with 38 additions and 42 deletions

View File

@ -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',

View File

@ -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>
);

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -273,4 +273,5 @@ td.actions-cell {
line-height: 18px;
letter-spacing: 0.16px;
color: #525252;
margin-bottom: 1em;
}

View File

@ -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>} />
);
}

View File

@ -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>

View File

@ -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()}
</>