fix: External url button (#158)

ctrlplanedev · Oct 22, 2024 · abe4629 · abe4629
1 parent 4c63bec
commit abe4629
Show file tree

Hide file tree

Showing 8 changed files with 3,751 additions and 73 deletions.
diff --git a/apps/event-worker/src/job-dispatch/github.ts b/apps/event-worker/src/job-dispatch/github.ts
@@ -103,14 +103,9 @@ export const dispatchGithubJob = async (je: Job) => {
 
   let runId: number | null = null;
   let status: string | null = null;
-  let externalUrl: string | null = null;
 
   try {
-    const {
-      runId: runId_,
-      status: status_,
-      url: externalUrl_,
-    } = await pRetry(
+    const { runId: runId_, status: status_ } = await pRetry(
       async () => {
         const runs = await octokit.actions.listWorkflowRuns({
           owner: parsed.data.owner,
@@ -134,7 +129,6 @@ export const dispatchGithubJob = async (je: Job) => {
 
     runId = runId_;
     status = status_;
-    externalUrl = externalUrl_;
   } catch (error) {
     logger.error(`Job ${je.id} dispatch to GitHub failed`, { error });
     await db.update(job).set({
@@ -147,15 +141,13 @@ export const dispatchGithubJob = async (je: Job) => {
   logger.info(`Job ${je.id} dispatched to GitHub`, {
     runId,
     status,
-    externalUrl,
   });
 
   await db
     .update(job)
     .set({
       externalId: runId.toString(),
       status: convertStatus(status ?? JobStatus.InProgress),
-      externalUrl,
     })
     .where(eq(job.id, je.id));
 };
diff --git a/...ems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/TargetReleaseTable.tsx b/...ems/[systemSlug]/deployments/[deploymentSlug]/releases/[versionId]/TargetReleaseTable.tsx
@@ -4,12 +4,14 @@ import type { JobStatus } from "@ctrlplane/validators/jobs";
 import React, { Fragment } from "react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
-import { IconLoader2 } from "@tabler/icons-react";
+import { IconExternalLink, IconLoader2 } from "@tabler/icons-react";
 import { capitalCase } from "change-case";
 import _ from "lodash";
 
 import { cn } from "@ctrlplane/ui";
+import { buttonVariants } from "@ctrlplane/ui/button";
 import { Table, TableBody, TableCell, TableRow } from "@ctrlplane/ui/table";
+import { ReservedMetadataKey } from "@ctrlplane/validators/targets";
 
 import { JobTableStatusIcon } from "~/app/[workspaceSlug]/_components/JobTableStatusIcon";
 import { api } from "~/trpc/react";
@@ -56,70 +58,88 @@ export const TargetReleaseTable: React.FC<TargetReleaseTableProps> = ({
                     )}
                   </TableCell>
                 </TableRow>
-                {jobs.map((job, idx) => (
-                  <TableRow
-                    key={job.id}
-                    className={cn(
-                      idx !== jobs.length - 1 && "border-b-neutral-800/50",
-                    )}
-                  >
-                    <TableCell className="hover:bg-neutral-800/55">
-                      <Link
-                        href={`${pathname}?target_id=${job.target?.id}`}
-                        className="block w-full hover:text-blue-300"
-                      >
-                        {job.target?.name}
-                      </Link>
-                    </TableCell>
-                    <TableCell>
-                      <div className="flex items-center gap-1">
-                        <JobTableStatusIcon status={job.job.status} />
-                        {capitalCase(job.job.status)}
-                      </div>
-                    </TableCell>
-                    <TableCell>{job.type}</TableCell>
-                    <TableCell>
-                      {job.job.externalId != null ? (
-                        <code className="font-mono text-xs">
-                          {job.job.externalId}
-                        </code>
-                      ) : (
-                        <span className="text-sm text-muted-foreground">
-                          No external ID
-                        </span>
+                {jobs.map((job, idx) => {
+                  const linksMetadata = job.job.metadata.find(
+                    (m) => m.key === String(ReservedMetadataKey.Links),
+                  )?.value;
+
+                  const links =
+                    linksMetadata != null
+                      ? (JSON.parse(linksMetadata) as Record<string, string>)
+                      : null;
+
+                  return (
+                    <TableRow
+                      key={job.id}
+                      className={cn(
+                        idx !== jobs.length - 1 && "border-b-neutral-800/50",
                       )}
-                    </TableCell>
-                    <TableCell>
-                      {job.job.externalUrl != null ? (
+                    >
+                      <TableCell className="hover:bg-neutral-800/55">
                         <Link
-                          href={job.job.externalUrl}
-                          rel="nofollow noreferrer"
-                          target="_blank"
+                          href={`${pathname}?target_id=${job.target?.id}`}
+                          className="block w-full hover:text-blue-300"
                         >
-                          {job.job.externalUrl}
+                          {job.target?.name}
                         </Link>
-                      ) : (
-                        <span className="text-sm text-muted-foreground">
-                          No external URL
-                        </span>
-                      )}
-                    </TableCell>
-                    <TableCell>
-                      <div className="flex justify-end">
-                        <TargetDropdownMenu
-                          release={release}
-                          deploymentName={deploymentName}
-                          target={job.target}
-                          environmentId={job.environmentId}
-                          job={{
-                            id: job.job.id,
-                            status: job.job.status as JobStatus,
-                          }}
-                        />
-                      </div>
-                    </TableCell>
-                  </TableRow>
-                ))}
+                      </TableCell>
+                      <TableCell>
+                        <div className="flex items-center gap-1">
+                          <JobTableStatusIcon status={job.job.status} />
+                          {capitalCase(job.job.status)}
+                        </div>
+                      </TableCell>
+                      <TableCell>{job.type}</TableCell>
+                      <TableCell>
+                        {job.job.externalId != null ? (
+                          <code className="font-mono text-xs">
+                            {job.job.externalId}
+                          </code>
+                        ) : (
+                          <span className="text-sm text-muted-foreground">
+                            No external ID
+                          </span>
+                        )}
+                      </TableCell>
+                      <TableCell>
+                        {links != null && (
+                          <div className="flex items-center gap-1">
+                            {Object.entries(links).map(([label, url]) => (
+                              <Link
+                                key={label}
+                                href={url}
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                className={buttonVariants({
+                                  variant: "secondary",
+                                  size: "sm",
+                                  className: "gap-1",
+                                })}
+                              >
+                                <IconExternalLink className="h-4 w-4" />
+                                {label}
+                              </Link>
+                            ))}
+                          </div>
+                        )}
+                      </TableCell>
+                      <TableCell>
+                        <div className="flex justify-end">
+                          <TargetDropdownMenu
+                            release={release}
+                            deploymentName={deploymentName}
+                            target={job.target}
+                            environmentId={job.environmentId}
+                            job={{
+                              id: job.job.id,
+                              status: job.job.status as JobStatus,
+                            }}
+                          />
+                        </div>
+                      </TableCell>
+                    </TableRow>
+                  );
+                })}
               </Fragment>
             );
           })

diff --git a/packages/api/src/router/job.ts b/packages/api/src/router/job.ts
@@ -12,6 +12,7 @@ import {
   environmentPolicyReleaseWindow,
   job,
   jobAgent,
+  jobMetadata,
   release,
   releaseJobTrigger,
   system,
@@ -189,6 +190,7 @@ const releaseJobTriggerRouter = createTRPCRouter({
     .input(z.string().uuid())
     .query(({ ctx, input }) =>
       releaseJobTriggerQuery(ctx.db)
+        .leftJoin(jobMetadata, eq(jobMetadata.jobId, job.id))
         .leftJoin(
           environmentPolicy,
           eq(environment.policyId, environmentPolicy.id),
@@ -204,7 +206,10 @@ const releaseJobTriggerRouter = createTRPCRouter({
             .groupBy((row) => row.release_job_trigger.id)
             .map((v) => ({
               ...v[0]!.release_job_trigger,
-              job: v[0]!.job,
+              job: {
+                ...v[0]!.job,
+                metadata: v.map((t) => t.job_metadata).filter(isPresent),
+              },
               jobAgent: v[0]!.job_agent,
               target: v[0]!.target,
               release: { ...v[0]!.release, deployment: v[0]!.deployment },

diff --git a/packages/db/drizzle/0018_round_franklin_richards.sql b/packages/db/drizzle/0018_round_franklin_richards.sql
@@ -0,0 +1 @@
+ALTER TABLE "job" DROP COLUMN IF EXISTS "external_url";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE "job" DROP COLUMN IF EXISTS "external_url";