Merge remote-tracking branch 'origin/main' into feat/tier-scheduling

Author: nicktrn

apps/webapp/.gitignore

@@ -18,4 +18,5 @@ build-storybook.log
 storybook-static
 
 /prisma/seed.js
-/prisma/populate.js
+/prisma/populate.js
+.memory-snapshots

apps/webapp/app/components/code/CodeBlock.tsx

@@ -86,11 +86,17 @@ const defaultTheme: PrismTheme = {
       },
     },
     {
-      types: ["property", "tag", "boolean", "number", "constant", "symbol", "deleted"],
+      types: ["property", "tag", "constant", "symbol", "deleted"],
       style: {
         color: "#9B99FF",
       },
     },
+    {
+      types: ["boolean", "number"],
+      style: {
+        color: "#E5C07B",
+      },
+    },
     {
       types: ["selector", "attr-name", "string", "char", "builtin", "inserted"],
       style: {
@@ -151,12 +157,6 @@ const defaultTheme: PrismTheme = {
         color: "#F85149",
       },
     },
-    {
-      types: ["boolean"],
-      style: {
-        color: "#9B99FF",
-      },
-    },
     {
       types: ["char"],
       style: {

apps/webapp/app/components/code/codeMirrorTheme.ts

@@ -11,9 +11,10 @@ export function darkTheme(): Extension {
     ivory = "#abb2bf",
     stone = "#7d8799",
     malibu = "#61afef",
-    sage = "#98c379",
+    sage = "#afec73",
     whiskey = "#d19a66",
     violet = "#c678dd",
+    lilac = "#9b99ff",
     darkBackground = "#21252b",
     highlightBackground = "rgba(71,85,105,0.2)",
     background = "#121317",
@@ -173,7 +174,7 @@ export function darkTheme(): Extension {
     { tag: tags.keyword, color: violet },
     {
       tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
-      color: coral,
+      color: lilac,
     },
     { tag: [tags.function(tags.variableName), tags.labelName], color: malibu },
     {
@@ -186,6 +187,7 @@ export function darkTheme(): Extension {
         tags.typeName,
         tags.className,
         tags.number,
+        tags.bool,
         tags.changed,
         tags.annotation,
         tags.modifier,
@@ -213,7 +215,7 @@ export function darkTheme(): Extension {
     { tag: tags.link, color: stone, textDecoration: "underline" },
     { tag: tags.heading, fontWeight: "bold", color: coral },
     {
-      tag: [tags.atom, tags.bool, tags.special(tags.variableName)],
+      tag: [tags.atom, tags.special(tags.variableName)],
       color: whiskey,
     },
     {

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

@@ -1,6 +1,6 @@
 import { GitMeta } from "@trigger.dev/core/v3";
 import { type z } from "zod";
-import { Prisma, type PrismaClient, prisma } from "~/db.server";
+import { type Prisma, type PrismaClient, prisma } from "~/db.server";
 import { type Project } from "~/models/project.server";
 import { type User } from "~/models/user.server";
 import { type BranchesOptions } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route";
@@ -38,6 +38,13 @@ export type GitMetaLinks = {
   commitMessage: string;
   /** The commit author */
   commitAuthor: string;
+
+  /** The git provider, e.g., `github` */
+  provider?: string;
+
+  source?: "trigger_github_app" | "github_actions" | "local";
+  ghUsername?: string;
+  ghUserAvatarUrl?: string;
 };
 
 export class BranchesPresenter {
@@ -239,5 +246,9 @@ export function processGitMetadata(data: Prisma.JsonValue): GitMetaLinks | null
     isDirty: parsed.data.dirty ?? false,
     commitMessage: parsed.data.commitMessage ?? "",
     commitAuthor: parsed.data.commitAuthorName ?? "",
+    provider: parsed.data.provider,
+    source: parsed.data.source,
+    ghUsername: parsed.data.ghUsername,
+    ghUserAvatarUrl: parsed.data.ghUserAvatarUrl,
   };
 }

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

@@ -245,21 +245,20 @@ export default function Page() {
                               )}
                             </TableCell>
                             <TableCell to={path} isSelected={isSelected}>
-                              {deployment.deployedBy ? (
-                                <div className="flex items-center gap-1">
-                                  <UserAvatar
-                                    avatarUrl={deployment.deployedBy.avatarUrl}
-                                    name={
-                                      deployment.deployedBy.name ??
-                                      deployment.deployedBy.displayName
-                                    }
-                                    className="h-4 w-4"
-                                  />
-                                  <Paragraph variant="extra-small">
-                                    {deployment.deployedBy.name ??
-                                      deployment.deployedBy.displayName}
-                                  </Paragraph>
-                                </div>
+                              {deployment.git?.source === "trigger_github_app" ? (
+                                <UserTag
+                                  name={deployment.git.ghUsername ?? "GitHub Integration"}
+                                  avatarUrl={deployment.git.ghUserAvatarUrl}
+                                />
+                              ) : deployment.deployedBy ? (
+                                <UserTag
+                                  name={
+                                    deployment.deployedBy.name ??
+                                    deployment.deployedBy.displayName ??
+                                    ""
+                                  }
+                                  avatarUrl={deployment.deployedBy.avatarUrl ?? undefined}
+                                />
                               ) : (
                                 "–"
                               )}
@@ -318,6 +317,15 @@ export default function Page() {
   );
 }
 
+function UserTag({ name, avatarUrl }: { name: string; avatarUrl?: string }) {
+  return (
+    <div className="flex items-center gap-1">
+      <UserAvatar avatarUrl={avatarUrl} name={name} className="h-4 w-4" />
+      <Paragraph variant="extra-small">{name}</Paragraph>
+    </div>
+  );
+}
+
 function DeploymentActionsCell({
   deployment,
   path,

apps/webapp/app/routes/admin.api.v1.gc.ts

@@ -2,7 +2,8 @@ import { type DataFunctionArgs } from "@remix-run/node";
 import { PerformanceObserver } from "node:perf_hooks";
 import { runInNewContext } from "node:vm";
 import v8 from "v8";
-import { requireUser } from "~/services/session.server";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
 
 async function waitTillGcFinishes() {
   let resolver: (value: PerformanceEntry) => void;
@@ -35,9 +36,19 @@ async function waitTillGcFinishes() {
 }
 
 export async function loader({ request }: DataFunctionArgs) {
-  const user = await requireUser(request);
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
 
-  if (!user.admin) {
+  if (!authenticationResult) {
+    throw new Response("You must be an admin to perform this action", { status: 403 });
+  }
+
+  const user = await prisma.user.findFirst({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user?.admin) {
     throw new Response("You must be an admin to perform this action", { status: 403 });
   }
 

apps/webapp/app/routes/admin.api.v1.snapshot.ts

@@ -4,7 +4,8 @@ import os from "os";
 import path from "path";
 import { PassThrough } from "stream";
 import v8 from "v8";
-import { requireUser } from "~/services/session.server";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
 
 // Format date as yyyy-MM-dd HH_mm_ss_SSS
 function formatDate(date: Date) {
@@ -24,9 +25,19 @@ function formatDate(date: Date) {
 }
 
 export async function loader({ request }: DataFunctionArgs) {
-  const user = await requireUser(request);
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
 
-  if (!user.admin) {
+  if (!authenticationResult) {
+    throw new Response("You must be an admin to perform this action", { status: 403 });
+  }
+
+  const user = await prisma.user.findFirst({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user?.admin) {
     throw new Response("You must be an admin to perform this action", { status: 403 });
   }
 

apps/webapp/app/routes/api.v1.mock.ts

@@ -0,0 +1,20 @@
+import { ActionFunctionArgs } from "@remix-run/server-runtime";
+
+export async function action({ request }: ActionFunctionArgs) {
+  if (process.env.NODE_ENV === "production") {
+    return new Response("Not found", { status: 404 });
+  }
+
+  return new Response(
+    JSON.stringify({
+      data: {
+        id: "123",
+        type: "mock",
+        attributes: {
+          name: "Mock",
+        },
+      },
+    }),
+    { status: 200 }
+  );
+}