make the frontend uris match the api calls better w/ burnettk

2022-12-05 16:49:27 -05:00 · 2022-12-05 16:49:27 -05:00 · 3a40b07f5e
parent f192ab89a2
commit 3a40b07f5e
13 changed files with 27 additions and 26 deletions
--- a/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessInstanceListTable.tsx
@ -1059,7 +1059,7 @@ export default function ProcessInstanceListTable({
      return (
        <Link
          data-qa="process-instance-show-link"
-          to={`/admin/process-models/${modifiedProcessModelId}/process-instances/${id}`}
+          to={`/admin/process-instances/${modifiedProcessModelId}/${id}`}
          title={`View process instance ${id}`}
        >
          {id}
--- a/spiffworkflow-frontend/src/components/ProcessInstanceRun.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessInstanceRun.tsx
@ -83,9 +83,9 @@ export default function ProcessInstanceRun({
    processModel.id
  );

-  const processInstanceActionPath = `/v1.0/process-instances/${modifiedProcessModelId}`;
+  const processInstanceCreatePath = `/v1.0/process-instances/${modifiedProcessModelId}`;
  let permissionRequestData: PermissionsToCheck = {
-    [processInstanceActionPath]: ['POST'],
+    [processInstanceCreatePath]: ['POST'],
  };

  if (!checkPermissions) {
@ -117,14 +117,14 @@ export default function ProcessInstanceRun({

  const processInstanceCreateAndRun = () => {
    HttpService.makeCallToBackend({
-      path: processInstanceActionPath,
+      path: processInstanceCreatePath,
      successCallback: processModelRun,
      httpMethod: 'POST',
    });
  };
  if (checkPermissions) {
    return (
-      <Can I="POST" a={processInstanceActionPath} ability={ability}>
+      <Can I="POST" a={processInstanceCreatePath} ability={ability}>
        <Button onClick={processInstanceCreateAndRun} className={className}>
          Start
        </Button>
--- a/spiffworkflow-frontend/src/components/ProcessModelListTiles.tsx
+++ b/spiffworkflow-frontend/src/components/ProcessModelListTiles.tsx
@ -54,9 +54,9 @@ export default function ProcessModelListTiles({
          <p>
            Process Instance {processInstance.id} kicked off (
            <Link
-              to={`/admin/process-models/${modifyProcessIdentifierForPathParam(
+              to={`/admin/process-instances/${modifyProcessIdentifierForPathParam(
                processInstance.process_model_identifier
-              )}/process-instances/${processInstance.id}`}
+              )}/${processInstance.id}`}
              data-qa="process-instance-show-link"
            >
              view
--- a/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx
+++ b/spiffworkflow-frontend/src/components/TasksForMyOpenProcesses.tsx
@ -55,7 +55,7 @@ export default function MyOpenProcesses() {
          <td>
            <Link
              data-qa="process-instance-show-link"
-              to={`/admin/process-models/${modifiedProcessModelIdentifier}/process-instances/${rowToUse.process_instance_id}`}
+              to={`/admin/process-instances/${modifiedProcessModelIdentifier}/${rowToUse.process_instance_id}`}
              title={`View process instance ${rowToUse.process_instance_id}`}
            >
              {rowToUse.process_instance_id}
--- a/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx
+++ b/spiffworkflow-frontend/src/components/TasksWaitingForMe.tsx
@ -47,7 +47,7 @@ export default function TasksWaitingForMe() {
          <td>
            <Link
              data-qa="process-instance-show-link"
-              to={`/admin/process-models/${modifiedProcessModelIdentifier}/process-instances/${rowToUse.process_instance_id}`}
+              to={`/admin/${modifiedProcessModelIdentifier}/${rowToUse.process_instance_id}`}
              title={`View process instance ${rowToUse.process_instance_id}`}
            >
              {rowToUse.process_instance_id}
--- a/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx
+++ b/spiffworkflow-frontend/src/components/TasksWaitingForMyGroups.tsx
@ -55,7 +55,7 @@ export default function TasksWaitingForMyGroups() {
          <td>
            <Link
              data-qa="process-instance-show-link"
-              to={`/admin/process-models/${modifiedProcessModelIdentifier}/process-instances/${rowToUse.process_instance_id}`}
+              to={`/admin/process-instances/${modifiedProcessModelIdentifier}/${rowToUse.process_instance_id}`}
              title={`View process instance ${rowToUse.process_instance_id}`}
            >
              {rowToUse.process_instance_id}
--- a/spiffworkflow-frontend/src/hooks/UriListForPermissions.tsx
+++ b/spiffworkflow-frontend/src/hooks/UriListForPermissions.tsx
@ -9,7 +9,8 @@ export const useUriListForPermissions = () => {
      messageInstanceListPath: '/v1.0/messages',
      processGroupListPath: '/v1.0/process-groups',
      processGroupShowPath: `/v1.0/process-groups/${params.process_group_id}`,
-      processInstanceActionPath: `/v1.0/process-instances/${params.process_model_id}`,
+      processInstanceCreatePath: `/v1.0/process-instances/${params.process_model_id}`,
+      processInstanceActionPath: `/v1.0/process-instances/${params.process_model_id}/${params.process_instance_id}`,
      processInstanceListPath: '/v1.0/process-instances',
      processInstanceLogListPath: `/v1.0/logs/${params.process_model_id}/${params.process_instance_id}`,
      processInstanceReportListPath: '/v1.0/process-instances/reports',
--- a/spiffworkflow-frontend/src/routes/AdminRoutes.tsx
+++ b/spiffworkflow-frontend/src/routes/AdminRoutes.tsx
@ -71,11 +71,11 @@ export default function AdminRoutes() {
          element={<ProcessModelEdit />}
        />
        <Route
-          path="process-models/:process_model_id/process-instances/:process_instance_id"
+          path="process-instances/:process_model_id/:process_instance_id"
          element={<ProcessInstanceShow />}
        />
        <Route
-          path="process-models/:process_model_id/process-instances/:process_instance_id/:spiff_step"
+          path="process-instances/:process_model_id/:process_instance_id/:spiff_step"
          element={<ProcessInstanceShow />}
        />
        <Route
@ -103,7 +103,7 @@ export default function AdminRoutes() {
          element={<ReactFormEditor />}
        />
        <Route
-          path="process-models/:process_model_id/process-instances/:process_instance_id/logs"
+          path="logs/:process_model_id/:process_instance_id"
          element={<ProcessInstanceLogList />}
        />
        <Route path="process-instances" element={<ProcessInstanceList />} />
--- a/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx
+++ b/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx
@ -102,9 +102,9 @@ export default function MessageInstanceList() {
          <td>
            <Link
              data-qa="process-instance-show-link"
-              to={`/admin/process-models/${modifyProcessIdentifierForPathParam(
+              to={`/admin/process-instances/${modifyProcessIdentifierForPathParam(
                row.process_model_identifier
-              )}/process-instances/${row.process_instance_id}`}
+              )}/${row.process_instance_id}`}
            >
              {row.process_instance_id}
            </Link>
@ -163,9 +163,9 @@ export default function MessageInstanceList() {
            },
            [
              `Process Instance: ${searchParams.get('process_instance_id')}`,
-              `/admin/process-models/${searchParams.get(
+              `/admin/process-instances/${searchParams.get(
                'process_model_id'
-              )}/process-instances/${searchParams.get('process_instance_id')}`,
+              )}/${searchParams.get('process_instance_id')}`,
            ],
            ['Messages'],
          ]}
--- a/spiffworkflow-frontend/src/routes/MyTasks.tsx
+++ b/spiffworkflow-frontend/src/routes/MyTasks.tsx
@ -55,9 +55,9 @@ export default function MyTasks() {
          <p>
            Process Instance {processInstance.id} kicked off (
            <Link
-              to={`/admin/process-models/${modifyProcessIdentifierForPathParam(
+              to={`/admin/process-instances/${modifyProcessIdentifierForPathParam(
                processInstance.process_model_identifier
-              )}/process-instances/${processInstance.id}`}
+              )}/${processInstance.id}`}
              data-qa="process-instance-show-link"
            >
              view
@ -95,7 +95,7 @@ export default function MyTasks() {
          <td>
            <Link
              data-qa="process-instance-show-link"
-              to={`/admin/process-models/${modifiedProcessModelIdentifier}/process-instances/${rowToUse.process_instance_id}`}
+              to={`/admin/process-instances/${modifiedProcessModelIdentifier}/${rowToUse.process_instance_id}`}
            >
              {rowToUse.process_instance_id}
            </Link>
--- a/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessInstanceLogList.tsx
@ -32,7 +32,7 @@ export default function ProcessInstanceLogList() {
      path: `${targetUris.processInstanceLogListPath}?per_page=${perPage}&page=${page}`,
      successCallback: setProcessInstanceLogListFromResult,
    });
-  }, [searchParams, params]);
+  }, [searchParams, params, targetUris]);

  const buildTable = () => {
    const rows = processInstanceLogs.map((row) => {
--- a/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessInstanceShow.tsx
@ -273,7 +273,7 @@ export default function ProcessInstanceShow() {
                  size="sm"
                  className="button-white-background"
                  data-qa="process-instance-log-list-link"
-                  href={`/admin/process-models/${modifiedProcessModelId}/process-instances/${params.process_instance_id}/logs`}
+                  href={`/admin/logs/${modifiedProcessModelId}/${params.process_instance_id}`}
                >
                  Logs
                </Button>
--- a/spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
+++ b/spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
@ -66,7 +66,7 @@ export default function ProcessModelShow() {
  const permissionRequestData: PermissionsToCheck = {
    [targetUris.processModelShowPath]: ['PUT', 'DELETE'],
    [targetUris.processInstanceListPath]: ['GET'],
-    [targetUris.processInstanceActionPath]: ['POST'],
+    [targetUris.processInstanceCreatePath]: ['POST'],
    [targetUris.processModelFileCreatePath]: ['POST', 'PUT', 'GET', 'DELETE'],
  };
  const { ability, permissionsLoaded } = usePermissionFetcher(
@ -95,7 +95,7 @@ export default function ProcessModelShow() {
          <p>
            Process Instance {processInstance.id} kicked off (
            <Link
-              to={`/admin/process-models/${modifiedProcessModelId}/process-instances/${processInstance.id}`}
+              to={`/admin/process-instances/${modifiedProcessModelId}/${processInstance.id}`}
              data-qa="process-instance-show-link"
            >
              view
@ -556,7 +556,7 @@ export default function ProcessModelShow() {
        <Stack orientation="horizontal" gap={3}>
          <Can
            I="POST"
-            a={targetUris.processInstanceActionPath}
+            a={targetUris.processInstanceCreatePath}
            ability={ability}
          >
            <>