some ui changes w/ burnettk
This commit is contained in:
parent
b0e5950405
commit
851be377ff
|
@ -608,7 +608,7 @@ export default function ProcessInstanceListTable({
|
||||||
const buildTable = () => {
|
const buildTable = () => {
|
||||||
const headerLabels: Record<string, string> = {
|
const headerLabels: Record<string, string> = {
|
||||||
id: 'Id',
|
id: 'Id',
|
||||||
process_model_identifier: 'Process Model',
|
process_model_identifier: 'Process',
|
||||||
start_in_seconds: 'Start Time',
|
start_in_seconds: 'Start Time',
|
||||||
end_in_seconds: 'End Time',
|
end_in_seconds: 'End Time',
|
||||||
status: 'Status',
|
status: 'Status',
|
||||||
|
|
|
@ -119,7 +119,7 @@ export default function ProcessInstanceRun({
|
||||||
return (
|
return (
|
||||||
<Can I="POST" a={processInstanceActionPath} ability={ability}>
|
<Can I="POST" a={processInstanceActionPath} ability={ability}>
|
||||||
<Button onClick={processInstanceCreateAndRun} className={className}>
|
<Button onClick={processInstanceCreateAndRun} className={className}>
|
||||||
Run
|
Start
|
||||||
</Button>
|
</Button>
|
||||||
</Can>
|
</Can>
|
||||||
);
|
);
|
||||||
|
|
|
@ -65,7 +65,6 @@ export default function MyOpenProcesses() {
|
||||||
>
|
>
|
||||||
{rowToUse.task_title}
|
{rowToUse.task_title}
|
||||||
</td>
|
</td>
|
||||||
<td>{rowToUse.process_instance_status}</td>
|
|
||||||
<td>{rowToUse.group_identifier || '-'}</td>
|
<td>{rowToUse.group_identifier || '-'}</td>
|
||||||
<td>
|
<td>
|
||||||
{convertSecondsToFormattedDateTime(
|
{convertSecondsToFormattedDateTime(
|
||||||
|
@ -94,13 +93,12 @@ export default function MyOpenProcesses() {
|
||||||
<Table striped bordered>
|
<Table striped bordered>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Process Model</th>
|
<th>Process</th>
|
||||||
<th>Process Instance</th>
|
<th>Id</th>
|
||||||
<th>Task Name</th>
|
<th>Task</th>
|
||||||
<th>Process Instance Status</th>
|
<th>Waiting For</th>
|
||||||
<th>Assigned Group</th>
|
<th>Date Started</th>
|
||||||
<th>Process Started</th>
|
<th>Last Updated</th>
|
||||||
<th>Process Updated</th>
|
|
||||||
<th>Actions</th>
|
<th>Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
|
@ -56,7 +56,7 @@ export default function TasksWaitingForMe() {
|
||||||
data-qa="process-instance-show-link"
|
data-qa="process-instance-show-link"
|
||||||
to={`/admin/process-models/${modifiedProcessModelIdentifier}/process-instances/${rowToUse.process_instance_id}`}
|
to={`/admin/process-models/${modifiedProcessModelIdentifier}/process-instances/${rowToUse.process_instance_id}`}
|
||||||
>
|
>
|
||||||
View {rowToUse.process_instance_id}
|
{rowToUse.process_instance_id}
|
||||||
</Link>
|
</Link>
|
||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
|
@ -65,7 +65,6 @@ export default function TasksWaitingForMe() {
|
||||||
{rowToUse.task_title}
|
{rowToUse.task_title}
|
||||||
</td>
|
</td>
|
||||||
<td>{rowToUse.username}</td>
|
<td>{rowToUse.username}</td>
|
||||||
<td>{rowToUse.process_instance_status}</td>
|
|
||||||
<td>{rowToUse.group_identifier || '-'}</td>
|
<td>{rowToUse.group_identifier || '-'}</td>
|
||||||
<td>
|
<td>
|
||||||
{convertSecondsToFormattedDateTime(
|
{convertSecondsToFormattedDateTime(
|
||||||
|
@ -94,14 +93,13 @@ export default function TasksWaitingForMe() {
|
||||||
<Table striped bordered>
|
<Table striped bordered>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Process Model</th>
|
<th>Process</th>
|
||||||
<th>Process Instance</th>
|
<th>Id</th>
|
||||||
<th>Task Name</th>
|
<th>Task</th>
|
||||||
<th>Process Started By</th>
|
<th>Started By</th>
|
||||||
<th>Process Instance Status</th>
|
<th>Waiting For</th>
|
||||||
<th>Assigned Group</th>
|
<th>Date Started</th>
|
||||||
<th>Process Started</th>
|
<th>Last Updated</th>
|
||||||
<th>Process Updated</th>
|
|
||||||
<th>Actions</th>
|
<th>Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
|
@ -66,7 +66,6 @@ export default function TasksWaitingForMyGroups() {
|
||||||
{rowToUse.task_title}
|
{rowToUse.task_title}
|
||||||
</td>
|
</td>
|
||||||
<td>{rowToUse.username}</td>
|
<td>{rowToUse.username}</td>
|
||||||
<td>{rowToUse.process_instance_status}</td>
|
|
||||||
<td>{rowToUse.group_identifier || '-'}</td>
|
<td>{rowToUse.group_identifier || '-'}</td>
|
||||||
<td>
|
<td>
|
||||||
{convertSecondsToFormattedDateTime(
|
{convertSecondsToFormattedDateTime(
|
||||||
|
@ -95,14 +94,13 @@ export default function TasksWaitingForMyGroups() {
|
||||||
<Table striped bordered>
|
<Table striped bordered>
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Process Model</th>
|
<th>Process</th>
|
||||||
<th>Process Instance</th>
|
<th>Id</th>
|
||||||
<th>Task Name</th>
|
<th>Task</th>
|
||||||
<th>Process Started By</th>
|
<th>Started By</th>
|
||||||
<th>Process Instance Status</th>
|
<th>Waiting For</th>
|
||||||
<th>Assigned Group</th>
|
<th>Date Started</th>
|
||||||
<th>Process Started</th>
|
<th>Last Updated</th>
|
||||||
<th>Process Updated</th>
|
|
||||||
<th>Actions</th>
|
<th>Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
|
@ -273,4 +273,5 @@ td.actions-cell {
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
letter-spacing: 0.16px;
|
letter-spacing: 0.16px;
|
||||||
color: #525252;
|
color: #525252;
|
||||||
|
margin-bottom: 1em;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,6 @@ import ProcessModelListTiles from '../components/ProcessModelListTiles';
|
||||||
|
|
||||||
export default function CreateNewInstance() {
|
export default function CreateNewInstance() {
|
||||||
return (
|
return (
|
||||||
<ProcessModelListTiles
|
<ProcessModelListTiles headerElement={<h2>Processes you can start</h2>} />
|
||||||
headerElement={<h1>Process models available to you</h1>}
|
|
||||||
/>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,12 +35,12 @@ export default function HomePageRoutes() {
|
||||||
<Tabs selectedIndex={selectedTabIndex}>
|
<Tabs selectedIndex={selectedTabIndex}>
|
||||||
<TabList aria-label="List of tabs">
|
<TabList aria-label="List of tabs">
|
||||||
{/* <Tab onClick={() => navigate('/tasks/my-tasks')}>My Tasks</Tab> */}
|
{/* <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')}>
|
<Tab onClick={() => navigate('/tasks/completed-instances')}>
|
||||||
Completed Instances
|
Completed
|
||||||
</Tab>
|
</Tab>
|
||||||
<Tab onClick={() => navigate('/tasks/create-new-instance')}>
|
<Tab onClick={() => navigate('/tasks/create-new-instance')}>
|
||||||
Create New Instance +
|
Start New +
|
||||||
</Tab>
|
</Tab>
|
||||||
</TabList>
|
</TabList>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
|
|
@ -101,6 +101,7 @@ export default function ProcessModelShow() {
|
||||||
</Link>
|
</Link>
|
||||||
).
|
).
|
||||||
</p>
|
</p>
|
||||||
|
<br />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -544,16 +545,17 @@ export default function ProcessModelShow() {
|
||||||
a={targetUris.processInstanceActionPath}
|
a={targetUris.processInstanceActionPath}
|
||||||
ability={ability}
|
ability={ability}
|
||||||
>
|
>
|
||||||
<ProcessInstanceRun
|
<>
|
||||||
processModel={processModel}
|
<ProcessInstanceRun
|
||||||
onSuccessCallback={setProcessInstance}
|
processModel={processModel}
|
||||||
/>
|
onSuccessCallback={setProcessInstance}
|
||||||
|
/>
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
</>
|
||||||
</Can>
|
</Can>
|
||||||
</Stack>
|
</Stack>
|
||||||
<br />
|
|
||||||
<br />
|
|
||||||
{processInstanceRunResultTag()}
|
{processInstanceRunResultTag()}
|
||||||
<br />
|
|
||||||
<Can I="GET" a={targetUris.processInstanceListPath} ability={ability}>
|
<Can I="GET" a={targetUris.processInstanceListPath} ability={ability}>
|
||||||
{processInstanceListTableButton()}
|
{processInstanceListTableButton()}
|
||||||
<ProcessInstanceListTable
|
<ProcessInstanceListTable
|
||||||
|
@ -563,6 +565,7 @@ export default function ProcessModelShow() {
|
||||||
showReports={false}
|
showReports={false}
|
||||||
/>
|
/>
|
||||||
<br />
|
<br />
|
||||||
|
<br />
|
||||||
</Can>
|
</Can>
|
||||||
{processModelButtons()}
|
{processModelButtons()}
|
||||||
</>
|
</>
|
||||||
|
|
Loading…
Reference in New Issue