Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion apps/webapp/app/presenters/v3/BranchesPresenter.server.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -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}
/>
) : (
"–"
)}
Expand Down Expand Up @@ -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,
Expand Down