Fix requested changes

SSHari · SSHari · commit ca59b6b23680 · 2023-07-19T12:24:31.000-04:00
diff --git a/apps/webapp/app/presenters/IntegrationClientJobsPresenter.server.ts b/apps/webapp/app/presenters/IntegrationClientJobsPresenter.server.ts
diff --git a/apps/webapp/app/presenters/JobListPresenter.server.ts b/apps/webapp/app/presenters/JobListPresenter.server.ts
@@ -3,7 +3,8 @@ import {
   DisplayPropertySchema,
   EventSpecificationSchema,
 } from "@trigger.dev/internal";
-import { PrismaClient, prisma } from "~/db.server";
+import { PrismaClient, Prisma, prisma } from "~/db.server";
+import { Organization } from "~/models/organization.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
 import { z } from "zod";
@@ -17,81 +18,91 @@ export class JobListPresenter {
 
   public async call({
     userId,
-    slug,
-  }: Pick<Project, "slug"> & {
+    projectSlug,
+    organizationSlug,
+    integrationSlug,
+  }: {
     userId: User["id"];
+    projectSlug: Project["slug"];
+    organizationSlug?: Organization["slug"];
+    integrationSlug?: string;
   }) {
-    const project = await this.#prismaClient.project.findFirst({
+    const orgWhere: Prisma.JobWhereInput["organization"] = organizationSlug
+      ? { slug: organizationSlug, members: { some: { userId } } }
+      : { members: { some: { userId } } };
+
+    const integrationsWhere: Prisma.JobWhereInput["integrations"] =
+      integrationSlug
+        ? { some: { integration: { slug: integrationSlug } } }
+        : {};
+
+    const jobs = await this.#prismaClient.job.findMany({
       select: {
-        jobs: {
+        id: true,
+        slug: true,
+        title: true,
+        aliases: {
           select: {
-            id: true,
-            slug: true,
-            title: true,
-            aliases: {
+            version: {
               select: {
-                version: {
+                version: true,
+                eventSpecification: true,
+                properties: true,
+                runs: {
                   select: {
-                    version: true,
-                    eventSpecification: true,
-                    properties: true,
-                    runs: {
-                      select: {
-                        createdAt: true,
-                        status: true,
-                      },
-                      take: 1,
-                      orderBy: [{ createdAt: "desc" }],
-                    },
-                    integrations: {
-                      select: {
-                        key: true,
-                        integration: {
-                          select: {
-                            slug: true,
-                            definition: true,
-                            setupStatus: true,
-                          },
-                        },
-                      },
-                    },
+                    createdAt: true,
+                    status: true,
                   },
+                  take: 1,
+                  orderBy: [{ createdAt: "desc" }],
                 },
-                environment: {
+                integrations: {
                   select: {
-                    type: true,
-                    orgMember: {
+                    key: true,
+                    integration: {
                       select: {
-                        userId: true,
+                        slug: true,
+                        definition: true,
+                        setupStatus: true,
                       },
                     },
                   },
                 },
               },
-              where: {
-                name: "latest",
-              },
             },
-            dynamicTriggers: {
+            environment: {
               select: {
                 type: true,
+                orgMember: {
+                  select: {
+                    userId: true,
+                  },
+                },
               },
             },
           },
           where: {
-            internal: false,
+            name: "latest",
           },
-          orderBy: [{ title: "asc" }],
         },
+        dynamicTriggers: {
+          select: {
+            type: true,
+          },
+        },
+      },
+      where: {
+        internal: false,
+        organization: orgWhere,
+        project: {
+          slug: projectSlug,
+        },
+        integrations: integrationsWhere,
       },
-      where: { slug, organization: { members: { some: { userId } } } },
+      orderBy: [{ title: "asc" }],
     });
 
-    if (!project) {
-      return [];
-    }
-
-    return project.jobs
+    return jobs
       .map((job) => {
         //the best alias to select:
         // 1. Logged-in user dev
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam._index/route.tsx
@@ -39,7 +39,7 @@ export const loader = async ({ request, params }: LoaderArgs) => {
 
   try {
     const presenter = new JobListPresenter();
-    const jobs = await presenter.call({ userId, slug: projectParam });
+    const jobs = await presenter.call({ userId, projectSlug: projectParam });
 
     return typedjson({
       jobs,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.integrations_.$clientParam._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.integrations_.$clientParam._index/route.tsx
@@ -10,7 +10,6 @@ import { Help, HelpContent, HelpTrigger } from "~/components/primitives/Help";
 import { Input } from "~/components/primitives/Input";
 import { useFilterJobs } from "~/hooks/useFilterJobs";
 import { useIntegrationClient } from "~/hooks/useIntegrationClient";
-import { IntegrationClientJobsPresenter } from "~/presenters/IntegrationClientJobsPresenter.server";
 import { JobListPresenter } from "~/presenters/JobListPresenter.server";
 import { requireUserId } from "~/services/session.server";
 import { cn } from "~/utils/cn";
@@ -26,25 +25,16 @@ export const loader = async ({ request, params }: LoaderArgs) => {
   const { organizationSlug, projectParam, clientParam } =
     IntegrationClientParamSchema.parse(params);
 
-  const integrationPresenter = new IntegrationClientJobsPresenter();
   const jobsPresenter = new JobListPresenter();
 
-  const [integrationJobs, userJobs] = await Promise.all([
-    integrationPresenter.call({
-      userId: userId,
-      organizationSlug,
-      projectSlug: projectParam,
-      clientSlug: clientParam,
-    }),
-    jobsPresenter.call({ userId, slug: projectParam }),
-  ]);
+  const jobs = await jobsPresenter.call({
+    userId,
+    projectSlug: projectParam,
+    organizationSlug,
+    integrationSlug: clientParam,
+  });
 
-  const integrationJobIds = integrationJobs.jobs.map((job) => job.id);
-  const filteredJobs = userJobs.filter((job) =>
-    integrationJobIds.includes(job.id)
-  );
-
-  return typedjson({ jobs: filteredJobs });
+  return typedjson({ jobs });
 };
 
 export const handle: Handle = {
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.jobs.$jobParam/route.tsx
@@ -50,7 +50,7 @@ export const loader = async ({ request, params }: LoaderArgs) => {
       projectSlug: projectParam,
       organizationSlug,
     }),
-    jobsPresenter.call({ userId, slug: projectParam }),
+    jobsPresenter.call({ userId, projectSlug: projectParam }),
   ]);
 
   if (job === null) {
