Skip to content

Commit 7041dc3

Browse files
committed
Show github user tag also in the deployment details page
1 parent 84fbd77 commit 7041dc3

File tree

2 files changed

+12
-12
lines changed
  • apps/webapp/app/routes
    • _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam
    • _app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments

2 files changed

+12
-12
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { requireUserId } from "~/services/session.server";
3232
import { cn } from "~/utils/cn";
3333
import { v3DeploymentParams, v3DeploymentsPath, v3RunsPath } from "~/utils/pathBuilder";
3434
import { capitalizeWord } from "~/utils/string";
35+
import { UserTag } from "../_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments/route";
3536

3637
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
3738
const userId = await requireUserId(request);
@@ -232,17 +233,16 @@ export default function Page() {
232233
<Property.Item>
233234
<Property.Label>Deployed by</Property.Label>
234235
<Property.Value>
235-
{deployment.deployedBy ? (
236-
<div className="flex items-center gap-1">
237-
<UserAvatar
238-
avatarUrl={deployment.deployedBy.avatarUrl}
239-
name={deployment.deployedBy.name ?? deployment.deployedBy.displayName}
240-
className="h-4 w-4"
241-
/>
242-
<Paragraph variant="small">
243-
{deployment.deployedBy.name ?? deployment.deployedBy.displayName}
244-
</Paragraph>
245-
</div>
236+
{deployment.git?.source === "trigger_github_app" ? (
237+
<UserTag
238+
name={deployment.git.ghUsername ?? "GitHub Integration"}
239+
avatarUrl={deployment.git.ghUserAvatarUrl}
240+
/>
241+
) : deployment.deployedBy ? (
242+
<UserTag
243+
name={deployment.deployedBy.name ?? deployment.deployedBy.displayName ?? ""}
244+
avatarUrl={deployment.deployedBy.avatarUrl ?? undefined}
245+
/>
246246
) : (
247247
"–"
248248
)}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ export default function Page() {
358358
);
359359
}
360360

361-
function UserTag({ name, avatarUrl }: { name: string; avatarUrl?: string }) {
361+
export function UserTag({ name, avatarUrl }: { name: string; avatarUrl?: string }) {
362362
return (
363363
<div className="flex items-center gap-1">
364364
<UserAvatar avatarUrl={avatarUrl} name={name} className="h-4 w-4" />

0 commit comments

Comments
 (0)