fix: speed up psd template dialog load
This commit is contained in:
parent
25132540bc
commit
0e95d9ec29
@ -1,11 +1,9 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { upsertSystemSetting } from "@/lib/db/queries";
|
||||
import { auth } from "@/app/(auth)/auth";
|
||||
import { db } from "@/lib/db";
|
||||
import { systemSettings } from "@/lib/db/schema";
|
||||
import { eq } from "drizzle-orm";
|
||||
import {
|
||||
AGENT_PSD_TEMPLATES_KEY,
|
||||
getEditableAgentPsdTemplateLayers,
|
||||
isAgentPsdTextLayerSlot,
|
||||
isAgentPsdTemplateReady,
|
||||
@ -29,8 +27,6 @@ import {
|
||||
normalizeAgentPsdTemplateCategoryTagConfig,
|
||||
} from "@/lib/agents/psd-template-category-tag-config";
|
||||
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";
|
||||
|
||||
export const runtime = "nodejs";
|
||||
@ -83,49 +79,12 @@ export async function GET(request: NextRequest) {
|
||||
.then((rows) => rows[0])
|
||||
.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(
|
||||
() => [] as Awaited<ReturnType<typeof readAgentPsdFonts>>
|
||||
)) as Awaited<ReturnType<typeof readAgentPsdFonts>>;
|
||||
const fontMap = new Map(fonts.map((font) => [font.id, font]));
|
||||
const templates = await Promise.all(
|
||||
sourceTemplates
|
||||
const templates =
|
||||
allTemplates
|
||||
.filter((template) => template.status === "active")
|
||||
.filter(isAgentPsdTemplateReady)
|
||||
.filter((template) =>
|
||||
@ -133,14 +92,9 @@ export async function GET(request: NextRequest) {
|
||||
)
|
||||
.filter((template) => (requestedMode ? template.mode === requestedMode : true))
|
||||
.filter((template) => getEditableAgentPsdTemplateLayers(template).length > 0)
|
||||
.map(async (template) => {
|
||||
const resolvedTemplate = await resolveAgentPsdTemplateTextStyles(template).catch(
|
||||
() => template
|
||||
);
|
||||
|
||||
return {
|
||||
...resolvedTemplate,
|
||||
layers: resolvedTemplate.layers.map((layer) => {
|
||||
.map((template) => ({
|
||||
...template,
|
||||
layers: template.layers.map((layer) => {
|
||||
if (!isAgentPsdTextLayerSlot(layer) || !layer.fontId) {
|
||||
return layer;
|
||||
}
|
||||
@ -156,9 +110,7 @@ export async function GET(request: NextRequest) {
|
||||
fontContentType: font.contentType,
|
||||
};
|
||||
}),
|
||||
};
|
||||
})
|
||||
);
|
||||
}));
|
||||
|
||||
const normalizedTextColorConfig = textColorSetting
|
||||
? normalizeAgentPsdTextColorConfig(textColorSetting.value)
|
||||
|
||||
@ -760,7 +760,12 @@ export function AgentPsdTemplateEditorDialog({
|
||||
}, [open, normalizedBrandName]);
|
||||
const { data, isLoading } = useSWR<AgentPsdTemplateListResponse>(
|
||||
templateListRequestUrl,
|
||||
fetcher
|
||||
fetcher,
|
||||
{
|
||||
dedupingInterval: 30_000,
|
||||
keepPreviousData: true,
|
||||
revalidateOnFocus: false,
|
||||
}
|
||||
);
|
||||
const allTemplates = useMemo(
|
||||
() => (data?.success ? data.templates : []),
|
||||
|
||||
@ -34,8 +34,9 @@ const DialogContent = forwardRef<
|
||||
ComponentRef<typeof DialogPrimitive.Content>,
|
||||
ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
|
||||
overlayClassName?: string;
|
||||
hideCloseButton?: boolean;
|
||||
}
|
||||
>(({ className, children, overlayClassName, ...props }, ref) => (
|
||||
>(({ className, children, overlayClassName, hideCloseButton = false, ...props }, ref) => (
|
||||
<DialogPortal>
|
||||
<DialogOverlay className={overlayClassName} />
|
||||
<DialogPrimitive.Content
|
||||
@ -47,10 +48,12 @@ const DialogContent = forwardRef<
|
||||
{...props}
|
||||
>
|
||||
{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">
|
||||
<X className="h-4 w-4" />
|
||||
<span className="sr-only">Close</span>
|
||||
</DialogPrimitive.Close>
|
||||
{hideCloseButton ? null : (
|
||||
<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">
|
||||
<X className="h-4 w-4" />
|
||||
<span className="sr-only">Close</span>
|
||||
</DialogPrimitive.Close>
|
||||
)}
|
||||
</DialogPrimitive.Content>
|
||||
</DialogPortal>
|
||||
));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user