Various fixes for no longer having the exportName

Author: ericallam

apps/webapp/app/components/runs/v3/TaskPath.tsx

@@ -19,16 +19,16 @@ export function TaskPath({ filePath, functionName, className }: TaskPathProps) {
   );
 }
 
-type TaskFunctionNameProps = {
-  functionName: string;
+type TaskFileNameProps = {
+  fileName: string;
   variant?: InlineCodeVariant;
   className?: string;
 };
 
-export function TaskFunctionName({ variant, functionName, className }: TaskFunctionNameProps) {
+export function TaskFileName({ variant, fileName, className }: TaskFileNameProps) {
   return (
     <InlineCode variant={variant} className={cn("text-text-dimmed", className)}>
-      {`${functionName}()`}
+      {`${fileName}`}
     </InlineCode>
   );
 }

apps/webapp/app/presenters/v3/SpanPresenter.server.ts

@@ -269,7 +269,6 @@ export class SpanPresenter extends BasePresenter {
       task: {
         id: run.taskIdentifier,
         filePath: run.lockedBy?.filePath,
-        exportName: run.lockedBy?.exportName,
       },
       run: {
         id: run.friendlyId,

apps/webapp/app/presenters/v3/TaskListPresenter.server.ts

@@ -15,9 +15,8 @@ import { BasePresenter } from "./basePresenter.server";
 import { TaskRunStatus } from "~/database-types";
 import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/isomorphic";
 
-export type Task = {
+export type TaskListItem = {
   slug: string;
-  exportName: string;
   filePath: string;
   createdAt: Date;
   triggerSource: TaskTriggerSource;
@@ -60,7 +59,6 @@ export class TaskListPresenter extends BasePresenter {
       {
         id: string;
         slug: string;
-        exportName: string;
         filePath: string;
         createdAt: Date;
         triggerSource: TaskTriggerSource;
@@ -81,7 +79,7 @@ export class TaskListPresenter extends BasePresenter {
         OR id IN (SELECT id FROM non_dev_workers)
       ORDER BY "runtimeEnvironmentId", "createdAt" DESC
     )
-    SELECT tasks.id, slug, "filePath", "exportName", "triggerSource", tasks."runtimeEnvironmentId", tasks."createdAt"
+    SELECT tasks.id, slug, "filePath", "triggerSource", tasks."runtimeEnvironmentId", tasks."createdAt"
     FROM workers
     JOIN ${sqlDatabaseSchema}."BackgroundWorkerTask" tasks ON tasks."workerId" = workers.id
     ORDER BY slug ASC;`;

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx

@@ -59,7 +59,7 @@ import {
 } from "~/components/primitives/Table";
 import { SimpleTooltip } from "~/components/primitives/Tooltip";
 import TooltipPortal from "~/components/primitives/TooltipPortal";
-import { TaskFunctionName } from "~/components/runs/v3/TaskPath";
+import { TaskFileName } from "~/components/runs/v3/TaskPath";
 import { TaskRunStatusCombo } from "~/components/runs/v3/TaskRunStatus";
 import {
   taskTriggerSourceDescription,
@@ -71,8 +71,8 @@ import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import { useTextFilter } from "~/hooks/useTextFilter";
 import {
-  type Task,
   type TaskActivity,
+  type TaskListItem,
   TaskListPresenter,
 } from "~/presenters/v3/TaskListPresenter.server";
 import {
@@ -154,19 +154,13 @@ export default function Page() {
   const environment = useEnvironment();
   const { tasks, activity, runningStats, durations, usefulLinksPreference } =
     useTypedLoaderData<typeof loader>();
-  const { filterText, setFilterText, filteredItems } = useTextFilter<Task>({
+  const { filterText, setFilterText, filteredItems } = useTextFilter<TaskListItem>({
     items: tasks,
     filter: (task, text) => {
       if (task.slug.toLowerCase().includes(text.toLowerCase())) {
         return true;
       }
 
-      if (
-        task.exportName.toLowerCase().includes(text.toLowerCase().replace("(", "").replace(")", ""))
-      ) {
-        return true;
-      }
-
       if (task.filePath.toLowerCase().includes(text.toLowerCase())) {
         return true;
       }
@@ -213,7 +207,7 @@ export default function Page() {
             <Property.Table>
               {tasks.map((task) => (
                 <Property.Item key={task.slug}>
-                  <Property.Label>{task.exportName}</Property.Label>
+                  <Property.Label>{task.filePath}</Property.Label>
                 </Property.Item>
               ))}
             </Property.Table>
@@ -258,7 +252,7 @@ export default function Page() {
                       <TableHeader>
                         <TableRow>
                           <TableHeaderCell>Task ID</TableHeaderCell>
-                          <TableHeaderCell>Task</TableHeaderCell>
+                          <TableHeaderCell>File</TableHeaderCell>
                           <TableHeaderCell>Running</TableHeaderCell>
                           <TableHeaderCell>Queued</TableHeaderCell>
                           <TableHeaderCell>Activity (7d)</TableHeaderCell>
@@ -289,8 +283,8 @@ export default function Page() {
                                   </div>
                                 </TableCell>
                                 <TableCell to={path}>
-                                  <TaskFunctionName
-                                    functionName={task.exportName}
+                                  <TaskFileName
+                                    fileName={task.filePath}
                                     variant="extra-extra-small"
                                   />
                                 </TableCell>