From 7e14f4d680284a774fb3a7bef7472445fec411ed Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Tue, 21 May 2024 14:07:02 -0700
Subject: [PATCH 01/12] fix: unnecessary code

---
 dashboard/src/app/api/auth/signin/LoginButton.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/src/app/api/auth/signin/LoginButton.tsx b/dashboard/src/app/api/auth/signin/LoginButton.tsx
index fb1a7a518..27b191c10 100644
--- a/dashboard/src/app/api/auth/signin/LoginButton.tsx
+++ b/dashboard/src/app/api/auth/signin/LoginButton.tsx
@@ -9,7 +9,7 @@ export const LoginButton: FC<Pick<ClientSafeProvider, 'id' | 'name'>> = ({ id, n
   return (
     <button
       onClick={() => signIn(id, { callbackUrl })}
-      className="w-full rounded-md bg-blue-500 px-4 py-2 py-4 font-semibold text-white md:w-96 lg:w-96"
+      className="w-full rounded-md bg-blue-500 px-4 py-4 font-semibold text-white md:w-96 lg:w-96"
     >
       Login with {name}
     </button>

From 533b15feeed40f11f1fbdceaddabff29666afbae Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Tue, 21 May 2024 14:20:40 -0700
Subject: [PATCH 02/12] fix: no avatar when not authenticated

---
 .../app/(authenticated)/components/Header.tsx |  2 +-
 .../(authenticated)/components/Principal.tsx  | 78 ++++++++++---------
 dashboard/src/app/(authenticated)/layout.tsx  |  2 +-
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/dashboard/src/app/(authenticated)/components/Header.tsx b/dashboard/src/app/(authenticated)/components/Header.tsx
index 0ea3e5e56..15d8b016e 100644
--- a/dashboard/src/app/(authenticated)/components/Header.tsx
+++ b/dashboard/src/app/(authenticated)/components/Header.tsx
@@ -8,7 +8,7 @@ import { TenantSelector } from './TenantSelector'
 
 export const Header: FC = () => {
   return (
-    <nav className="mb-4 border-gray-200 bg-black dark:bg-gray-900">
+    <nav className="px-8 mb-4 border-gray-200 bg-black dark:bg-gray-900">
       <div className="mx-auto flex max-w-screen-xl flex-wrap items-center justify-between py-4">
         <a href="/" className="flex items-center space-x-1 rtl:space-x-reverse">
           <LhLogo className="h-8 fill-white" />
diff --git a/dashboard/src/app/(authenticated)/components/Principal.tsx b/dashboard/src/app/(authenticated)/components/Principal.tsx
index b47f5b20a..b817943b6 100644
--- a/dashboard/src/app/(authenticated)/components/Principal.tsx
+++ b/dashboard/src/app/(authenticated)/components/Principal.tsx
@@ -9,44 +9,46 @@ function classNames(...classes: Array<string | boolean>) {
 export const Principal: FC = () => {
   const { user } = useWhoAmI()
   return (
-    <Menu as="div" className="relative inline-block text-left">
-      <div>
-        <Menu.Button className="inline-flex w-full justify-center gap-x-1.5 px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm">
-          <div className="relative inline-flex h-8 w-8 items-center justify-center overflow-hidden rounded-full bg-gray-100 dark:bg-gray-600">
-            <span className="font-medium text-gray-600 dark:text-gray-300">{user?.name?.at(0)}</span>
-          </div>
-        </Menu.Button>
-      </div>
+    user?.name != 'anonymous' && (
+      <Menu as="div" className="relative inline-block text-left">
+        <div>
+          <Menu.Button className="inline-flex w-full justify-center gap-x-1.5 px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm">
+            <div className="relative inline-flex h-8 w-8 items-center justify-center overflow-hidden rounded-full bg-gray-100 dark:bg-gray-600">
+              <span className="font-medium text-gray-600 dark:text-gray-300">{user?.name?.at(0)}</span>
+            </div>
+          </Menu.Button>
+        </div>
 
-      <Transition
-        as={Fragment}
-        enter="transition ease-out duration-100"
-        enterFrom="transform opacity-0 scale-95"
-        enterTo="transform opacity-100 scale-100"
-        leave="transition ease-in duration-75"
-        leaveFrom="transform opacity-100 scale-100"
-        leaveTo="transform opacity-0 scale-95"
-      >
-        <Menu.Items className="absolute right-0 z-10 mt-2 w-56 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
-          <div className="py-1">
-            <Menu.Item>
-              {({ active }) => (
-                <button
-                  onClick={() => {
-                    signOut()
-                  }}
-                  className={classNames(
-                    active ? 'bg-gray-100 text-gray-900' : 'text-gray-700',
-                    'block w-full px-4 py-2 text-left text-sm'
-                  )}
-                >
-                  Sign out
-                </button>
-              )}
-            </Menu.Item>
-          </div>
-        </Menu.Items>
-      </Transition>
-    </Menu>
+        <Transition
+          as={Fragment}
+          enter="transition ease-out duration-100"
+          enterFrom="transform opacity-0 scale-95"
+          enterTo="transform opacity-100 scale-100"
+          leave="transition ease-in duration-75"
+          leaveFrom="transform opacity-100 scale-100"
+          leaveTo="transform opacity-0 scale-95"
+        >
+          <Menu.Items className="absolute right-0 z-10 mt-2 w-56 origin-top-right rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+            <div className="py-1">
+              <Menu.Item>
+                {({ active }) => (
+                  <button
+                    onClick={() => {
+                      signOut()
+                    }}
+                    className={classNames(
+                      active ? 'bg-gray-100 text-gray-900' : 'text-gray-700',
+                      'block w-full px-4 py-2 text-left text-sm'
+                    )}
+                  >
+                    Sign out
+                  </button>
+                )}
+              </Menu.Item>
+            </div>
+          </Menu.Items>
+        </Transition>
+      </Menu>
+    )
   )
 }
diff --git a/dashboard/src/app/(authenticated)/layout.tsx b/dashboard/src/app/(authenticated)/layout.tsx
index d5f98d95a..404bd719c 100644
--- a/dashboard/src/app/(authenticated)/layout.tsx
+++ b/dashboard/src/app/(authenticated)/layout.tsx
@@ -21,7 +21,7 @@ export default async function RootLayout({
     <WhoAmIContext user={user} tenants={tenants} tenantId={tenantId}>
       <Header />
       <QueryProvider>
-        <div className="mx-auto max-w-screen-xl">{children}</div>
+        <div className="px-8 mx-auto max-w-screen-xl">{children}</div>
       </QueryProvider>
     </WhoAmIContext>
   )

From ac3714d11b4942bf2679e6bcd681b6af000eb103 Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Tue, 21 May 2024 15:00:22 -0700
Subject: [PATCH 03/12] fix: valid way to detect auth disabled

---
 dashboard/src/app/(authenticated)/components/Principal.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dashboard/src/app/(authenticated)/components/Principal.tsx b/dashboard/src/app/(authenticated)/components/Principal.tsx
index b817943b6..bc451c5bb 100644
--- a/dashboard/src/app/(authenticated)/components/Principal.tsx
+++ b/dashboard/src/app/(authenticated)/components/Principal.tsx
@@ -1,3 +1,4 @@
+import { authOptions } from '@/app/api/auth/[...nextauth]/authOptions'
 import { useWhoAmI } from '@/contexts/WhoAmIContext'
 import { Menu, Transition } from '@headlessui/react'
 import { signOut } from 'next-auth/react'
@@ -9,7 +10,7 @@ function classNames(...classes: Array<string | boolean>) {
 export const Principal: FC = () => {
   const { user } = useWhoAmI()
   return (
-    user?.name != 'anonymous' && (
+    authOptions.providers.length > 0 && (
       <Menu as="div" className="relative inline-block text-left">
         <div>
           <Menu.Button className="inline-flex w-full justify-center gap-x-1.5 px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm">

From b8ee4b731d3974d2c9b2b47dcea8cfbced56bd1a Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Tue, 21 May 2024 18:11:02 -0700
Subject: [PATCH 04/12] feat: init search for taskRun

---
 .../taskDef/[name]/components/TaskDef.tsx     | 122 +++++++++++++++++-
 1 file changed, 121 insertions(+), 1 deletion(-)

diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
index 92dad1027..e642a8e1a 100644
--- a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
@@ -1,6 +1,9 @@
+'use client'
 import { Navigation } from '@/app/(authenticated)/components/Navigation'
+import { Field, Input, Label } from '@headlessui/react'
+import { TaskStatus } from 'littlehorse-client/dist/proto/common_enums'
 import { TaskDef as TaskDefProto } from 'littlehorse-client/dist/proto/task_def'
-import { FC } from 'react'
+import { FC, useState } from 'react'
 import { Details } from './Details'
 import { InputVars } from './InputVars'
 
@@ -8,11 +11,128 @@ type Props = {
   spec: TaskDefProto
 }
 export const TaskDef: FC<Props> = ({ spec }) => {
+  const [selectedStatus, setSelectedStatus] = useState(TaskStatus.TASK_SUCCESS)
+  const [createdAfter, setCreatedAfter] = useState('')
+  const [createdBefore, setCreatedBefore] = useState('')
   return (
     <>
       <Navigation href="/?type=TaskDef" title="Go back to TaskDefs" />
       <Details id={spec.id} />
       <InputVars inputVars={spec.inputVars} />
+      <hr className="mt-6" />
+      <div className="mb-4 mt-6 flex items-center justify-between">
+        <h2 className="text-2xl font-bold">Related Task Run&apos;s:</h2>
+        <select
+          className="rounded border px-2 py-2"
+          onChange={(e: React.ChangeEvent<HTMLSelectElement>) => {
+            setSelectedStatus(e.target.value as TaskStatus)
+          }}
+        >
+          {Object.keys(TaskStatus).map(status => (
+            <option key={status}>{status}</option>
+          ))}
+        </select>
+      </div>
+      <div className="mb-5 flex max-w-fit items-start justify-between">
+        <Field className="flex items-center justify-between">
+          <Label className="block w-1/2 font-bold">Created after:</Label>
+          <Input
+            type="datetime-local"
+            value={createdAfter}
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => setCreatedAfter(e.target.value)}
+            className="focus:shadow-outline ml-3 w-full appearance-none rounded border px-3 py-2 leading-tight shadow focus:outline-none"
+          />
+        </Field>
+
+        <Field className="ml-10 flex items-center justify-between">
+          <Label className="block w-1/2 font-bold">Created before:</Label>
+          <Input
+            type="datetime-local"
+            value={createdBefore}
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => setCreatedBefore(e.target.value)}
+            className="focus:shadow-outline ml-4 w-full appearance-none rounded border px-3 py-2 leading-tight shadow focus:outline-none"
+          />
+        </Field>
+      </div>
+      {/*
+
+      {isPending ? (
+        <div className="flex min-h-[360px] items-center justify-center text-center">
+          <ArrowPathIcon className="h-8 w-8 animate-spin fill-blue-500 stroke-none" />
+        </div>
+      ) : (
+        <div className="flex min-h-[360px] flex-col gap-4">
+          <table className="text-surface min-w-full text-center text-sm font-light">
+            <thead className="border-b border-neutral-200 bg-neutral-300 font-medium">
+              <tr>
+                <td scope="col" className="px-6 py-4">
+                  WfRun Id
+                </td>
+                <th scope="col" className="px-6 py-4">
+                  User Task GUID
+                </th>
+                <th scope="col" className="px-6 py-4">
+                  User Id
+                </th>
+                <th scope="col" className="px-6 py-4">
+                  User Group
+                </th>
+                <th scope="col" className="px-6 py-4">
+                  Creation Date
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              {data?.pages.map((page, i) => (
+                <Fragment key={i}>
+                  {page.resultsWithDetails.length > 0 ? (
+                    page.resultsWithDetails.map(({ userTaskRun, nodeRun }) => {
+                      return (
+                        <tr key={userTaskRun.id?.userTaskGuid} className="border-b border-neutral-200">
+                          <td className="px-6 py-4">
+                            <Link
+                              className="py-2 text-blue-500 hover:underline"
+                              target="_blank"
+                              href={`/wfRun/${concatWfRunIds(userTaskRun.id?.wfRunId!)}?threadRunNumber=${userTaskRun.nodeRunId?.threadRunNumber}&nodeRunName=${nodeRun.nodeName}`}
+                            >
+                              {concatWfRunIds(userTaskRun.id?.wfRunId!)}
+                            </Link>
+                          </td>
+                          <td className="px-6 py-4">{userTaskRun.id?.userTaskGuid}</td>
+                          <td className="px-6 py-4">
+                            {userTaskRun.userId ? userTaskRun.userId : NOT_APPLICABLE_LABEL}
+                          </td>
+                          <td className="px-6 py-4">
+                            {userTaskRun.userGroup ? userTaskRun.userGroup : NOT_APPLICABLE_LABEL}
+                          </td>
+                          <td className="px-6 py-4">
+                            {userTaskRun.scheduledTime
+                              ? utcToLocalDateTime(userTaskRun.scheduledTime)
+                              : NOT_APPLICABLE_LABEL}
+                          </td>
+                        </tr>
+                      )
+                    })
+                  ) : (
+                    <tr>
+                      <td colSpan={5}>No data</td>
+                    </tr>
+                  )}
+                </Fragment>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      )}
+
+      <div className="mt-6">
+        <SearchFooter
+          currentLimit={limit}
+          setLimit={setLimit}
+          hasNextPage={hasNextPage}
+          fetchNextPage={fetchNextPage}
+        />
+      </div> */}
     </>
   )
 }

From d8ec55219d78a7c2324c1de127bf3e7e5584ac76 Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Thu, 23 May 2024 08:15:18 -0700
Subject: [PATCH 05/12] feat: table task def init

---
 .../taskDef/[name]/actions/searchTaskRun.ts   | 53 +++++++++++++++++++
 .../taskDef/[name]/components/TaskDef.tsx     | 22 ++++++++
 .../[...props]/components/UserTaskDef.tsx     |  2 +-
 3 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 dashboard/src/app/(authenticated)/taskDef/[name]/actions/searchTaskRun.ts

diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/actions/searchTaskRun.ts b/dashboard/src/app/(authenticated)/taskDef/[name]/actions/searchTaskRun.ts
new file mode 100644
index 000000000..37cbfda26
--- /dev/null
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/actions/searchTaskRun.ts
@@ -0,0 +1,53 @@
+'use server'
+import { lhClient } from '@/app/lhClient'
+import { WithTenant } from '@/types'
+import { NodeRun } from 'littlehorse-client/dist/proto/node_run'
+import { TaskRunId } from 'littlehorse-client/dist/proto/object_id';
+import { SearchTaskRunRequest, TaskRunIdList } from 'littlehorse-client/dist/proto/service'
+import { TaskRun } from 'littlehorse-client/dist/proto/task_run'
+
+export interface runDetails {
+  taskRun: TaskRun
+  nodeRun: NodeRun
+}
+export interface PaginatedTaskRunList extends TaskRunIdList {
+  resultsWithDetails: runDetails[]
+  bookmarkAsString: string | undefined
+}
+
+type WithBookmarkAsString = {
+  bookmarkAsString: string | undefined
+}
+
+export type TaskRunSearchProps = SearchTaskRunRequest & WithTenant & WithBookmarkAsString
+export const searchTaskRun = async ({
+  tenantId,
+  bookmarkAsString,
+  ...req
+}: TaskRunSearchProps): Promise<PaginatedTaskRunList> => {
+  const client = await lhClient({ tenantId })
+  const requestWithBookmark = bookmarkAsString ? { ...req, bookmark: Buffer.from(bookmarkAsString, 'base64') } : req
+  const taskRunIdList: TaskRunIdList = await client.searchTaskRun(requestWithBookmark)
+  const hydrateWithTaskRunDetails = (): Promise<runDetails>[] => {
+    return taskRunIdList.results.map(async (taskRunId: TaskRunId) => {
+      const taskRun = await client.getTaskRun({
+        wfRunId: taskRunId.wfRunId,
+        taskGuid: taskRunId.taskGuid,
+      })
+      const nodeRun = await client.getNodeRun(taskRun.id!)
+
+      return {
+        taskRun,
+        nodeRun,
+      }
+    })
+  }
+
+  const userTaskRunWithDetails: runDetails[] = await Promise.all(hydrateWithTaskRunDetails())
+
+  return {
+    ...taskRunIdList,
+    bookmarkAsString: taskRunIdList.bookmark?.toString('base64'),
+    resultsWithDetails: userTaskRunWithDetails,
+  }
+}
diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
index e642a8e1a..3c12a5032 100644
--- a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
@@ -1,11 +1,15 @@
 'use client'
 import { Navigation } from '@/app/(authenticated)/components/Navigation'
+import { useWhoAmI } from '@/contexts/WhoAmIContext'
 import { Field, Input, Label } from '@headlessui/react'
 import { TaskStatus } from 'littlehorse-client/dist/proto/common_enums'
 import { TaskDef as TaskDefProto } from 'littlehorse-client/dist/proto/task_def'
 import { FC, useState } from 'react'
 import { Details } from './Details'
 import { InputVars } from './InputVars'
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { localDateTimeToUTCIsoString } from '@/app/utils';
+import { PaginatedTaskRunList, searchTaskRun } from '../actions/searchTaskRun';
 
 type Props = {
   spec: TaskDefProto
@@ -14,6 +18,24 @@ export const TaskDef: FC<Props> = ({ spec }) => {
   const [selectedStatus, setSelectedStatus] = useState(TaskStatus.TASK_SUCCESS)
   const [createdAfter, setCreatedAfter] = useState('')
   const [createdBefore, setCreatedBefore] = useState('')
+  const { tenantId } = useWhoAmI()
+
+  const { isPending, data, hasNextPage, fetchNextPage } = useInfiniteQuery({
+    queryKey: ['taskRun', selectedStatus, tenantId, 10, createdAfter, createdBefore],
+    initialPageParam: undefined,
+    getNextPageParam: (lastPage: PaginatedTaskRunList) => lastPage.bookmarkAsString,
+    queryFn: async ({ pageParam }) => {
+      return await searchTaskRun({
+        tenantId,
+        bookmarkAsString: pageParam,
+        limit: 10,
+        status: selectedStatus,
+        taskDefName: spec.id?.name,
+        earliestStart: createdAfter ? localDateTimeToUTCIsoString(createdAfter) : undefined,
+        latestStart: createdBefore ? localDateTimeToUTCIsoString(createdBefore) : undefined,
+      })
+    },
+  })
   return (
     <>
       <Navigation href="/?type=TaskDef" title="Go back to TaskDefs" />
diff --git a/dashboard/src/app/(authenticated)/userTaskDef/[...props]/components/UserTaskDef.tsx b/dashboard/src/app/(authenticated)/userTaskDef/[...props]/components/UserTaskDef.tsx
index ea7a51875..ce68d5975 100644
--- a/dashboard/src/app/(authenticated)/userTaskDef/[...props]/components/UserTaskDef.tsx
+++ b/dashboard/src/app/(authenticated)/userTaskDef/[...props]/components/UserTaskDef.tsx
@@ -77,7 +77,7 @@ export const UserTaskDef: FC<Props> = ({ spec }) => {
       <Fields fields={spec.fields} />
       <hr className="mt-6" />
       <div className="mb-4 mt-6 flex items-center justify-between">
-        <h2 className="text-2xl font-bold">Related User Task Run&apos;s:</h2>
+        <h2 className="text-2xl font-bold">Related User Task Runs:</h2>
         <div className="flex">
           {userTaskPossibleStatuses.map(status => (
             <Button

From 0659e89e03a727b12d4ae31c9623603a2f389efe Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Fri, 24 May 2024 14:02:31 -0700
Subject: [PATCH 06/12] feat: finish taskRun table

I will rewrite this with the new decided frontend design system. I just wanted to push what I already wrote
---
 .../taskDef/[name]/components/TaskDef.tsx     | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
index 3c12a5032..ceec43566 100644
--- a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
@@ -1,15 +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 { FC, useState } from 'react'
+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 { useInfiniteQuery } from '@tanstack/react-query';
-import { localDateTimeToUTCIsoString } from '@/app/utils';
-import { PaginatedTaskRunList, searchTaskRun } from '../actions/searchTaskRun';
 
 type Props = {
   spec: TaskDefProto
@@ -30,7 +32,7 @@ export const TaskDef: FC<Props> = ({ spec }) => {
         bookmarkAsString: pageParam,
         limit: 10,
         status: selectedStatus,
-        taskDefName: spec.id?.name,
+        taskDefName: spec.id?.name || '',
         earliestStart: createdAfter ? localDateTimeToUTCIsoString(createdAfter) : undefined,
         latestStart: createdBefore ? localDateTimeToUTCIsoString(createdBefore) : undefined,
       })
@@ -76,7 +78,6 @@ export const TaskDef: FC<Props> = ({ spec }) => {
           />
         </Field>
       </div>
-      {/*
 
       {isPending ? (
         <div className="flex min-h-[360px] items-center justify-center text-center">
@@ -108,29 +109,22 @@ export const TaskDef: FC<Props> = ({ spec }) => {
               {data?.pages.map((page, i) => (
                 <Fragment key={i}>
                   {page.resultsWithDetails.length > 0 ? (
-                    page.resultsWithDetails.map(({ userTaskRun, nodeRun }) => {
+                    page.resultsWithDetails.map(({ taskRun, nodeRun }) => {
                       return (
-                        <tr key={userTaskRun.id?.userTaskGuid} className="border-b border-neutral-200">
+                        <tr key={taskRun.id?.taskGuid} className="border-b border-neutral-200">
                           <td className="px-6 py-4">
                             <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(taskRun.id?.wfRunId!)}?threadRunNumber=${taskRun.id?.wfRunId?.id}&nodeRunName=${nodeRun.nodeName}`}
                             >
-                              {concatWfRunIds(userTaskRun.id?.wfRunId!)}
+                              {concatWfRunIds(taskRun.id?.wfRunId!)}
                             </Link>
                           </td>
-                          <td className="px-6 py-4">{userTaskRun.id?.userTaskGuid}</td>
-                          <td className="px-6 py-4">
-                            {userTaskRun.userId ? userTaskRun.userId : NOT_APPLICABLE_LABEL}
-                          </td>
-                          <td className="px-6 py-4">
-                            {userTaskRun.userGroup ? userTaskRun.userGroup : NOT_APPLICABLE_LABEL}
-                          </td>
+                          <td className="px-6 py-4">{taskRun.id?.taskGuid}</td>
+
                           <td className="px-6 py-4">
-                            {userTaskRun.scheduledTime
-                              ? utcToLocalDateTime(userTaskRun.scheduledTime)
-                              : NOT_APPLICABLE_LABEL}
+                            {taskRun.scheduledAt ? utcToLocalDateTime(taskRun.scheduledAt) : 'N/A'}
                           </td>
                         </tr>
                       )
@@ -147,7 +141,7 @@ export const TaskDef: FC<Props> = ({ spec }) => {
         </div>
       )}
 
-      <div className="mt-6">
+      {/* <div className="mt-6">
         <SearchFooter
           currentLimit={limit}
           setLimit={setLimit}

From c9bb4e888dd9282127f13cd0393042bd7d8a2d76 Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Fri, 24 May 2024 16:49:51 -0700
Subject: [PATCH 07/12] fix: update table cols

---
 .../(authenticated)/taskDef/[name]/components/TaskDef.tsx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
index ceec43566..c02fbe3fe 100644
--- a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
@@ -92,13 +92,7 @@ export const TaskDef: FC<Props> = ({ spec }) => {
                   WfRun Id
                 </td>
                 <th scope="col" className="px-6 py-4">
-                  User Task GUID
-                </th>
-                <th scope="col" className="px-6 py-4">
-                  User Id
-                </th>
-                <th scope="col" className="px-6 py-4">
-                  User Group
+                  Task GUID
                 </th>
                 <th scope="col" className="px-6 py-4">
                   Creation Date

From 5aa645a9ffa656ca6b8113d97b7cc02e703db8ee Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Fri, 24 May 2024 16:51:21 -0700
Subject: [PATCH 08/12] fix: filter `UNRECOGNIZED`

---
 .../(authenticated)/taskDef/[name]/components/TaskDef.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
index c02fbe3fe..5eccba002 100644
--- a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
@@ -52,9 +52,11 @@ export const TaskDef: FC<Props> = ({ spec }) => {
             setSelectedStatus(e.target.value as TaskStatus)
           }}
         >
-          {Object.keys(TaskStatus).map(status => (
-            <option key={status}>{status}</option>
-          ))}
+          {Object.keys(TaskStatus)
+            .filter(status => status != TaskStatus.UNRECOGNIZED)
+            .map(status => (
+              <option key={status}>{status}</option>
+            ))}
         </select>
       </div>
       <div className="mb-5 flex max-w-fit items-start justify-between">

From 30ce2c12466b9f914bac16cb8d87208a1ca6bde5 Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Fri, 24 May 2024 16:58:21 -0700
Subject: [PATCH 09/12] fix: return all taskRuns by default

---
 .../(authenticated)/taskDef/[name]/components/TaskDef.tsx    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
index 5eccba002..23a253889 100644
--- a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
@@ -17,7 +17,7 @@ type Props = {
   spec: TaskDefProto
 }
 export const TaskDef: FC<Props> = ({ spec }) => {
-  const [selectedStatus, setSelectedStatus] = useState(TaskStatus.TASK_SUCCESS)
+  const [selectedStatus, setSelectedStatus] = useState<TaskStatus | 'ALL'>('ALL')
   const [createdAfter, setCreatedAfter] = useState('')
   const [createdBefore, setCreatedBefore] = useState('')
   const { tenantId } = useWhoAmI()
@@ -31,7 +31,7 @@ export const TaskDef: FC<Props> = ({ spec }) => {
         tenantId,
         bookmarkAsString: pageParam,
         limit: 10,
-        status: selectedStatus,
+        status: selectedStatus == 'ALL' ? undefined : selectedStatus,
         taskDefName: spec.id?.name || '',
         earliestStart: createdAfter ? localDateTimeToUTCIsoString(createdAfter) : undefined,
         latestStart: createdBefore ? localDateTimeToUTCIsoString(createdBefore) : undefined,
@@ -52,6 +52,7 @@ export const TaskDef: FC<Props> = ({ spec }) => {
             setSelectedStatus(e.target.value as TaskStatus)
           }}
         >
+          <option>ALL</option>
           {Object.keys(TaskStatus)
             .filter(status => status != TaskStatus.UNRECOGNIZED)
             .map(status => (

From bb4f4dca9dbefd5b58568b34605a6633ca473fd5 Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Fri, 24 May 2024 17:36:42 -0700
Subject: [PATCH 10/12] chore: rename nodeRunName -> nodeName

---
 .../(diagram)/components/Diagram.tsx          |  4 +--
 .../(diagram)/components/Layouter.tsx         |  6 ++--
 .../taskDef/[name]/components/TaskDef.tsx     | 31 ++++++++++---------
 .../[...props]/components/UserTaskDef.tsx     |  2 +-
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/dashboard/src/app/(authenticated)/(diagram)/components/Diagram.tsx b/dashboard/src/app/(authenticated)/(diagram)/components/Diagram.tsx
index 84472edde..1efc9fb6c 100644
--- 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
index 8219be4f1..9ea2ff43d 100644
--- 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
index 23a253889..d2ed7cebe 100644
--- 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
index ce68d5975..5784d70d7 100644
--- 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>

From 24acebc5f104cf94462733ebd813e180c49b7814 Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Mon, 27 May 2024 09:58:15 -0700
Subject: [PATCH 11/12] fix: mistyped emoji & extra css

---
 .../NodeTypes/UserTask/UserTask.tsx           |  2 +-
 .../taskDef/[name]/components/TaskDef.tsx     | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dashboard/src/app/(authenticated)/(diagram)/components/NodeTypes/UserTask/UserTask.tsx b/dashboard/src/app/(authenticated)/(diagram)/components/NodeTypes/UserTask/UserTask.tsx
index 34f636c38..6d3c2292c 100644
--- a/dashboard/src/app/(authenticated)/(diagram)/components/NodeTypes/UserTask/UserTask.tsx
+++ b/dashboard/src/app/(authenticated)/(diagram)/components/NodeTypes/UserTask/UserTask.tsx
@@ -18,7 +18,7 @@ const Node: FC<NodeProps> = ({ data, selected }) => {
     <>
       <NodeDetails>
         <div className="">
-          <div className="flex items-center items-center gap-1 text-nowrap">
+          <div className="flex items-center gap-1 text-nowrap">
             <h3 className="font-bold">UserTask</h3>
             <Link
               className="flex items-center justify-center gap-1 text-blue-500 hover:underline"
diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
index d2ed7cebe..422d5739f 100644
--- 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,7 +109,7 @@ 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"

From df5d53b9fc5f784d6ea716a272dc64cf622f3f47 Mon Sep 17 00:00:00 2001
From: Hazim Arafa <hazimarafa80@gmail.com>
Date: Mon, 27 May 2024 10:03:52 -0700
Subject: [PATCH 12/12] revert: "chore: rename nodeRunName -> nodeName"

This reverts commit bb4f4dca9dbefd5b58568b34605a6633ca473fd5.
---
 .../(authenticated)/(diagram)/components/Diagram.tsx |  4 ++--
 .../(diagram)/components/Layouter.tsx                |  6 +++---
 .../taskDef/[name]/actions/searchTaskRun.ts          |  4 ++--
 .../taskDef/[name]/components/TaskDef.tsx            | 12 +-----------
 .../[...props]/components/UserTaskDef.tsx            |  2 +-
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/dashboard/src/app/(authenticated)/(diagram)/components/Diagram.tsx b/dashboard/src/app/(authenticated)/(diagram)/components/Diagram.tsx
index 1efc9fb6c..84472edde 100644
--- 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 nodeNameToBeHighlighted: string = searchParams.get('nodeName')!
+  const nodeRunNameToBeHighlighted: string = searchParams.get('nodeRunName')!
 
   let threadToShowByDefault = determineDefaultThreadRun(currentThread, wfRun, threadRunNumberFromRedirection, spec)
 
@@ -98,7 +98,7 @@ export const Diagram: FC<Props> = ({ spec, wfRun }) => {
         >
           <Controls />
         </ReactFlow>
-        <Layouter nodeRuns={threadNodeRuns} nodeNameToBeHighlighted={nodeNameToBeHighlighted} />
+        <Layouter nodeRuns={threadNodeRuns} nodeRunNameToBeHighlighted={nodeRunNameToBeHighlighted} />
       </div>
     </ThreadProvider>
   )
diff --git a/dashboard/src/app/(authenticated)/(diagram)/components/Layouter.tsx b/dashboard/src/app/(authenticated)/(diagram)/components/Layouter.tsx
index 9ea2ff43d..8219be4f1 100644
--- 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[]; nodeNameToBeHighlighted?: string }> = ({
+export const Layouter: FC<{ nodeRuns?: NodeRun[]; nodeRunNameToBeHighlighted?: string }> = ({
   nodeRuns,
-  nodeNameToBeHighlighted,
+  nodeRunNameToBeHighlighted,
 }) => {
   const nodes = useStore(store => store.getNodes())
   const edges = useStore(store => store.edges)
@@ -33,7 +33,7 @@ export const Layouter: FC<{ nodeRuns?: NodeRun[]; nodeNameToBeHighlighted?: stri
           return nodeRun.nodeName === node.id
         })
         const fade = nodeRuns !== undefined && nodeRun === undefined
-        const nodeNeedsToBeHighlighted = node.id === nodeNameToBeHighlighted
+        const nodeNeedsToBeHighlighted = node.id === nodeRunNameToBeHighlighted
 
         return {
           ...node,
diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/actions/searchTaskRun.ts b/dashboard/src/app/(authenticated)/taskDef/[name]/actions/searchTaskRun.ts
index 37cbfda26..8f0491df1 100644
--- a/dashboard/src/app/(authenticated)/taskDef/[name]/actions/searchTaskRun.ts
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/actions/searchTaskRun.ts
@@ -43,11 +43,11 @@ export const searchTaskRun = async ({
     })
   }
 
-  const userTaskRunWithDetails: runDetails[] = await Promise.all(hydrateWithTaskRunDetails())
+  const taskRunWithDetails: runDetails[] = await Promise.all(hydrateWithTaskRunDetails())
 
   return {
     ...taskRunIdList,
     bookmarkAsString: taskRunIdList.bookmark?.toString('base64'),
-    resultsWithDetails: userTaskRunWithDetails,
+    resultsWithDetails: taskRunWithDetails,
   }
 }
diff --git a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
index 422d5739f..6e9ed34dc 100644
--- a/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
+++ b/dashboard/src/app/(authenticated)/taskDef/[name]/components/TaskDef.tsx
@@ -106,14 +106,13 @@ export const TaskDef: FC<Props> = ({ spec }) => {
               {data?.pages.map((page, i) => (
                 <Fragment key={i}>
                   {page.resultsWithDetails.length > 0 ? (
-                    page.resultsWithDetails.map(({ taskRun, nodeRun }) => {
+                    page.resultsWithDetails.map(({ taskRun }) => {
                       return (
                         <tr key={taskRun.id?.taskGuid} className="border-b border-neutral-200">
                           <td className="px-6 py-4">
                             <Link
                               className="py-2 text-blue-500 hover:underline"
                               target="_blank"
-                              //? 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!)}
@@ -138,15 +137,6 @@ export const TaskDef: FC<Props> = ({ spec }) => {
           </table>
         </div>
       )}
-
-      {/* <div className="mt-6">
-        <SearchFooter
-          currentLimit={limit}
-          setLimit={setLimit}
-          hasNextPage={hasNextPage}
-          fetchNextPage={fetchNextPage}
-        />
-      </div> */}
     </>
   )
 }
diff --git a/dashboard/src/app/(authenticated)/userTaskDef/[...props]/components/UserTaskDef.tsx b/dashboard/src/app/(authenticated)/userTaskDef/[...props]/components/UserTaskDef.tsx
index 5784d70d7..ce68d5975 100644
--- 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}&nodeName=${nodeRun.nodeName}`}
+                              href={`/wfRun/${concatWfRunIds(userTaskRun.id?.wfRunId!)}?threadRunNumber=${userTaskRun.nodeRunId?.threadRunNumber}&nodeRunName=${nodeRun.nodeName}`}
                             >
                               {concatWfRunIds(userTaskRun.id?.wfRunId!)}
                             </Link>