Shows what last reached the client with evidence (shared EXR package or manual delivery), anything newer still on its way, and the last review MOV, so it's clear on Shot Status what has actually been sent. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -60,6 +60,7 @@ import {
|
||||
} from "lucide-react";
|
||||
import { format } from "date-fns";
|
||||
import { shotThumbnail } from "@/lib/shot-thumbnail";
|
||||
import type { ShotDeliverySummary } from "@/lib/render-pipeline/shot-delivery-summary";
|
||||
|
||||
type ShotRow = {
|
||||
id: string;
|
||||
@@ -79,6 +80,7 @@ type ShotRow = {
|
||||
manualDeliveredAt: Date | string | null;
|
||||
manualDeliveryNote: string | null;
|
||||
shotVersion: string | null;
|
||||
delivery: ShotDeliverySummary;
|
||||
artist: { id: string; name: string | null; image: string | null; email: string } | null;
|
||||
shotGroup: { id: string; name: string } | null;
|
||||
};
|
||||
@@ -853,6 +855,57 @@ function ScaledShotToggle({ shot }: { shot: ShotRow }) {
|
||||
);
|
||||
}
|
||||
|
||||
const PENDING_TONE = {
|
||||
progress: "text-blue-300",
|
||||
waiting: "text-amber-300",
|
||||
failed: "text-red-400",
|
||||
} as const;
|
||||
|
||||
/**
|
||||
* What last reached the client for this shot, with evidence — not what was
|
||||
* rendered or built — plus whatever newer is still on its way.
|
||||
*/
|
||||
function DeliveryCell({ delivery, shotVersion }: { delivery: ShotDeliverySummary; shotVersion: string | null }) {
|
||||
const { sent, review, pending } = delivery;
|
||||
if (!sent && !review && !pending) {
|
||||
return <span className="text-xs text-zinc-600 italic">Never sent</span>;
|
||||
}
|
||||
// The panel's version moving past what was delivered means a newer version
|
||||
// exists that the client has not had, even before it has been exported.
|
||||
const behind = sent?.version && shotVersion && sent.version !== shotVersion && !pending;
|
||||
|
||||
return (
|
||||
<div className="space-y-0.5 text-xs leading-tight">
|
||||
{sent ? (
|
||||
<div
|
||||
className="flex items-center gap-1 text-emerald-300"
|
||||
title={[sent.label, sent.to && `sent to ${sent.to}`, sent.note].filter(Boolean).join(" · ")}
|
||||
>
|
||||
<PackageCheck className="h-3 w-3 shrink-0" />
|
||||
{sent.version && <span className="font-mono">{sent.version}</span>}
|
||||
<span className="text-zinc-300">{format(new Date(sent.at), "d MMM")}</span>
|
||||
<span className="truncate text-zinc-500">
|
||||
{sent.via === "MANUAL" ? "· manual" : sent.to ? `· ${sent.to}` : ""}
|
||||
</span>
|
||||
</div>
|
||||
) : (
|
||||
<div className="text-zinc-600 italic">Not delivered</div>
|
||||
)}
|
||||
{pending && (
|
||||
<div className={cn("truncate", PENDING_TONE[pending.tone])} title={pending.label}>
|
||||
{pending.version && <span className="font-mono">{pending.version}</span>} {pending.label}
|
||||
</div>
|
||||
)}
|
||||
{behind && <div className="text-zinc-500">current is <span className="font-mono">{shotVersion}</span></div>}
|
||||
{review && (
|
||||
<div className="truncate text-zinc-500" title={review.label}>
|
||||
Review MOV <span className="font-mono">{review.version}</span> {format(new Date(review.at), "d MMM")}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function ShotTable({
|
||||
shots,
|
||||
canManage,
|
||||
@@ -889,6 +942,7 @@ function ShotTable({
|
||||
<th className="text-left py-2 px-3 text-xs font-medium text-zinc-500 w-32">Status</th>
|
||||
<th className="text-left py-2 px-3 text-xs font-medium text-zinc-500 w-40">Artist</th>
|
||||
<th className="text-left py-2 px-3 text-xs font-medium text-zinc-500 w-32">Due Date</th>
|
||||
<th className="text-left py-2 px-3 text-xs font-medium text-zinc-500 w-48">Last sent</th>
|
||||
<th className="text-left py-2 px-3 text-xs font-medium text-zinc-500">Notes</th>
|
||||
<th className="py-2 px-3 text-xs font-medium text-zinc-500 w-20 text-center">
|
||||
<span className="flex items-center gap-1 justify-center">
|
||||
@@ -970,15 +1024,6 @@ function ShotTable({
|
||||
Scaled
|
||||
</span>
|
||||
)}
|
||||
{shot.manualDeliveredAt && (
|
||||
<span
|
||||
title={shot.manualDeliveryNote ?? "Delivered outside the render pipeline"}
|
||||
className="flex items-center gap-1 rounded-full border border-emerald-500/30 bg-emerald-500/10 px-1.5 py-0.5 text-[10px] font-medium text-emerald-300 shrink-0"
|
||||
>
|
||||
<PackageCheck className="h-2.5 w-2.5" />
|
||||
Delivered {format(new Date(shot.manualDeliveredAt), "d MMM")}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
{shot.description && (
|
||||
<p className="text-xs text-zinc-500 mt-0.5 truncate max-w-[200px]">
|
||||
@@ -1031,6 +1076,11 @@ function ShotTable({
|
||||
)}
|
||||
</td>
|
||||
|
||||
{/* Last delivery, and anything newer on its way */}
|
||||
<td className="py-2 px-3">
|
||||
<DeliveryCell delivery={shot.delivery} shotVersion={shot.shotVersion} />
|
||||
</td>
|
||||
|
||||
{/* Notes */}
|
||||
<td className="py-2 px-3 min-w-[220px]">
|
||||
<NotesCell shot={shot} canManage={canManage} />
|
||||
|
||||
@@ -2,6 +2,7 @@ import { db } from "@/lib/db";
|
||||
import { auth } from "@/auth";
|
||||
import { redirect } from "next/navigation";
|
||||
import { ShotStatusClient } from "./ShotStatusClient";
|
||||
import { summariseShotDelivery } from "@/lib/render-pipeline/shot-delivery-summary";
|
||||
|
||||
async function getProjects() {
|
||||
return db.project.findMany({
|
||||
@@ -29,7 +30,7 @@ async function getAssignableArtists() {
|
||||
}
|
||||
|
||||
async function getShotsForProject(projectId: string) {
|
||||
return db.shot.findMany({
|
||||
const shots = await db.shot.findMany({
|
||||
where: { projectId },
|
||||
orderBy: [
|
||||
{ episode: { sort: "asc", nulls: "last" } },
|
||||
@@ -53,13 +54,55 @@ async function getShotsForProject(projectId: string) {
|
||||
isScaled: true,
|
||||
manualDeliveredAt: true,
|
||||
manualDeliveryNote: true,
|
||||
manualDeliverySharedWith: true,
|
||||
// The shot-level version the panel burns into overlays and queueExport
|
||||
// renders under — not the count of review Versions uploaded.
|
||||
shotVersion: true,
|
||||
artist: { select: { id: true, name: true, image: true, email: true } },
|
||||
shotGroup: { select: { id: true, name: true } },
|
||||
// Every export, for the packages each went into; the newest live one
|
||||
// is what is on its way.
|
||||
exports: {
|
||||
orderBy: [{ versionNumber: "desc" }, { createdAt: "desc" }],
|
||||
select: {
|
||||
versionString: true,
|
||||
status: true,
|
||||
deliveryItems: {
|
||||
select: {
|
||||
versionString: true,
|
||||
package: {
|
||||
select: {
|
||||
kind: true,
|
||||
status: true,
|
||||
packageNumber: true,
|
||||
createdAt: true,
|
||||
builtAt: true,
|
||||
uploadedAt: true,
|
||||
deliveredAt: true,
|
||||
sharedWith: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
return shots.map(({ exports, ...shot }) => ({
|
||||
...shot,
|
||||
delivery: summariseShotDelivery({
|
||||
packages: exports.flatMap((e) =>
|
||||
e.deliveryItems.map((item) => ({ ...item.package, versionString: item.versionString }))
|
||||
),
|
||||
manual: {
|
||||
deliveredAt: shot.manualDeliveredAt,
|
||||
sharedWith: shot.manualDeliverySharedWith,
|
||||
note: shot.manualDeliveryNote,
|
||||
},
|
||||
latestExport: exports.find((e) => e.status !== "CANCELLED" && e.status !== "ARCHIVED") ?? null,
|
||||
}),
|
||||
}));
|
||||
}
|
||||
|
||||
export default async function ShotStatusPage({
|
||||
|
||||
Reference in New Issue
Block a user