diff --git a/spiffworkflow-frontend/src/interfaces.ts b/spiffworkflow-frontend/src/interfaces.ts
index 4e65bd02..2b1a457d 100644
--- a/spiffworkflow-frontend/src/interfaces.ts
+++ b/spiffworkflow-frontend/src/interfaces.ts
@@ -300,3 +300,20 @@ export interface JsonSchemaForm {
process_model_id: string;
required: string[];
}
+
+export interface ProcessInstanceLogEntry {
+ bpmn_process_definition_identifier: string;
+ bpmn_process_definition_name: string;
+ bpmn_task_type: string;
+ event_type: string;
+ spiff_task_guid: string;
+ task_definition_identifier: string;
+ task_guid: string;
+ timestamp: number;
+ id: number;
+ process_instance_id: number;
+
+ task_definition_name?: string;
+ user_id?: number;
+ username?: string;
+}
diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx
index 4f1d39be..797ba254 100644
--- a/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react';
// @ts-ignore
import { Table, Tabs, TabList, Tab } from '@carbon/react';
-import { useParams, useSearchParams } from 'react-router-dom';
+import { Link, useParams, useSearchParams } from 'react-router-dom';
import PaginationForTable from '../components/PaginationForTable';
import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import {
@@ -10,6 +10,7 @@ import {
} from '../helpers';
import HttpService from '../services/HttpService';
import { useUriListForPermissions } from '../hooks/UriListForPermissions';
+import { ProcessInstanceLogEntry } from '../interfaces';
type OwnProps = {
variant: string;
@@ -50,25 +51,26 @@ export default function ProcessInstanceLogList({ variant }: OwnProps) {
isDetailedView,
]);
- const getTableRow = (row: any) => {
+ const getTableRow = (logEntry: ProcessInstanceLogEntry) => {
const tableRow = [];
const taskNameCell = (
- {row.task_definition_name ||
- (row.bpmn_task_type === 'StartEvent' ? 'Process Started' : '') ||
- (row.bpmn_task_type === 'EndEvent' ? 'Process Ended' : '')}
+ {logEntry.spiff_task_guid ||
+ logEntry.task_definition_name ||
+ (logEntry.bpmn_task_type === 'StartEvent' ? 'Process Started' : '') ||
+ (logEntry.bpmn_task_type === 'EndEvent' ? 'Process Ended' : '')}
|
);
const bpmnProcessCell = (
- {row.bpmn_process_definition_name ||
- row.bpmn_process_definition_identifier}
+ {logEntry.bpmn_process_definition_name ||
+ logEntry.bpmn_process_definition_identifier}
|
);
if (isDetailedView) {
tableRow.push(
<>
- {row.id} |
+ {logEntry.id} |
{bpmnProcessCell}
{taskNameCell}
>
@@ -84,24 +86,37 @@ export default function ProcessInstanceLogList({ variant }: OwnProps) {
if (isDetailedView) {
tableRow.push(
<>
- {row.bpmn_task_type} |
- {row.event_type} |
+ {logEntry.bpmn_task_type} |
+ {logEntry.event_type} |
- {row.username || (
+ {logEntry.username || (
system
)}
|
>
);
}
- tableRow.push({convertSecondsToFormattedDateTime(row.timestamp)} | );
- return {tableRow}
;
+ // tableRow.push({convertSecondsToFormattedDateTime(logEntry.timestamp)} | );
+ tableRow.push(
+
+
+ {convertSecondsToFormattedDateTime(logEntry.timestamp)}
+
+ |
+ );
+
+ return {tableRow}
;
};
const buildTable = () => {
- const rows = processInstanceLogs.map((row) => {
- return getTableRow(row);
- });
+ const rows = processInstanceLogs.map(
+ (logEntry: ProcessInstanceLogEntry) => {
+ return getTableRow(logEntry);
+ }
+ );
const tableHeaders = [];
if (isDetailedView) {
diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
index 74e6e1a8..1cfc36c2 100644
--- a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
@@ -608,7 +608,7 @@ export default function ProcessInstanceShow({ variant }: OwnProps) {
const isCurrentTask = (task: Task) => {
const subprocessTypes = [
'Subprocess',
- 'Call Activity',
+ 'CallActivity',
'Transactional Subprocess',
];
return (