fix(tools): correct toolpage archetypes across all tools and ensure robust form field mapping
This commit is contained in:
@@ -47,18 +47,31 @@ export function DynamicToolWorkspace({
|
||||
variants = [],
|
||||
locale = 'en',
|
||||
}: DynamicToolWorkspaceProps) {
|
||||
// Determine tool archetype from JSON (fallback intelligently based on category/id)
|
||||
const pageType: ToolPageType = tool.pageType || (
|
||||
tool.id.includes('lama') || tool.id.includes('eraser') || tool.id.includes('inpaint')
|
||||
? 'masking'
|
||||
: tool.thumbnails && tool.thumbnails.length > 0
|
||||
? 'image-thumbnail'
|
||||
: tool.id.includes('text') || tool.id.includes('prompt')
|
||||
? 'text-to-image'
|
||||
: tool.id.includes('swap') || tool.id.includes('blend')
|
||||
? 'two-images'
|
||||
: 'image-only'
|
||||
);
|
||||
// Normalize and determine tool archetype from JSON with resilient fallbacks
|
||||
const resolvePageType = (rawType?: string): ToolPageType => {
|
||||
if (rawType === 'masking' || rawType === 'two-images' || rawType === 'text-to-image' || rawType === 'image-thumbnail' || rawType === 'image-only') {
|
||||
return rawType;
|
||||
}
|
||||
if (rawType === 'mask-editor') {
|
||||
return (tool.thumbnails && tool.thumbnails.length > 0) ? 'image-thumbnail' : 'masking';
|
||||
}
|
||||
// Intelligent heuristic fallback based on tool characteristics
|
||||
if (tool.id.includes('lama') || tool.id.includes('eraser') || tool.id.includes('inpaint') || tool.id.includes('replacer') || tool.id.includes('outpaint')) {
|
||||
return 'masking';
|
||||
}
|
||||
if (tool.thumbnails && tool.thumbnails.length > 0) {
|
||||
return 'image-thumbnail';
|
||||
}
|
||||
if (tool.id.includes('text') || tool.id.includes('prompt')) {
|
||||
return 'text-to-image';
|
||||
}
|
||||
if (tool.id.includes('swap') || tool.id.includes('relight') || tool.id.includes('couple-composite')) {
|
||||
return 'two-images';
|
||||
}
|
||||
return 'image-only';
|
||||
};
|
||||
|
||||
const pageType: ToolPageType = resolvePageType(tool.pageType);
|
||||
|
||||
// View Mode: 'landing' (tool overview & upload) vs 'studio' (editing workspace)
|
||||
const [viewMode, setViewMode] = useState<'landing' | 'studio'>('landing');
|
||||
@@ -216,11 +229,17 @@ export function DynamicToolWorkspace({
|
||||
const compUrl = URL.createObjectURL(fileToSend);
|
||||
setComparisonBeforeUrl(compUrl);
|
||||
formData.append(imageParamName, fileToSend, 'photo.jpg');
|
||||
if (imageParamName !== 'image') {
|
||||
formData.append('image', fileToSend, 'photo.jpg');
|
||||
}
|
||||
} else if (primaryPreview) {
|
||||
setComparisonBeforeUrl(primaryPreview);
|
||||
const res = await fetch(primaryPreview);
|
||||
const blob = await res.blob();
|
||||
formData.append(imageParamName, blob, 'sample.jpg');
|
||||
if (imageParamName !== 'image') {
|
||||
formData.append('image', blob, 'sample.jpg');
|
||||
}
|
||||
} else {
|
||||
setStatus('error');
|
||||
setErrorMessage('Please upload or select an image first.');
|
||||
@@ -233,10 +252,16 @@ export function DynamicToolWorkspace({
|
||||
const secondParamName = tool.twoImagesConfig?.secondImageParam || 'reference_image';
|
||||
if (secondaryFile) {
|
||||
formData.append(secondParamName, secondaryFile);
|
||||
if (secondParamName !== 'reference_image') {
|
||||
formData.append('reference_image', secondaryFile);
|
||||
}
|
||||
} else if (secondaryPreview) {
|
||||
const res = await fetch(secondaryPreview);
|
||||
const blob = await res.blob();
|
||||
formData.append(secondParamName, blob, 'secondary.jpg');
|
||||
if (secondParamName !== 'reference_image') {
|
||||
formData.append('reference_image', blob, 'secondary.jpg');
|
||||
}
|
||||
} else {
|
||||
setStatus('error');
|
||||
setErrorMessage('Please upload the second reference image.');
|
||||
@@ -251,6 +276,9 @@ export function DynamicToolWorkspace({
|
||||
const maskBlob = await getMaskBlobRef.current();
|
||||
if (maskBlob) {
|
||||
formData.append(maskParamName, maskBlob, 'mask.png');
|
||||
if (maskParamName !== 'mask') {
|
||||
formData.append('mask', maskBlob, 'mask.png');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -269,8 +297,12 @@ export function DynamicToolWorkspace({
|
||||
|
||||
// 5. Selected Thumbnail / Style Preset
|
||||
if (selectedThumbnail) {
|
||||
formData.append('style', selectedThumbnail.value);
|
||||
formData.append('variant', selectedThumbnail.value);
|
||||
const presetVal = selectedThumbnail.value || selectedThumbnail.id;
|
||||
formData.append('style', presetVal);
|
||||
formData.append('variant', presetVal);
|
||||
formData.append('effectId', presetVal);
|
||||
formData.append('colorId', presetVal);
|
||||
formData.append('effect_id', presetVal);
|
||||
}
|
||||
|
||||
const res = await fetch(`/api/try/${tool.id}`, {
|
||||
|
||||
@@ -58,7 +58,7 @@ export function ThumbnailsSection({
|
||||
<div className="relative w-14 h-14 sm:w-16 sm:h-16 rounded-xl overflow-hidden bg-paper-2">
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img
|
||||
src={item.thumbnail || item.preview || ''}
|
||||
src={item.thumbnail || item.preview || (item as any).previewUrl || ''}
|
||||
alt={label}
|
||||
className="w-full h-full object-cover transition-transform duration-300 group-hover:scale-105"
|
||||
/>
|
||||
@@ -121,7 +121,7 @@ export function ThumbnailsSection({
|
||||
<div className="relative aspect-square w-full rounded-xl overflow-hidden bg-paper-2 mb-3">
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img
|
||||
src={item.thumbnail || item.preview || ''}
|
||||
src={item.thumbnail || item.preview || (item as any).previewUrl || ''}
|
||||
alt={label}
|
||||
className="w-full h-full object-cover transition-transform duration-500 group-hover:scale-105"
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user