+ |
+
+ {rowToUse.process_model_display_name}
+
+ |
+
+
+ View {rowToUse.process_instance_id}
+
+ |
+
+ {rowToUse.task_title}
+ |
+ {rowToUse.process_instance_status} |
+ {rowToUse.group_identifier || '-'} |
+
+ {convertSecondsToFormattedDateTime(
+ rowToUse.created_at_in_seconds
+ ) || '-'}
+ |
+
+ {convertSecondsToFormattedDateTime(
+ rowToUse.updated_at_in_seconds
+ ) || '-'}
+ |
+
+
+ |
+
+ );
+ });
+ return (
+ (0);
+ const navigate = useNavigate();
+
+ useEffect(() => {
+ setErrorMessage(null);
+ let newSelectedTabIndex = 0;
+ if (location.pathname.match(/^\/tasks\/grouped\b/)) {
+ newSelectedTabIndex = 1;
+ }
+ setSelectedTabIndex(newSelectedTabIndex);
+ }, [location, setErrorMessage]);
+
+ return (
+ <>
+
+
+ navigate('/tasks/my-tasks')}>My Tasks
+ navigate('/tasks/grouped')}>Grouped Tasks
+
+
+
+
+ } />
+ } />
+ } />
+ } />
+
+
+ );
+}
diff --git a/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx b/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx
index 89bd6ac9..83ea1e43 100644
--- a/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx
+++ b/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx
@@ -65,7 +65,7 @@ export default function MessageInstanceList() {
{rowToUse.message_identifier} |
{rowToUse.message_type} |
- {rowToUse.failure_cause} |
+ {rowToUse.failure_cause || '-'} |
{rowToUse.status} |
{convertSecondsToFormattedDate(rowToUse.created_at_in_seconds)}
diff --git a/spiffworkflow-frontend/src/routes/HomePage.tsx b/spiffworkflow-frontend/src/routes/MyTasks.tsx
similarity index 99%
rename from spiffworkflow-frontend/src/routes/HomePage.tsx
rename to spiffworkflow-frontend/src/routes/MyTasks.tsx
index 71fda73f..6b6eabd2 100644
--- a/spiffworkflow-frontend/src/routes/HomePage.tsx
+++ b/spiffworkflow-frontend/src/routes/MyTasks.tsx
@@ -12,7 +12,7 @@ import { PaginationObject, RecentProcessModel } from '../interfaces';
const PER_PAGE_FOR_TASKS_ON_HOME_PAGE = 5;
-export default function HomePage() {
+export default function MyTasks() {
const [searchParams] = useSearchParams();
const [tasks, setTasks] = useState([]);
const [pagination, setPagination] = useState(null);
diff --git a/spiffworkflow-frontend/src/routes/ProcessGroupShow.tsx b/spiffworkflow-frontend/src/routes/ProcessGroupShow.tsx
index 57da58e7..a35b003b 100644
--- a/spiffworkflow-frontend/src/routes/ProcessGroupShow.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessGroupShow.tsx
@@ -10,7 +10,7 @@ import {
modifyProcessModelPath,
unModifyProcessModelPath,
} from '../helpers';
-import { ProcessGroup, ProcessModel } from '../interfaces';
+import { PaginationObject, ProcessGroup, ProcessModel } from '../interfaces';
export default function ProcessGroupShow() {
const params = useParams();
@@ -19,8 +19,10 @@ export default function ProcessGroupShow() {
const [processGroup, setProcessGroup] = useState(null);
const [processModels, setProcessModels] = useState([]);
const [processGroups, setProcessGroups] = useState([]);
- const [modelPagination, setModelPagination] = useState(null);
- const [groupPagination, setGroupPagination] = useState(null);
+ const [modelPagination, setModelPagination] =
+ useState(null);
+ const [groupPagination, setGroupPagination] =
+ useState(null);
useEffect(() => {
const { page, perPage } = getPageInfoFromSearchParams(searchParams);
@@ -58,7 +60,9 @@ export default function ProcessGroupShow() {
return null;
}
const rows = processModels.map((row: ProcessModel) => {
- const modifiedProcessModelId: String = modifyProcessModelPath((row as any).id);
+ const modifiedProcessModelId: String = modifyProcessModelPath(
+ (row as any).id
+ );
return (
@@ -136,6 +140,7 @@ export default function ProcessGroupShow() {
['', `process_group:${processGroup.id}`],
]}
/>
+ Process Group: {processGroup.display_name}
);
diff --git a/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx b/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx
index b7c05734..338b04e3 100644
--- a/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx
@@ -276,26 +276,6 @@ export default function ProcessInstanceList() {
);
};
-
- const getSearchParamsAsQueryString = () => {
- let queryParamString = '';
- Object.keys(parametersToAlwaysFilterBy).forEach((paramName) => {
- const searchParamValue = searchParams.get(paramName);
- if (searchParamValue) {
- queryParamString += `&${paramName}=${searchParamValue}`;
- }
- });
-
- Object.keys(parametersToGetFromSearchParams).forEach(
- (paramName: string) => {
- if (searchParams.get(paramName)) {
- queryParamString += `&${paramName}=${searchParams.get(paramName)}`;
- }
- }
- );
- return queryParamString;
- };
-
const processStatusSearch = () => {
return (
);
};
-
const clearFilters = () => {
setProcessModelSelection(null);
setProcessStatusSelection([]);
@@ -324,7 +303,6 @@ export default function ProcessInstanceList() {
setEndFrom('');
setEndTo('');
};
-
const filterOptions = () => {
if (!showFilterOptions) {
return null;
@@ -385,6 +363,33 @@ export default function ProcessInstanceList() {
);
};
+ const toggleShowFilterOptions = () => {
+ setShowFilterOptions(!showFilterOptions);
+ };
+ const filterComponent = () => {
+ return (
+ <>
+
+
+
+
+
+ {filterOptions()}
+
+ );
+ };
const buildTable = () => {
const headerLabels: Record = {
@@ -493,12 +498,27 @@ export default function ProcessInstanceList() {
);
};
- const processInstanceTitleElement = () => {
- return Process Instances;
+ const getSearchParamsAsQueryString = () => {
+ let queryParamString = '';
+ Object.keys(parametersToAlwaysFilterBy).forEach((paramName) => {
+ const searchParamValue = searchParams.get(paramName);
+ if (searchParamValue) {
+ queryParamString += `&${paramName}=${searchParamValue}`;
+ }
+ });
+
+ Object.keys(parametersToGetFromSearchParams).forEach(
+ (paramName: string) => {
+ if (searchParams.get(paramName)) {
+ queryParamString += `&${paramName}=${searchParams.get(paramName)}`;
+ }
+ }
+ );
+ return queryParamString;
};
- const toggleShowFilterOptions = () => {
- setShowFilterOptions(!showFilterOptions);
+ const processInstanceTitleElement = () => {
+ return Process Instances;
};
if (pagination) {
@@ -507,24 +527,7 @@ export default function ProcessInstanceList() {
<>
{processInstanceBreadcrumbElement()}
{processInstanceTitleElement()}
-
-
-
-
-
- {filterOptions()}
+ {filterComponent()}
+
-
+
@@ -532,11 +533,11 @@ export default function ProcessModelShow() {
{processInstanceResultTag()}
- {processModelButtons()}
-
Process Instances
{processInstancesUl()}
+
+ {processModelButtons()}
);
}
| |