From 0c8fe41b84f499116e228b40071f7880202a52e4 Mon Sep 17 00:00:00 2001 From: Chenlei Hu Date: Wed, 30 Oct 2024 20:36:33 -0400 Subject: [PATCH] Fix queue ResultItem schema (#1386) --- src/stores/queueStore.ts | 10 +++++----- src/types/apiTypes.ts | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/stores/queueStore.ts b/src/stores/queueStore.ts index 4feec37e3..414100d98 100644 --- a/src/stores/queueStore.ts +++ b/src/stores/queueStore.ts @@ -28,7 +28,7 @@ export enum TaskItemDisplayStatus { export class ResultItemImpl { filename: string - subfolder?: string + subfolder: string type: string nodeId: NodeId @@ -40,9 +40,9 @@ export class ResultItemImpl { frame_rate?: number constructor(obj: Record) { - this.filename = obj.filename - this.subfolder = obj.subfolder - this.type = obj.type + this.filename = obj.filename ?? '' + this.subfolder = obj.subfolder ?? '' + this.type = obj.type ?? '' this.nodeId = obj.nodeId this.mediaType = obj.mediaType @@ -55,7 +55,7 @@ export class ResultItemImpl { const params = new URLSearchParams() params.set('filename', this.filename) params.set('type', this.type) - params.set('subfolder', this.subfolder || '') + params.set('subfolder', this.subfolder) if (this.format) { params.set('format', this.format) diff --git a/src/types/apiTypes.ts b/src/types/apiTypes.ts index 646ef782d..eed2486bd 100644 --- a/src/types/apiTypes.ts +++ b/src/types/apiTypes.ts @@ -10,9 +10,9 @@ const zNodeType = z.string() const zQueueIndex = z.number() const zPromptId = z.string() const zResultItem = z.object({ - filename: z.string(), + filename: z.string().optional(), subfolder: z.string().optional(), - type: z.string() + type: z.string().optional() }) export type ResultItem = z.infer const zOutputs = z