chore: rename nodeRunName -> nodeName

littlehorse-enterprises · May 25, 2024 · bb4f4dc · bb4f4dc
1 parent 30ce2c1
commit bb4f4dc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/dashboard/src/app/(authenticated)/(diagram)/components/Diagram.tsx b/dashboard/src/app/(authenticated)/(diagram)/components/Diagram.tsx
@@ -49,7 +49,7 @@ export const Diagram: FC<Props> = ({ spec, wfRun }) => {
 
   const searchParams: ReadonlyURLSearchParams = useSearchParams()
   const threadRunNumberFromRedirection: number = Number(searchParams.get('threadRunNumber'))
-  const nodeRunNameToBeHighlighted: string = searchParams.get('nodeRunName')!
+  const nodeNameToBeHighlighted: string = searchParams.get('nodeName')!
 
   let threadToShowByDefault = determineDefaultThreadRun(currentThread, wfRun, threadRunNumberFromRedirection, spec)
 
@@ -98,7 +98,7 @@ export const Diagram: FC<Props> = ({ spec, wfRun }) => {
         >
           <Controls />
         </ReactFlow>
-        <Layouter nodeRuns={threadNodeRuns} nodeRunNameToBeHighlighted={nodeRunNameToBeHighlighted} />
+        <Layouter nodeRuns={threadNodeRuns} nodeNameToBeHighlighted={nodeNameToBeHighlighted} />
       </div>
     </ThreadProvider>
   )

diff --git a/dashboard/src/app/(authenticated)/(diagram)/components/Layouter.tsx b/dashboard/src/app/(authenticated)/(diagram)/components/Layouter.tsx
@@ -3,9 +3,9 @@ import { NodeRun } from 'littlehorse-client/dist/proto/node_run'
 import { FC, useCallback, useEffect } from 'react'
 import { Edge, Node, useReactFlow, useStore } from 'reactflow'
 
-export const Layouter: FC<{ nodeRuns?: NodeRun[]; nodeRunNameToBeHighlighted?: string }> = ({
+export const Layouter: FC<{ nodeRuns?: NodeRun[]; nodeNameToBeHighlighted?: string }> = ({
   nodeRuns,
-  nodeRunNameToBeHighlighted,
+  nodeNameToBeHighlighted,
 }) => {
   const nodes = useStore(store => store.getNodes())
   const edges = useStore(store => store.edges)
@@ -33,7 +33,7 @@ export const Layouter: FC<{ nodeRuns?: NodeRun[]; nodeRunNameToBeHighlighted?: s
           return nodeRun.nodeName === node.id
         })
         const fade = nodeRuns !== undefined && nodeRun === undefined
-        const nodeNeedsToBeHighlighted = node.id === nodeRunNameToBeHighlighted
+        const nodeNeedsToBeHighlighted = node.id === nodeNameToBeHighlighted
 
         return {
           ...node,

diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
@@ -1,17 +1,17 @@
 'use client'
-import { Navigation } from '@/app/(authenticated)/components/Navigation'
-import { concatWfRunIds, localDateTimeToUTCIsoString, utcToLocalDateTime } from '@/app/utils'
-import { useWhoAmI } from '@/contexts/WhoAmIContext'
-import { Field, Input, Label } from '@headlessui/react'
-import { ArrowPathIcon } from '@heroicons/react/24/outline'
-import { useInfiniteQuery } from '@tanstack/react-query'
-import { TaskStatus } from 'littlehorse-client/dist/proto/common_enums'
-import { TaskDef as TaskDefProto } from 'littlehorse-client/dist/proto/task_def'
-import Link from 'next/link'
-import { FC, Fragment, useState } from 'react'
-import { PaginatedTaskRunList, searchTaskRun } from '../actions/searchTaskRun'
-import { Details } from './Details'
-import { InputVars } from './InputVars'
+import { Navigation } from '@/app/(authenticated)/components/Navigation';
+import { concatWfRunIds, localDateTimeToUTCIsoString, utcToLocalDateTime } from '@/app/utils';
+import { useWhoAmI } from '@/contexts/WhoAmIContext';
+import { Field, Input, Label } from '@headlessui/react';
+import { ArrowPathIcon } from '@heroicons/react/24/outline';
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { TaskStatus } from 'littlehorse-client/dist/proto/common_enums';
+import { TaskDef as TaskDefProto } from 'littlehorse-client/dist/proto/task_def';
+import Link from 'next/link';
+import { FC, Fragment, useState } from 'react';
+import { PaginatedTaskRunList, searchTaskRun } from '../actions/searchTaskRun';
+import { Details } from './Details';
+import { InputVars } from './InputVars';
 
 type Props = {
   spec: TaskDefProto
@@ -109,11 +109,12 @@ export const TaskDef: FC<Props> = ({ spec }) => {
                     page.resultsWithDetails.map(({ taskRun, nodeRun }) => {
                       return (
                         <tr key={taskRun.id?.taskGuid} className="border-b border-neutral-200">
-                          <td className="px-6 py-4">
+                          <td className="px-6 py-4">😡
                             <Link
                               className="py-2 text-blue-500 hover:underline"
                               target="_blank"
-                              href={`/wfRun/${concatWfRunIds(taskRun.id?.wfRunId!)}?threadRunNumber=${taskRun.id?.wfRunId?.id}&nodeRunName=${nodeRun.nodeName}`}
+                              //? Will have to create a new request to get the nodeName to select the node in the diagram 😡 (will do this in the rewrite)
+                              href={`/wfRun/${concatWfRunIds(taskRun.id?.wfRunId!)}?threadRunNumber=${taskRun.source?.taskNode?.nodeRunId?.threadRunNumber || taskRun.source?.userTaskTrigger?.nodeRunId?.threadRunNumber}&nodeName=${taskRun.source?.taskNode?.nodeRunId?.position}-${taskRun.source?.taskNode?.nodeRunId}-TASK`}
                             >
                               {concatWfRunIds(taskRun.id?.wfRunId!)}
                             </Link>

diff --git a/dashboard/src/app/(authenticated)/userTaskDef/[...props]/components/UserTaskDef.tsx b/dashboard/src/app/(authenticated)/userTaskDef/[...props]/components/UserTaskDef.tsx
@@ -170,7 +170,7 @@ export const UserTaskDef: FC<Props> = ({ spec }) => {
                             <Link
                               className="py-2 text-blue-500 hover:underline"
                               target="_blank"
-                              href={`/wfRun/${concatWfRunIds(userTaskRun.id?.wfRunId!)}?threadRunNumber=${userTaskRun.nodeRunId?.threadRunNumber}&nodeRunName=${nodeRun.nodeName}`}
+                              href={`/wfRun/${concatWfRunIds(userTaskRun.id?.wfRunId!)}?threadRunNumber=${userTaskRun.nodeRunId?.threadRunNumber}&nodeName=${nodeRun.nodeName}`}
                             >
                               {concatWfRunIds(userTaskRun.id?.wfRunId!)}
                             </Link>