renamed modifyProcessModelPath to modifyProcessIdentifierForPathParam…

… w/ burnettk
sartography · Nov 22, 2022 · 2e7deae · 2e7deae
1 parent 169487e
commit 2e7deae
Show file tree

Hide file tree

Showing 22 changed files with 98 additions and 76 deletions.
diff --git a/spiffworkflow-frontend/src/components/ProcessGroupForm.tsx b/spiffworkflow-frontend/src/components/ProcessGroupForm.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 // @ts-ignore
 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 { ProcessGroup } from '../interfaces';
 import ButtonWithConfirmation from './ButtonWithConfirmation';
@@ -28,7 +28,9 @@ export default function ProcessGroupForm({
   const navigateToProcessGroup = (_result: any) => {
     if (newProcessGroupId) {
       navigate(
-        `/admin/process-groups/${modifyProcessModelPath(newProcessGroupId)}`
+        `/admin/process-groups/${modifyProcessIdentifierForPathParam(
+          newProcessGroupId
+        )}`
       );
     }
   };
@@ -43,7 +45,9 @@ export default function ProcessGroupForm({
 
   const deleteProcessGroup = () => {
     HttpService.makeCallToBackend({
-      path: `/process-groups/${modifyProcessModelPath(processGroup.id)}`,
+      path: `/process-groups/${modifyProcessIdentifierForPathParam(
+        processGroup.id
+      )}`,
       successCallback: navigateToProcessGroups,
       httpMethod: 'DELETE',
     });
@@ -68,7 +72,9 @@ export default function ProcessGroupForm({
     }
     let path = '/process-groups';
     if (mode === 'edit') {
-      path = `/process-groups/${modifyProcessModelPath(processGroup.id)}`;
+      path = `/process-groups/${modifyProcessIdentifierForPathParam(
+        processGroup.id
+      )}`;
     }
     let httpMethod = 'POST';
     if (mode === 'edit') {

diff --git a/spiffworkflow-frontend/src/components/ProcessGroupListTiles.tsx b/spiffworkflow-frontend/src/components/ProcessGroupListTiles.tsx
@@ -10,7 +10,10 @@ import {
 } from '@carbon/react';
 import HttpService from '../services/HttpService';
 import { ProcessGroup } from '../interfaces';
-import { modifyProcessModelPath, truncateString } from '../helpers';
+import {
+  modifyProcessIdentifierForPathParam,
+  truncateString,
+} from '../helpers';
 
 type OwnProps = {
   processGroup?: ProcessGroup;
@@ -53,7 +56,9 @@ export default function ProcessGroupListTiles({
           <ClickableTile
             id={`process-group-tile-${row.id}`}
             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">
               <ArrowRight />

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

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

diff --git a/spiffworkflow-frontend/src/components/ProcessModelForm.tsx b/spiffworkflow-frontend/src/components/ProcessModelForm.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 // @ts-ignore
 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 { ProcessModel } from '../interfaces';
 
@@ -27,9 +27,8 @@ export default function ProcessModelForm({
 
   const navigateToProcessModel = (result: ProcessModel) => {
     if ('id' in result) {
-      const modifiedProcessModelPathFromResult = modifyProcessModelPath(
-        result.id
-      );
+      const modifiedProcessModelPathFromResult =
+        modifyProcessIdentifierForPathParam(result.id);
       navigate(`/admin/process-models/${modifiedProcessModelPathFromResult}`);
     }
   };
@@ -52,7 +51,7 @@ export default function ProcessModelForm({
     if (hasErrors) {
       return;
     }
-    const path = `/process-models/${modifyProcessModelPath(
+    const path = `/process-models/${modifyProcessIdentifierForPathParam(
       processGroupId || ''
     )}`;
     let httpMethod = 'POST';

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

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

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

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

diff --git a/spiffworkflow-frontend/src/helpers.tsx b/spiffworkflow-frontend/src/helpers.tsx
@@ -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
 // which are basically paths to the models
-export const modifyProcessModelPath = (path: string) => {
+export const modifyProcessIdentifierForPathParam = (path: string) => {
   return path.replace(/\//g, ':') || '';
 };
 
-export const unModifyProcessModelPath = (path: string) => {
+export const unModifyProcessIdentifierForPathParam = (path: string) => {
   return path.replace(/:/g, '/') || '';
 };
 

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

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

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

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