From 398970244dade9969684073588d4def7a155887d Mon Sep 17 00:00:00 2001 From: Bruno Carlos <6951456+brnovasco@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:10:30 -0300 Subject: [PATCH] feat(spu-ui): enhance metadata schema in QueueItem component - Including simple aquisition plan metadata to the schema. --- .../src/app/_components/queue/queue-item.tsx | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/spu-ui/src/app/_components/queue/queue-item.tsx b/apps/spu-ui/src/app/_components/queue/queue-item.tsx index 5faca08..ab72bbc 100644 --- a/apps/spu-ui/src/app/_components/queue/queue-item.tsx +++ b/apps/spu-ui/src/app/_components/queue/queue-item.tsx @@ -30,9 +30,12 @@ const commonKwargsSchema = z.object({ sampleTag: z.string().optional(), metadata: z .object({ - sampleType: z.string(), - sampleTag: z.string(), - bufferTag: z.string(), + sampleType: z.string().optional(), + sampleTag: z.string().optional(), + bufferTag: z.string().optional(), + row: z.string().optional(), + col: z.string().optional(), + tray: z.string().optional(), }) .optional(), }); @@ -180,6 +183,8 @@ function RemoveButton({ uid, disabled }: { uid?: string; disabled?: boolean }) { export function PlanContent({ props }: { props: QueueItemProps }) { const common = commonKwargsSchema.safeParse(props.kwargs); if (!common.success) { + console.error(common.error); + console.error(props.kwargs); return null; } return ( @@ -188,9 +193,15 @@ export function PlanContent({ props }: { props: QueueItemProps }) { proposal: {common.data.proposal} )} {common.data.tray && {common.data.tray}} + {common.data.metadata?.tray && ( + {common.data.metadata.tray} + )} {common.data.col && common.data.row && ( {`${common.data.col}${common.data.row}`} )} + {common.data.metadata?.col && common.data.metadata.row && ( + {`${common.data.metadata.col}${common.data.metadata.row}`} + )} {common.data.sampleType && common.data.sampleTag && ( : {common.data.sampleTag}} )} - {common.data.metadata && ( + {common.data.metadata?.sampleType && common.data.metadata?.sampleTag && (