sartography/spiff-arena
1
0
Fork 0
mirror of https://github.com/sartography/spiff-arena.git synced 2025-02-28 09:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed modifyProcessModelPath to modifyProcessIdentifierForPathParam w/ burnettk

Browse Source
This commit is contained in:
jasquat 2022-11-22 10:56:40 -05:00
parent defecafc5d
commit b25d620777
22 changed files with 98 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spiffworkflow-frontend/src/components/ProcessGroupForm.tsx
View File

@ -2,7 +2,7 @@ import { useState } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
// @ts-ignore // @ts-ignore
import { Button, ButtonSet, Form, Stack, TextInput } from '@carbon/react'; import { Button, ButtonSet, Form, Stack, TextInput } from '@carbon/react';
import { modifyProcessModelPath, slugifyString } from '../helpers'; import { modifyProcessIdentifierForPathParam, slugifyString } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { ProcessGroup } from '../interfaces'; import { ProcessGroup } from '../interfaces';
import ButtonWithConfirmation from './ButtonWithConfirmation'; import ButtonWithConfirmation from './ButtonWithConfirmation';
@ -28,7 +28,9 @@ export default function ProcessGroupForm({
const navigateToProcessGroup = (_result: any) => { const navigateToProcessGroup = (_result: any) => {
if (newProcessGroupId) { if (newProcessGroupId) {
navigate( navigate(
`/admin/process-groups/${modifyProcessModelPath(newProcessGroupId)}` `/admin/process-groups/${modifyProcessIdentifierForPathParam(
newProcessGroupId
)}`
); );
} }
}; };
@ -43,7 +45,9 @@ export default function ProcessGroupForm({
const deleteProcessGroup = () => { const deleteProcessGroup = () => {
HttpService.makeCallToBackend({ HttpService.makeCallToBackend({
path: `/process-groups/${modifyProcessModelPath(processGroup.id)}`, path: `/process-groups/${modifyProcessIdentifierForPathParam(
processGroup.id
)}`,
successCallback: navigateToProcessGroups, successCallback: navigateToProcessGroups,
httpMethod: 'DELETE', httpMethod: 'DELETE',
}); });
@ -68,7 +72,9 @@ export default function ProcessGroupForm({
} }
let path = '/process-groups'; let path = '/process-groups';
if (mode === 'edit') { if (mode === 'edit') {
path = `/process-groups/${modifyProcessModelPath(processGroup.id)}`; path = `/process-groups/${modifyProcessIdentifierForPathParam(
processGroup.id
)}`;
} }
let httpMethod = 'POST'; let httpMethod = 'POST';
if (mode === 'edit') { if (mode === 'edit') {

9
spiffworkflow-frontend/src/components/ProcessGroupListTiles.tsx
View File

@ -10,7 +10,10 @@ import {
} from '@carbon/react'; } from '@carbon/react';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { ProcessGroup } from '../interfaces'; import { ProcessGroup } from '../interfaces';
import { modifyProcessModelPath, truncateString } from '../helpers'; import {
modifyProcessIdentifierForPathParam,
truncateString,
} from '../helpers';
type OwnProps = { type OwnProps = {
processGroup?: ProcessGroup; processGroup?: ProcessGroup;
@ -53,7 +56,9 @@ export default function ProcessGroupListTiles({
<ClickableTile <ClickableTile
id={`process-group-tile-${row.id}`} id={`process-group-tile-${row.id}`}
className="tile-process-group" className="tile-process-group"
href={`/admin/process-groups/${modifyProcessModelPath(row.id)}`} href={`/admin/process-groups/${modifyProcessIdentifierForPathParam(
row.id
)}`}
> >
<div className="tile-process-group-content-container"> <div className="tile-process-group-content-container">
<ArrowRight /> <ArrowRight />

11
spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
View File

@ -32,7 +32,7 @@ import {
convertSecondsToFormattedTimeHoursMinutes, convertSecondsToFormattedTimeHoursMinutes,
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
getProcessModelFullIdentifierFromSearchParams, getProcessModelFullIdentifierFromSearchParams,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import PaginationForTable from './PaginationForTable'; import PaginationForTable from './PaginationForTable';
@ -611,9 +611,8 @@ export default function ProcessInstanceListTable({
}); });
const formatProcessInstanceId = (row: any, id: any) => { const formatProcessInstanceId = (row: any, id: any) => {
const modifiedProcessModelId: String = modifyProcessModelPath( const modifiedProcessModelId: String =
row.process_model_identifier modifyProcessIdentifierForPathParam(row.process_model_identifier);
);
return ( return (
<Link <Link
data-qa="process-instance-show-link" data-qa="process-instance-show-link"
@ -626,7 +625,9 @@ export default function ProcessInstanceListTable({
const formatProcessModelIdentifier = (_row: any, identifier: any) => { const formatProcessModelIdentifier = (_row: any, identifier: any) => {
return ( return (
<Link <Link
to={`/admin/process-models/${modifyProcessModelPath(identifier)}`} to={`/admin/process-models/${modifyProcessIdentifierForPathParam(
identifier
)}`}
> >
{identifier} {identifier}
</Link> </Link>

6
spiffworkflow-frontend/src/components/ProcessInstanceRun.tsx
View File

@ -7,7 +7,7 @@ import {
import { ProcessModel } from '../interfaces'; import { ProcessModel } from '../interfaces';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import ErrorContext from '../contexts/ErrorContext'; import ErrorContext from '../contexts/ErrorContext';
import { modifyProcessModelPath } from '../helpers'; import { modifyProcessIdentifierForPathParam } from '../helpers';
type OwnProps = { type OwnProps = {
processModel: ProcessModel; processModel: ProcessModel;
@ -22,7 +22,9 @@ export default function ProcessInstanceRun({
}: OwnProps) { }: OwnProps) {
const navigate = useNavigate(); const navigate = useNavigate();
const setErrorMessage = (useContext as any)(ErrorContext)[1]; const setErrorMessage = (useContext as any)(ErrorContext)[1];
const modifiedProcessModelId = modifyProcessModelPath(processModel.id); const modifiedProcessModelId = modifyProcessIdentifierForPathParam(
processModel.id
);
const onProcessInstanceRun = (processInstance: any) => { const onProcessInstanceRun = (processInstance: any) => {
// FIXME: ensure that the task is actually for the current user as well // FIXME: ensure that the task is actually for the current user as well

9
spiffworkflow-frontend/src/components/ProcessModelForm.tsx
View File

@ -2,7 +2,7 @@ import { useState } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
// @ts-ignore // @ts-ignore
import { Button, ButtonSet, Form, Stack, TextInput } from '@carbon/react'; import { Button, ButtonSet, Form, Stack, TextInput } from '@carbon/react';
import { modifyProcessModelPath, slugifyString } from '../helpers'; import { modifyProcessIdentifierForPathParam, slugifyString } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { ProcessModel } from '../interfaces'; import { ProcessModel } from '../interfaces';
@ -27,9 +27,8 @@ export default function ProcessModelForm({
const navigateToProcessModel = (result: ProcessModel) => { const navigateToProcessModel = (result: ProcessModel) => {
if ('id' in result) { if ('id' in result) {
const modifiedProcessModelPathFromResult = modifyProcessModelPath( const modifiedProcessModelPathFromResult =
result.id modifyProcessIdentifierForPathParam(result.id);
);
navigate(`/admin/process-models/${modifiedProcessModelPathFromResult}`); navigate(`/admin/process-models/${modifiedProcessModelPathFromResult}`);
} }
}; };
@ -52,7 +51,7 @@ export default function ProcessModelForm({
if (hasErrors) { if (hasErrors) {
return; return;
} }
const path = `/process-models/${modifyProcessModelPath( const path = `/process-models/${modifyProcessIdentifierForPathParam(
processGroupId || '' processGroupId || ''
)}`; )}`;
let httpMethod = 'POST'; let httpMethod = 'POST';

11
spiffworkflow-frontend/src/components/ProcessModelListTiles.tsx
View File

@ -6,7 +6,10 @@ import {
} from '@carbon/react'; } from '@carbon/react';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { ProcessModel, ProcessInstance, ProcessGroup } from '../interfaces'; import { ProcessModel, ProcessInstance, ProcessGroup } from '../interfaces';
import { modifyProcessModelPath, truncateString } from '../helpers'; import {
modifyProcessIdentifierForPathParam,
truncateString,
} from '../helpers';
import ProcessInstanceRun from './ProcessInstanceRun'; import ProcessInstanceRun from './ProcessInstanceRun';
type OwnProps = { type OwnProps = {
@ -47,7 +50,7 @@ export default function ProcessModelListTiles({
<p> <p>
Process Instance {processInstance.id} kicked off ( Process Instance {processInstance.id} kicked off (
<Link <Link
to={`/admin/process-models/${modifyProcessModelPath( to={`/admin/process-models/${modifyProcessIdentifierForPathParam(
processInstance.process_model_identifier processInstance.process_model_identifier
)}/process-instances/${processInstance.id}`} )}/process-instances/${processInstance.id}`}
data-qa="process-instance-show-link" data-qa="process-instance-show-link"
@ -70,7 +73,9 @@ export default function ProcessModelListTiles({
<Tile <Tile
id={`process-model-tile-${row.id}`} id={`process-model-tile-${row.id}`}
className="tile-process-group" className="tile-process-group"
href={`/admin/process-models/${modifyProcessModelPath(row.id)}`} href={`/admin/process-models/${modifyProcessIdentifierForPathParam(
row.id
)}`}
> >
<div className="tile-process-group-content-container"> <div className="tile-process-group-content-container">
<div className="tile-title-top">{row.display_name}</div> <div className="tile-title-top">{row.display_name}</div>

7
spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx
View File

@ -6,7 +6,7 @@ import PaginationForTable from './PaginationForTable';
import { import {
convertSecondsToFormattedDateTime, convertSecondsToFormattedDateTime,
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { PaginationObject } from '../interfaces'; import { PaginationObject } from '../interfaces';
@ -40,9 +40,8 @@ export default function MyOpenProcesses() {
const rows = tasks.map((row) => { const rows = tasks.map((row) => {
const rowToUse = row as any; const rowToUse = row as any;
const taskUrl = `/tasks/${rowToUse.process_instance_id}/${rowToUse.task_id}`; const taskUrl = `/tasks/${rowToUse.process_instance_id}/${rowToUse.task_id}`;
const modifiedProcessModelIdentifier = modifyProcessModelPath( const modifiedProcessModelIdentifier =
rowToUse.process_model_identifier modifyProcessIdentifierForPathParam(rowToUse.process_model_identifier);
);
return ( return (
<tr key={rowToUse.id}> <tr key={rowToUse.id}>
<td> <td>

7
spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx
View File

@ -6,7 +6,7 @@ import PaginationForTable from './PaginationForTable';
import { import {
convertSecondsToFormattedDateTime, convertSecondsToFormattedDateTime,
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { PaginationObject } from '../interfaces'; import { PaginationObject } from '../interfaces';
@ -39,9 +39,8 @@ export default function TasksWaitingForMe() {
const rows = tasks.map((row) => { const rows = tasks.map((row) => {
const rowToUse = row as any; const rowToUse = row as any;
const taskUrl = `/tasks/${rowToUse.process_instance_id}/${rowToUse.task_id}`; const taskUrl = `/tasks/${rowToUse.process_instance_id}/${rowToUse.task_id}`;
const modifiedProcessModelIdentifier = modifyProcessModelPath( const modifiedProcessModelIdentifier =
rowToUse.process_model_identifier modifyProcessIdentifierForPathParam(rowToUse.process_model_identifier);
);
return ( return (
<tr key={rowToUse.id}> <tr key={rowToUse.id}>
<td> <td>

7
spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx
View File

@ -6,7 +6,7 @@ import PaginationForTable from './PaginationForTable';
import { import {
convertSecondsToFormattedDateTime, convertSecondsToFormattedDateTime,
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { PaginationObject } from '../interfaces'; import { PaginationObject } from '../interfaces';
@ -40,9 +40,8 @@ export default function TasksForWaitingForMyGroups() {
const rows = tasks.map((row) => { const rows = tasks.map((row) => {
const rowToUse = row as any; const rowToUse = row as any;
const taskUrl = `/tasks/${rowToUse.process_instance_id}/${rowToUse.task_id}`; const taskUrl = `/tasks/${rowToUse.process_instance_id}/${rowToUse.task_id}`;
const modifiedProcessModelIdentifier = modifyProcessModelPath( const modifiedProcessModelIdentifier =
rowToUse.process_model_identifier modifyProcessIdentifierForPathParam(rowToUse.process_model_identifier);
);
return ( return (
<tr key={rowToUse.id}> <tr key={rowToUse.id}>
<td> <td>

4
spiffworkflow-frontend/src/helpers.tsx
View File

@ -181,11 +181,11 @@ export const truncateString = (text: string, len: number) => {
// Because of limitations in the way openapi defines parameters, we have to modify process models ids // Because of limitations in the way openapi defines parameters, we have to modify process models ids
// which are basically paths to the models // which are basically paths to the models
export const modifyProcessModelPath = (path: string) => { export const modifyProcessIdentifierForPathParam = (path: string) => {
return path.replace(/\//g, ':') || ''; return path.replace(/\//g, ':') || '';
}; };
export const unModifyProcessModelPath = (path: string) => { export const unModifyProcessIdentifierForPathParam = (path: string) => {
return path.replace(/:/g, '/') || ''; return path.replace(/:/g, '/') || '';
}; };

4
spiffworkflow-frontend/src/routes/JsonSchemaFormBuilder.tsx
View File

@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
import { Button, Select, SelectItem, TextInput } from '@carbon/react'; import { Button, Select, SelectItem, TextInput } from '@carbon/react';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
import { FormField } from '../interfaces'; import { FormField } from '../interfaces';
import { modifyProcessModelPath, slugifyString } from '../helpers'; import { modifyProcessIdentifierForPathParam, slugifyString } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
export default function JsonSchemaFormBuilder() { export default function JsonSchemaFormBuilder() {
@ -28,7 +28,7 @@ export default function JsonSchemaFormBuilder() {
const [formFieldTitle, setFormFieldTitle] = useState<string>(''); const [formFieldTitle, setFormFieldTitle] = useState<string>('');
const [formFieldType, setFormFieldType] = useState<string>(''); const [formFieldType, setFormFieldType] = useState<string>('');
const modifiedProcessModelId = modifyProcessModelPath( const modifiedProcessModelId = modifyProcessIdentifierForPathParam(
`${params.process_model_id}` `${params.process_model_id}`
); );

10
spiffworkflow-frontend/src/routes/MessageInstanceList.tsx
View File

@ -7,8 +7,8 @@ import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import { import {
convertSecondsToFormattedDateString, convertSecondsToFormattedDateString,
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
unModifyProcessModelPath, unModifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
@ -46,7 +46,7 @@ export default function MessageInstanceList() {
<td> <td>
<Link <Link
data-qa="process-model-show-link" data-qa="process-model-show-link"
to={`/admin/process-models/${modifyProcessModelPath( to={`/admin/process-models/${modifyProcessIdentifierForPathParam(
rowToUse.process_model_identifier rowToUse.process_model_identifier
)}`} )}`}
> >
@ -56,7 +56,7 @@ export default function MessageInstanceList() {
<td> <td>
<Link <Link
data-qa="process-instance-show-link" data-qa="process-instance-show-link"
to={`/admin/process-models/${modifyProcessModelPath( to={`/admin/process-models/${modifyProcessIdentifierForPathParam(
rowToUse.process_model_identifier rowToUse.process_model_identifier
)}/process-instances/${rowToUse.process_instance_id}`} )}/process-instances/${rowToUse.process_instance_id}`}
> >
@ -104,7 +104,7 @@ export default function MessageInstanceList() {
['Process Groups', '/admin'], ['Process Groups', '/admin'],
[ [
`Process Model: ${params.process_model_id}`, `Process Model: ${params.process_model_id}`,
`process_model:${unModifyProcessModelPath( `process_model:${unModifyProcessIdentifierForPathParam(
searchParams.get('process_model_id') || '' searchParams.get('process_model_id') || ''
)}:link`, )}:link`,
], ],

9
spiffworkflow-frontend/src/routes/MyTasks.tsx
View File

@ -5,7 +5,7 @@ import { Link, useSearchParams } from 'react-router-dom';
import PaginationForTable from '../components/PaginationForTable'; import PaginationForTable from '../components/PaginationForTable';
import { import {
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
refreshAtInterval, refreshAtInterval,
} from '../helpers'; } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
@ -50,9 +50,8 @@ export default function MyTasks() {
const rows = tasks.map((row) => { const rows = tasks.map((row) => {
const rowToUse = row as any; const rowToUse = row as any;
const taskUrl = `/tasks/${rowToUse.process_instance_id}/${rowToUse.id}`; const taskUrl = `/tasks/${rowToUse.process_instance_id}/${rowToUse.id}`;
const modifiedProcessModelIdentifier = modifyProcessModelPath( const modifiedProcessModelIdentifier =
rowToUse.process_model_identifier modifyProcessIdentifierForPathParam(rowToUse.process_model_identifier);
);
return ( return (
<tr key={rowToUse.id}> <tr key={rowToUse.id}>
<td> <td>
@ -110,7 +109,7 @@ export default function MyTasks() {
const buildRecentProcessModelSection = () => { const buildRecentProcessModelSection = () => {
const rows = recentProcessModels.map((row) => { const rows = recentProcessModels.map((row) => {
const rowToUse = row as any; const rowToUse = row as any;
const modifiedProcessModelId = modifyProcessModelPath( const modifiedProcessModelId = modifyProcessIdentifierForPathParam(
rowToUse.processModelIdentifier rowToUse.processModelIdentifier
); );
return ( return (

6
spiffworkflow-frontend/src/routes/ProcessGroupList.tsx
View File

@ -7,7 +7,7 @@ import {
import { Can } from '@casl/react'; import { Can } from '@casl/react';
import ProcessBreadcrumb from '../components/ProcessBreadcrumb'; import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { modifyProcessModelPath } from '../helpers'; import { modifyProcessIdentifierForPathParam } from '../helpers';
import { CarbonComboBoxSelection, PermissionsToCheck } from '../interfaces'; import { CarbonComboBoxSelection, PermissionsToCheck } from '../interfaces';
import { useUriListForPermissions } from '../hooks/UriListForPermissions'; import { useUriListForPermissions } from '../hooks/UriListForPermissions';
import { usePermissionFetcher } from '../hooks/PermissionService'; import { usePermissionFetcher } from '../hooks/PermissionService';
@ -48,7 +48,9 @@ export default function ProcessGroupList() {
const processModelSearchOnChange = (selection: CarbonComboBoxSelection) => { const processModelSearchOnChange = (selection: CarbonComboBoxSelection) => {
const processModel = selection.selectedItem; const processModel = selection.selectedItem;
navigate( navigate(
`/admin/process-models/${modifyProcessModelPath(processModel.id)}` `/admin/process-models/${modifyProcessIdentifierForPathParam(
processModel.id
)}`
); );
}; };
return ( return (

15
spiffworkflow-frontend/src/routes/ProcessGroupShow.tsx
View File

@ -8,8 +8,8 @@ import PaginationForTable from '../components/PaginationForTable';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import { import {
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
unModifyProcessModelPath, unModifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import { import {
PaginationObject, PaginationObject,
@ -48,7 +48,7 @@ export default function ProcessGroupShow() {
}; };
const processResult = (result: any) => { const processResult = (result: any) => {
setProcessGroup(result); setProcessGroup(result);
const unmodifiedProcessGroupId = unModifyProcessModelPath( const unmodifiedProcessGroupId = unModifyProcessIdentifierForPathParam(
(params as any).process_group_id (params as any).process_group_id
); );
HttpService.makeCallToBackend({ HttpService.makeCallToBackend({
@ -67,9 +67,8 @@ export default function ProcessGroupShow() {
return null; return null;
} }
const rows = processModels.map((row: ProcessModel) => { const rows = processModels.map((row: ProcessModel) => {
const modifiedProcessModelId: String = modifyProcessModelPath( const modifiedProcessModelId: String =
(row as any).id modifyProcessIdentifierForPathParam((row as any).id);
);
return ( return (
<tr key={row.id}> <tr key={row.id}>
<td> <td>
@ -102,7 +101,9 @@ export default function ProcessGroupShow() {
if (processGroup && modelPagination) { if (processGroup && modelPagination) {
const { page, perPage } = getPageInfoFromSearchParams(searchParams); const { page, perPage } = getPageInfoFromSearchParams(searchParams);
const modifiedProcessGroupId = modifyProcessModelPath(processGroup.id); const modifiedProcessGroupId = modifyProcessIdentifierForPathParam(
processGroup.id
);
return ( return (
<> <>
<ProcessBreadcrumb <ProcessBreadcrumb

8
spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx
View File

@ -6,8 +6,8 @@ import PaginationForTable from '../components/PaginationForTable';
import ProcessBreadcrumb from '../components/ProcessBreadcrumb'; import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import { import {
getPageInfoFromSearchParams, getPageInfoFromSearchParams,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
unModifyProcessModelPath, unModifyProcessIdentifierForPathParam,
convertSecondsToFormattedDateTime, convertSecondsToFormattedDateTime,
} from '../helpers'; } from '../helpers';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
@ -17,7 +17,7 @@ export default function ProcessInstanceLogList() {
const [searchParams] = useSearchParams(); const [searchParams] = useSearchParams();
const [processInstanceLogs, setProcessInstanceLogs] = useState([]); const [processInstanceLogs, setProcessInstanceLogs] = useState([]);
const [pagination, setPagination] = useState(null); const [pagination, setPagination] = useState(null);
const modifiedProcessModelId = modifyProcessModelPath( const modifiedProcessModelId = modifyProcessIdentifierForPathParam(
`${params.process_model_id}` `${params.process_model_id}`
); );
@ -82,7 +82,7 @@ export default function ProcessInstanceLogList() {
['Process Groups', '/admin'], ['Process Groups', '/admin'],
[ [
`Process Model: ${params.process_model_id}`, `Process Model: ${params.process_model_id}`,
`process_model:${unModifyProcessModelPath( `process_model:${unModifyProcessIdentifierForPathParam(
params.process_model_id || '' params.process_model_id || ''
)}:link`, )}:link`,
], ],

6
spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
View File

@ -29,7 +29,7 @@ import HttpService from '../services/HttpService';
import ReactDiagramEditor from '../components/ReactDiagramEditor'; import ReactDiagramEditor from '../components/ReactDiagramEditor';
import { import {
convertSecondsToFormattedDateTime, convertSecondsToFormattedDateTime,
unModifyProcessModelPath, unModifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import ButtonWithConfirmation from '../components/ButtonWithConfirmation'; import ButtonWithConfirmation from '../components/ButtonWithConfirmation';
import ErrorContext from '../contexts/ErrorContext'; import ErrorContext from '../contexts/ErrorContext';
@ -49,7 +49,7 @@ export default function ProcessInstanceShow() {
const setErrorMessage = (useContext as any)(ErrorContext)[1]; const setErrorMessage = (useContext as any)(ErrorContext)[1];
const unModifiedProcessModelId = unModifyProcessModelPath( const unModifiedProcessModelId = unModifyProcessIdentifierForPathParam(
`${params.process_model_id}` `${params.process_model_id}`
); );
const modifiedProcessModelId = params.process_model_id; const modifiedProcessModelId = params.process_model_id;
@ -553,7 +553,7 @@ export default function ProcessInstanceShow() {
if (processInstance && tasks) { if (processInstance && tasks) {
const processInstanceToUse = processInstance as any; const processInstanceToUse = processInstance as any;
const taskIds = getTaskIds(); const taskIds = getTaskIds();
const processModelId = unModifyProcessModelPath( const processModelId = unModifyProcessIdentifierForPathParam(
params.process_model_id ? params.process_model_id : '' params.process_model_id ? params.process_model_id : ''
); );

6
spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx
View File

@ -17,7 +17,7 @@ import ReactDiagramEditor from '../components/ReactDiagramEditor';
import ProcessBreadcrumb from '../components/ProcessBreadcrumb'; import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import ErrorContext from '../contexts/ErrorContext'; import ErrorContext from '../contexts/ErrorContext';
import { makeid, modifyProcessModelPath } from '../helpers'; import { makeid, modifyProcessIdentifierForPathParam } from '../helpers';
import { import {
CarbonComboBoxProcessSelection, CarbonComboBoxProcessSelection,
ProcessFile, ProcessFile,
@ -94,7 +94,7 @@ export default function ProcessModelEditDiagram() {
const [bpmnXmlForDiagramRendering, setBpmnXmlForDiagramRendering] = const [bpmnXmlForDiagramRendering, setBpmnXmlForDiagramRendering] =
useState(null); useState(null);
const modifiedProcessModelId = modifyProcessModelPath( const modifiedProcessModelId = modifyProcessIdentifierForPathParam(
(params as any).process_model_id (params as any).process_model_id
); );
@ -753,7 +753,7 @@ export default function ProcessModelEditDiagram() {
const path = generatePath( const path = generatePath(
'/admin/process-models/:process_model_path/files/:file_name', '/admin/process-models/:process_model_path/files/:file_name',
{ {
process_model_path: modifyProcessModelPath( process_model_path: modifyProcessIdentifierForPathParam(
processRef.process_model_id processRef.process_model_id
), ),
file_name: processRef.file_name, file_name: processRef.file_name,

6
spiffworkflow-frontend/src/routes/ProcessModelNew.tsx
View File

@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom';
import ProcessBreadcrumb from '../components/ProcessBreadcrumb'; import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import { ProcessModel } from '../interfaces'; import { ProcessModel } from '../interfaces';
import ProcessModelForm from '../components/ProcessModelForm'; import ProcessModelForm from '../components/ProcessModelForm';
import { unModifyProcessModelPath } from '../helpers'; import { unModifyProcessIdentifierForPathParam } from '../helpers';
export default function ProcessModelNew() { export default function ProcessModelNew() {
const params = useParams(); const params = useParams();
@ -29,7 +29,9 @@ export default function ProcessModelNew() {
<h1>Add Process Model</h1> <h1>Add Process Model</h1>
<ProcessModelForm <ProcessModelForm
mode="new" mode="new"
processGroupId={unModifyProcessModelPath(params.process_group_id || '')} processGroupId={unModifyProcessIdentifierForPathParam(
params.process_group_id || ''
)}
processModel={processModel} processModel={processModel}
setProcessModel={setProcessModel} setProcessModel={setProcessModel}
/> />

4
spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
View File

@ -34,7 +34,7 @@ import HttpService from '../services/HttpService';
import ErrorContext from '../contexts/ErrorContext'; import ErrorContext from '../contexts/ErrorContext';
import { import {
getGroupFromModifiedModelId, getGroupFromModifiedModelId,
modifyProcessModelPath, modifyProcessIdentifierForPathParam,
} from '../helpers'; } from '../helpers';
import { import {
PermissionsToCheck, PermissionsToCheck,
@ -120,7 +120,7 @@ export default function ProcessModelShow() {
}; };
const { ability } = usePermissionFetcher(permissionRequestData); const { ability } = usePermissionFetcher(permissionRequestData);
const modifiedProcessModelId = modifyProcessModelPath( const modifiedProcessModelId = modifyProcessIdentifierForPathParam(
`${params.process_model_id}` `${params.process_model_id}`
); );

11
spiffworkflow-frontend/src/routes/ReactFormEditor.tsx
View File

@ -6,7 +6,10 @@ import { Button, Modal } from '@carbon/react';
import ProcessBreadcrumb from '../components/ProcessBreadcrumb'; import ProcessBreadcrumb from '../components/ProcessBreadcrumb';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import ButtonWithConfirmation from '../components/ButtonWithConfirmation'; import ButtonWithConfirmation from '../components/ButtonWithConfirmation';
import { modifyProcessModelPath, unModifyProcessModelPath } from '../helpers'; import {
modifyProcessIdentifierForPathParam,
unModifyProcessIdentifierForPathParam,
} from '../helpers';
import { ProcessFile } from '../interfaces'; import { ProcessFile } from '../interfaces';
// NOTE: This is mostly the same as ProcessModelEditDiagram and if we go this route could // NOTE: This is mostly the same as ProcessModelEditDiagram and if we go this route could
@ -38,7 +41,7 @@ export default function ReactFormEditor() {
const editorDefaultLanguage = fileExtension === 'md' ? 'markdown' : 'json'; const editorDefaultLanguage = fileExtension === 'md' ? 'markdown' : 'json';
const modifiedProcessModelId = modifyProcessModelPath( const modifiedProcessModelId = modifyProcessIdentifierForPathParam(
`${params.process_model_id}` `${params.process_model_id}`
); );
@ -157,10 +160,10 @@ export default function ReactFormEditor() {
hotCrumbs={[ hotCrumbs={[
['Process Groups', '/admin'], ['Process Groups', '/admin'],
[ [
`Process Model: ${unModifyProcessModelPath( `Process Model: ${unModifyProcessIdentifierForPathParam(
params.process_model_id || '' params.process_model_id || ''
)}`, )}`,
`process_model:${unModifyProcessModelPath( `process_model:${unModifyProcessIdentifierForPathParam(
params.process_model_id || '' params.process_model_id || ''
)}:link`, )}:link`,
], ],

4
spiffworkflow-frontend/src/routes/TaskShow.tsx
View File

@ -24,7 +24,7 @@ import remarkGfm from 'remark-gfm';
import Form from '../themes/carbon'; import Form from '../themes/carbon';
import HttpService from '../services/HttpService'; import HttpService from '../services/HttpService';
import ErrorContext from '../contexts/ErrorContext'; import ErrorContext from '../contexts/ErrorContext';
import { modifyProcessModelPath } from '../helpers'; import { modifyProcessIdentifierForPathParam } from '../helpers';
export default function TaskShow() { export default function TaskShow() {
const [task, setTask] = useState(null); const [task, setTask] = useState(null);
@ -38,7 +38,7 @@ export default function TaskShow() {
const processResult = (result: any) => { const processResult = (result: any) => {
setTask(result); setTask(result);
HttpService.makeCallToBackend({ HttpService.makeCallToBackend({
path: `/process-instances/${modifyProcessModelPath( path: `/process-instances/${modifyProcessIdentifierForPathParam(
result.process_model_identifier result.process_model_identifier
)}/${params.process_instance_id}/tasks`, )}/${params.process_instance_id}/tasks`,
successCallback: setUserTasks, successCallback: setUserTasks,