Fix: show latest release by deployment and environment

apps/webservice/src/app/[workspaceSlug]/systems/[systemSlug]/deployments/TableDeployments.tsx

@@ -122,12 +122,13 @@ const DeploymentTable: React.FC<{
   environments: Array<Environment & { targets: Target[] }>;
   deployments: Array<
     Deployment & {
-      latestRelease: {
+      activeReleases: Array<{
         id: string;
         name: string;
         version: string;
         createdAt: Date;
-      } | null;
+        environmentId: string;
+      }> | null;
     }
   >;
   workspaceSlug: string;
@@ -178,6 +179,9 @@ const DeploymentTable: React.FC<{
               </td>
 
               {environments.map((env, envIdx) => {
+                const release =
+                  r.activeReleases?.find((r) => r.environmentId === env.id) ??
+                  null;
                 return (
                   <td
                     key={env.id}
@@ -189,7 +193,7 @@ const DeploymentTable: React.FC<{
                     )}
                   >
                     <ReleaseCell
-                      release={r.latestRelease}
+                      release={release}
                       environment={env}
                       deployment={r}
                       workspaceSlug={workspaceSlug}

packages/api/src/router/deployment.ts

@@ -1,4 +1,6 @@
 import type { Tx } from "@ctrlplane/db";
+import _ from "lodash";
+import { isPresent } from "ts-is-present";
 import { z } from "zod";
 
 import {
@@ -30,7 +32,7 @@ import { JobStatus } from "@ctrlplane/validators/jobs";
 import { createTRPCRouter, protectedProcedure } from "../trpc";
 import { deploymentVariableRouter } from "./deployment-variable";
 
-const latestReleaseSubQuery = (db: Tx) =>
+const latestActiveReleaseSubQuery = (db: Tx) =>
   db
     .select({
       id: release.id,
@@ -39,13 +41,15 @@ const latestReleaseSubQuery = (db: Tx) =>
       createdAt: release.createdAt,
       name: release.name,
       config: release.config,
+      environmentId: releaseJobTrigger.environmentId,
 
-      rank: sql<number>`ROW_NUMBER() OVER (PARTITION BY deployment_id ORDER BY created_at DESC)`.as(
+      rank: sql<number>`ROW_NUMBER() OVER (PARTITION BY ${release.deploymentId}, ${releaseJobTrigger.environmentId} ORDER BY ${release.createdAt} DESC)`.as(
         "rank",
       ),
     })
     .from(release)
-    .as("release");
+    .innerJoin(releaseJobTrigger, eq(releaseJobTrigger.releaseId, release.id))
+    .as("active_release");
 
 export const deploymentRouter = createTRPCRouter({
   variable: deploymentVariableRouter,
@@ -63,7 +67,7 @@ export const deploymentRouter = createTRPCRouter({
           id: job.id,
           status: job.status,
           targetId: releaseJobTrigger.targetId,
-          rank: sql<number>`ROW_NUMBER() OVER (PARTITION BY release_job_trigger.target_id ORDER BY job.created_at DESC)`.as(
+          rank: sql<number>`ROW_NUMBER() OVER (PARTITION BY ${releaseJobTrigger.targetId} ORDER BY ${job.createdAt} DESC)`.as(
             "rank",
           ),
         })
@@ -203,20 +207,26 @@ export const deploymentRouter = createTRPCRouter({
           .on({ type: "system", id: input }),
     })
     .query(async ({ ctx, input }) => {
-      const latestRelease = latestReleaseSubQuery(ctx.db);
+      const activeRelease = latestActiveReleaseSubQuery(ctx.db);
       return ctx.db
         .select()
         .from(deployment)
         .leftJoin(
-          latestRelease,
+          activeRelease,
           and(
-            eq(latestRelease.deploymentId, deployment.id),
-            eq(latestRelease.rank, 1),
+            eq(activeRelease.deploymentId, deployment.id),
+            eq(activeRelease.rank, 1),
           ),
         )
         .where(eq(deployment.systemId, input))
-        .then((r) =>
-          r.map((row) => ({ ...row.deployment, latestRelease: row.release })),
+        .then((ts) =>
+          _.chain(ts)
+            .groupBy((t) => t.deployment.id)
+            .map((t) => ({
+              ...t[0]!.deployment,
+              activeReleases: t.map((a) => a.active_release).filter(isPresent),
+            }))
+            .value(),
         );
     }),
 
@@ -304,21 +314,24 @@ export const deploymentRouter = createTRPCRouter({
     })
     .input(z.string().uuid())
     .query(async ({ ctx, input }) => {
-      const latestRelease = latestReleaseSubQuery(ctx.db);
+      const activeRelease = latestActiveReleaseSubQuery(ctx.db);
       return ctx.db
         .select()
         .from(deployment)
         .innerJoin(system, eq(system.id, deployment.systemId))
         .leftJoin(
-          latestRelease,
+          activeRelease,
           and(
-            eq(latestRelease.deploymentId, deployment.id),
-            eq(latestRelease.rank, 1),
+            eq(activeRelease.deploymentId, deployment.id),
+            eq(activeRelease.rank, 1),
           ),
         )
         .where(eq(system.workspaceId, input))
         .then((r) =>
-          r.map((row) => ({ ...row.deployment, latestRelease: row.release })),
+          r.map((row) => ({
+            ...row.deployment,
+            latestRelease: row.active_release,
+          })),
         );
     }),
 });