fix: speed up psd template dialog load
Some checks failed
Lint / build (20) (push) Has been cancelled
Playwright Tests / test (push) Has been cancelled

This commit is contained in:
Your Name 2026-04-10 19:55:36 +08:00
parent 25132540bc
commit 0e95d9ec29
3 changed files with 20 additions and 60 deletions

View File

@ -1,11 +1,9 @@
import { NextRequest, NextResponse } from "next/server"; import { NextRequest, NextResponse } from "next/server";
import { upsertSystemSetting } from "@/lib/db/queries";
import { auth } from "@/app/(auth)/auth"; import { auth } from "@/app/(auth)/auth";
import { db } from "@/lib/db"; import { db } from "@/lib/db";
import { systemSettings } from "@/lib/db/schema"; import { systemSettings } from "@/lib/db/schema";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { import {
AGENT_PSD_TEMPLATES_KEY,
getEditableAgentPsdTemplateLayers, getEditableAgentPsdTemplateLayers,
isAgentPsdTextLayerSlot, isAgentPsdTextLayerSlot,
isAgentPsdTemplateReady, isAgentPsdTemplateReady,
@ -29,8 +27,6 @@ import {
normalizeAgentPsdTemplateCategoryTagConfig, normalizeAgentPsdTemplateCategoryTagConfig,
} from "@/lib/agents/psd-template-category-tag-config"; } from "@/lib/agents/psd-template-category-tag-config";
import { readAgentPsdFonts } from "@/lib/agents/psd-font-settings"; import { readAgentPsdFonts } from "@/lib/agents/psd-font-settings";
import { repairAgentPsdTemplateAssetsIfNeeded } from "@/lib/agents/psd-template-repair";
import { resolveAgentPsdTemplateTextStyles } from "@/lib/agents/psd-template-style-resolver";
import { readAgentPsdTemplates } from "@/lib/agents/psd-template-settings"; import { readAgentPsdTemplates } from "@/lib/agents/psd-template-settings";
export const runtime = "nodejs"; export const runtime = "nodejs";
@ -83,49 +79,12 @@ export async function GET(request: NextRequest) {
.then((rows) => rows[0]) .then((rows) => rows[0])
.catch(() => null), .catch(() => null),
]); ]);
const repairedTemplateMap = new Map<
string,
Awaited<ReturnType<typeof readAgentPsdTemplates>>[number]
>();
for (const template of allTemplates) {
if (
template.status !== "active" ||
!isAgentPsdTemplateReady(template) ||
(requestedBrand ? template.brandName !== requestedBrand : false) ||
(requestedMode ? template.mode !== requestedMode : false) ||
getEditableAgentPsdTemplateLayers(template).length === 0
) {
continue;
}
const repairedTemplate = await repairAgentPsdTemplateAssetsIfNeeded(template);
if (repairedTemplate !== template) {
repairedTemplateMap.set(template.id, repairedTemplate);
}
}
const sourceTemplates =
repairedTemplateMap.size > 0
? allTemplates.map((template) => repairedTemplateMap.get(template.id) || template)
: allTemplates;
if (repairedTemplateMap.size > 0) {
await upsertSystemSetting({
key: AGENT_PSD_TEMPLATES_KEY,
value: sourceTemplates,
updatedBy: session.user.id,
}).catch((error) => {
console.warn("[PSD Templates] failed to persist repaired assets:", error);
});
}
const fonts = (await readAgentPsdFonts().catch( const fonts = (await readAgentPsdFonts().catch(
() => [] as Awaited<ReturnType<typeof readAgentPsdFonts>> () => [] as Awaited<ReturnType<typeof readAgentPsdFonts>>
)) as Awaited<ReturnType<typeof readAgentPsdFonts>>; )) as Awaited<ReturnType<typeof readAgentPsdFonts>>;
const fontMap = new Map(fonts.map((font) => [font.id, font])); const fontMap = new Map(fonts.map((font) => [font.id, font]));
const templates = await Promise.all( const templates =
sourceTemplates allTemplates
.filter((template) => template.status === "active") .filter((template) => template.status === "active")
.filter(isAgentPsdTemplateReady) .filter(isAgentPsdTemplateReady)
.filter((template) => .filter((template) =>
@ -133,14 +92,9 @@ export async function GET(request: NextRequest) {
) )
.filter((template) => (requestedMode ? template.mode === requestedMode : true)) .filter((template) => (requestedMode ? template.mode === requestedMode : true))
.filter((template) => getEditableAgentPsdTemplateLayers(template).length > 0) .filter((template) => getEditableAgentPsdTemplateLayers(template).length > 0)
.map(async (template) => { .map((template) => ({
const resolvedTemplate = await resolveAgentPsdTemplateTextStyles(template).catch( ...template,
() => template layers: template.layers.map((layer) => {
);
return {
...resolvedTemplate,
layers: resolvedTemplate.layers.map((layer) => {
if (!isAgentPsdTextLayerSlot(layer) || !layer.fontId) { if (!isAgentPsdTextLayerSlot(layer) || !layer.fontId) {
return layer; return layer;
} }
@ -156,9 +110,7 @@ export async function GET(request: NextRequest) {
fontContentType: font.contentType, fontContentType: font.contentType,
}; };
}), }),
}; }));
})
);
const normalizedTextColorConfig = textColorSetting const normalizedTextColorConfig = textColorSetting
? normalizeAgentPsdTextColorConfig(textColorSetting.value) ? normalizeAgentPsdTextColorConfig(textColorSetting.value)

View File

@ -760,7 +760,12 @@ export function AgentPsdTemplateEditorDialog({
}, [open, normalizedBrandName]); }, [open, normalizedBrandName]);
const { data, isLoading } = useSWR<AgentPsdTemplateListResponse>( const { data, isLoading } = useSWR<AgentPsdTemplateListResponse>(
templateListRequestUrl, templateListRequestUrl,
fetcher fetcher,
{
dedupingInterval: 30_000,
keepPreviousData: true,
revalidateOnFocus: false,
}
); );
const allTemplates = useMemo( const allTemplates = useMemo(
() => (data?.success ? data.templates : []), () => (data?.success ? data.templates : []),

View File

@ -34,8 +34,9 @@ const DialogContent = forwardRef<
ComponentRef<typeof DialogPrimitive.Content>, ComponentRef<typeof DialogPrimitive.Content>,
ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & { ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
overlayClassName?: string; overlayClassName?: string;
hideCloseButton?: boolean;
} }
>(({ className, children, overlayClassName, ...props }, ref) => ( >(({ className, children, overlayClassName, hideCloseButton = false, ...props }, ref) => (
<DialogPortal> <DialogPortal>
<DialogOverlay className={overlayClassName} /> <DialogOverlay className={overlayClassName} />
<DialogPrimitive.Content <DialogPrimitive.Content
@ -47,10 +48,12 @@ const DialogContent = forwardRef<
{...props} {...props}
> >
{children} {children}
<DialogPrimitive.Close className="absolute right-4 top-4 z-[100] rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground"> {hideCloseButton ? null : (
<X className="h-4 w-4" /> <DialogPrimitive.Close className="absolute right-4 top-4 z-[100] rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
<span className="sr-only">Close</span> <X className="h-4 w-4" />
</DialogPrimitive.Close> <span className="sr-only">Close</span>
</DialogPrimitive.Close>
)}
</DialogPrimitive.Content> </DialogPrimitive.Content>
</DialogPortal> </DialogPortal>
)); ));