Compare commits

...

2 Commits

5 changed files with 252 additions and 36 deletions
+47 -1
View File
@@ -121,9 +121,55 @@ Next.js API routes som kräver server-side auth och ska gå via frontend måste
| `/api/products*` | explicit regel | `recipe-api:8080` ⚠️ | | `/api/products*` | explicit regel | `recipe-api:8080` ⚠️ |
| `/api/inventory*` | explicit regel | `recipe-api:8080` ⚠️ | | `/api/inventory*` | explicit regel | `recipe-api:8080` ⚠️ |
---
## Arkitekturprincip: API routes framför Server Actions
> **Regel: Använd Next.js API routes (`/app/api/...`) för all mutation från klientkomponenter. Använd INTE Server Actions för detta.**
### Bakgrund
Next.js Server Actions returnerar alltid ett **RSC-payload** (React Server Component flight-format) som svar — även om funktionen bara returnerar ett vanligt JSON-objekt. När en klientkomponent anropar en Server Action via `startTransition` försöker React tolka svaret som ett siduppdateringspaket. Detta orsakar kraschen **"can't reload page"** / `TypeError: r is not iterable` i React 19 om sidans RSC-träd inte kan återskapas korrekt (t.ex. p.g.a. Caddy-routing, auth-state eller timing).
### Rätt mönster: Next.js API route
```
Klientkomponent → fetch('/api/admin/...') → Next.js API route → Backend API
```
- API routen körs server-side och har tillgång till sessionen via `auth()` → kan lägga till auth-headers
- Returnerar ren JSON — inga RSC-payload-problem
- Caddy-safe: använd `/api/admin/` som prefix (faller igenom till `recipe-frontend:3000`)
- Klientkomponenten hanterar UI-state lokalt efter svar (uppdatera/ta bort ur lokal state)
**Exempel** (se [app/api/admin/product/[id]/route.ts](frontend/app/api/admin/product/%5Bid%5D/route.ts)):
```ts
// API route (server-side, har session)
export async function PATCH(req, { params }) {
const authHeaders = await getAuthHeaders(); // använder auth()
const res = await fetch(`${API_BASE}/api/products/${id}`, { method: 'PATCH', headers: authHeaders, ... });
return Response.json(await res.json());
}
// Klientkomponent
const res = await fetch(`/api/admin/product/${id}`, { method: 'PATCH', body: JSON.stringify(data) });
const updated = await res.json();
setProducts(prev => prev.map(p => p.id === updated.id ? updated : p)); // lokal state-uppdatering
```
### När är Server Actions OK?
Server Actions kan fortfarande användas för operationer som **inte anropas från klientkomponenter med `startTransition`**, t.ex.:
- Form submissions i rena Server Components (inget `useTransition`)
- Admin-operationer som ändå triggar en helsidsladdning efteråt
### Befintliga undantag att känna till
Dessa Server Actions finns kvar men bör migreras om de orsakar problem:
- `bulkSetCategory` — anropas från `AdminProductList` (klientkomponent)
- `suggestProductCategory` / `suggestBulkCategories` — AI-kategorisering, anropas från klient
## Frontend
- **Framework:** Next.js 16.2 (App Router, server + client components) - **Framework:** Next.js 16.2 (App Router, server + client components)
- **Språk:** TypeScript 5.4.5 - **Språk:** TypeScript 5.4.5
@@ -54,10 +54,18 @@ export default function AdminProductList() {
const [aiApplying, setAiApplying] = useState(false); const [aiApplying, setAiApplying] = useState(false);
const refetchProducts = useCallback(() => { const refetchProducts = useCallback(() => {
console.log('[AdminProductList] refetchProducts: starting fetch /api/products');
fetch('/api/products') fetch('/api/products')
.then((r) => r.json()) .then(async (r) => {
.then((data) => { if (Array.isArray(data)) setProducts(data); }) console.log('[AdminProductList] refetchProducts: HTTP', r.status);
.catch(() => {}) if (!r.ok) throw new Error(`HTTP ${r.status}`);
return r.json();
})
.then((data) => {
console.log('[AdminProductList] refetchProducts: got', Array.isArray(data) ? data.length : 'non-array', 'products');
if (Array.isArray(data)) setProducts(data);
})
.catch((e) => console.error('[AdminProductList] refetchProducts error:', e))
.finally(() => setProductsLoading(false)); .finally(() => setProductsLoading(false));
}, []); }, []);
+53 -28
View File
@@ -1,8 +1,8 @@
'use client'; 'use client';
import { useState, useTransition, useEffect } from 'react'; import { useState, useEffect } from 'react';
import type { Product } from '../../../features/inventory/types'; import type { Product } from '../../../features/inventory/types';
import { updateProductWithTags, deleteProduct, suggestProductCategory } from './actions'; import { suggestProductCategory } from './actions';
type CategoryNode = { type CategoryNode = {
id: number; id: number;
@@ -36,7 +36,7 @@ const inputStyle: React.CSSProperties = {
export default function EditProductForm({ product, onSaved, onDeleted }: Props) { export default function EditProductForm({ product, onSaved, onDeleted }: Props) {
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const [isPending, startTransition] = useTransition(); const [isPending, setIsPending] = useState(false);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
const [success, setSuccess] = useState(false); const [success, setSuccess] = useState(false);
const [tagInput, setTagInput] = useState( const [tagInput, setTagInput] = useState(
@@ -93,41 +93,66 @@ export default function EditProductForm({ product, onSaved, onDeleted }: Props)
} }
} }
function handleSubmit(e: React.FormEvent<HTMLFormElement>) { async function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
e.preventDefault(); e.preventDefault();
const formData = new FormData(e.currentTarget);
const rawTags = tagInput.split(',').map((t) => t.trim().toLowerCase()).filter(Boolean);
console.log('[EditProductForm] handleSubmit: PATCH /api/admin/product/', product.id);
setIsPending(true);
setError(null); setError(null);
setSuccess(false); setSuccess(false);
const formData = new FormData(e.currentTarget); try {
if (selectedCategoryId !== '') { const res = await fetch(`/api/admin/product/${product.id}`, {
formData.set('categoryId', String(selectedCategoryId)); method: 'PATCH',
} else { headers: { 'Content-Type': 'application/json' },
formData.set('categoryId', ''); body: JSON.stringify({
} name: formData.get('name'),
const rawTags = tagInput.split(',').map((t) => t.trim().toLowerCase()).filter(Boolean); canonicalName: formData.get('canonicalName') ?? '',
startTransition(async () => { category: formData.get('category') ?? '',
try { subcategory: formData.get('subcategory') ?? '',
const updated = await updateProductWithTags(formData, rawTags); brand: formData.get('brand') ?? '',
setSuccess(true); categoryId: selectedCategoryId !== '' ? selectedCategoryId : null,
setIsOpen(false); tags: rawTags,
onSaved(updated as Product); }),
} catch (err) { });
setError(err instanceof Error ? err.message : 'Okänt fel'); const data = await res.json();
console.log('[EditProductForm] handleSubmit: HTTP', res.status, data);
if (!res.ok) {
setError(data?.error ?? 'Okänt fel');
return;
} }
}); setSuccess(true);
setIsOpen(false);
onSaved(data as Product);
} catch (err) {
console.error('[EditProductForm] handleSubmit error:', err);
setError(err instanceof Error ? err.message : 'Okänt fel');
} finally {
setIsPending(false);
}
} }
function handleDelete() { async function handleDelete() {
if (!confirm(`Ta bort "${product.name}"? Detta är en mjukradering och kan återställas.`)) return; if (!confirm(`Ta bort "${product.name}"? Detta är en mjukradering och kan återställas.`)) return;
setError(null); setError(null);
setSuccess(false); setSuccess(false);
startTransition(async () => { setIsPending(true);
try { console.log('[EditProductForm] handleDelete: DELETE /api/admin/product/', product.id);
await deleteProduct(product.id); try {
onDeleted(product.id); const res = await fetch(`/api/admin/product/${product.id}`, { method: 'DELETE' });
} catch (err) { console.log('[EditProductForm] handleDelete: HTTP', res.status);
setError(err instanceof Error ? err.message : 'Okänt fel'); if (!res.ok) {
const data = await res.json().catch(() => ({}));
setError(data?.error ?? 'Kunde inte ta bort produkt');
return;
} }
}); onDeleted(product.id);
} catch (err) {
console.error('[EditProductForm] handleDelete error:', err);
setError(err instanceof Error ? err.message : 'Okänt fel');
} finally {
setIsPending(false);
}
} }
return ( return (
+8 -4
View File
@@ -61,9 +61,8 @@ export async function setProductTags(productId: number, tags: string[]) {
export async function updateProductWithTags(formData: FormData, tags: string[]) { export async function updateProductWithTags(formData: FormData, tags: string[]) {
const id = Number(formData.get('id')); const id = Number(formData.get('id'));
console.log('[actions:updateProductWithTags] called for product id:', id, 'tags:', tags);
const name = String(formData.get('name') || '').trim(); const name = String(formData.get('name') || '').trim();
const canonicalName = String(formData.get('canonicalName') || '').trim();
const category = String(formData.get('category') || '').trim();
const subcategory = String(formData.get('subcategory') || '').trim(); const subcategory = String(formData.get('subcategory') || '').trim();
const brand = String(formData.get('brand') || '').trim(); const brand = String(formData.get('brand') || '').trim();
const categoryIdRaw = formData.get('categoryId'); const categoryIdRaw = formData.get('categoryId');
@@ -77,7 +76,7 @@ export async function updateProductWithTags(formData: FormData, tags: string[])
if (brand.length > 100) throw new Error('Varumärke får inte vara längre än 100 tecken.'); if (brand.length > 100) throw new Error('Varumärke får inte vara längre än 100 tecken.');
const authHeaders = await getAuthHeaders(); const authHeaders = await getAuthHeaders();
console.log('[actions:updateProductWithTags] auth headers present:', !!authHeaders.Authorization);\n
const res = await fetch(`${API_BASE}/api/products/${id}`, { const res = await fetch(`${API_BASE}/api/products/${id}`, {
method: 'PATCH', method: 'PATCH',
headers: { 'Content-Type': 'application/json', ...authHeaders }, headers: { 'Content-Type': 'application/json', ...authHeaders },
@@ -98,6 +97,7 @@ export async function updateProductWithTags(formData: FormData, tags: string[])
} }
const updatedProduct = await res.json(); const updatedProduct = await res.json();
console.log('[actions:updateProductWithTags] PATCH OK, product id:', (updatedProduct as any)?.id);
const tagsRes = await fetch(`${API_BASE}/api/products/${id}/tags`, { const tagsRes = await fetch(`${API_BASE}/api/products/${id}/tags`, {
method: 'PUT', method: 'PUT',
@@ -111,13 +111,17 @@ export async function updateProductWithTags(formData: FormData, tags: string[])
throw new Error(`Kunde inte uppdatera taggar: ${text}`); throw new Error(`Kunde inte uppdatera taggar: ${text}`);
} }
console.log('[actions:updateProductWithTags] tags PUT OK, fetching full product...');
// Fetch the complete product (includes tags, categoryRef) after both updates // Fetch the complete product (includes tags, categoryRef) after both updates
const fullRes = await fetch(`${API_BASE}/api/products/${id}`, { const fullRes = await fetch(`${API_BASE}/api/products/${id}`, {
headers: authHeaders, headers: authHeaders,
cache: 'no-store', cache: 'no-store',
}); });
console.log('[actions:updateProductWithTags] full product fetch HTTP', fullRes.status);
if (!fullRes.ok) return updatedProduct; if (!fullRes.ok) return updatedProduct;
return fullRes.json(); const result = await fullRes.json();
console.log('[actions:updateProductWithTags] returning full product id:', (result as any)?.id);
return result;
} }
export async function deleteProduct(id: number) { export async function deleteProduct(id: number) {
@@ -0,0 +1,133 @@
import { auth } from '../../../../../auth';
const API_BASE = process.env.NEXT_PUBLIC_API_URL_INTERNAL || 'http://recipe-api:8080';
async function getAuthHeaders(): Promise<Record<string, string>> {
const session = await auth();
if (!session?.accessToken) {
return {};
}
return { Authorization: `Bearer ${session.accessToken}` };
}
// PATCH /api/admin/product/[id]
// Body: { name, canonicalName, category, subcategory, brand, categoryId, tags }
export async function PATCH(
req: Request,
{ params }: { params: Promise<{ id: string }> },
) {
try {
const { id } = await params;
const productId = Number(id);
if (!productId) return Response.json({ error: 'Invalid id' }, { status: 400 });
const body = await req.json();
const { name, canonicalName, category, subcategory, brand, categoryId, tags } = body;
if (!name || typeof name !== 'string' || !name.trim()) {
return Response.json({ error: 'Namn får inte vara tomt.' }, { status: 400 });
}
const authHeaders = await getAuthHeaders();
if (!authHeaders.Authorization) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}
console.log('[api/admin/product] PATCH product', productId);
// 1. Update product fields
const patchRes = await fetch(`${API_BASE}/api/products/${productId}`, {
method: 'PATCH',
headers: { 'Content-Type': 'application/json', ...authHeaders },
body: JSON.stringify({
name: name.trim(),
canonicalName: canonicalName?.trim() || undefined,
category: category?.trim() || null,
subcategory: subcategory?.trim() || null,
brand: brand?.trim() || null,
categoryId: categoryId ?? null,
}),
});
if (!patchRes.ok) {
const text = await patchRes.text();
console.error('[api/admin/product] PATCH failed:', patchRes.status, text);
return Response.json({ error: `Kunde inte uppdatera produkt: ${text}` }, { status: patchRes.status });
}
console.log('[api/admin/product] PATCH OK');
// 2. Update tags
const tagsRes = await fetch(`${API_BASE}/api/products/${productId}/tags`, {
method: 'PUT',
headers: { 'Content-Type': 'application/json', ...authHeaders },
body: JSON.stringify({ tags: tags ?? [] }),
});
if (!tagsRes.ok) {
const text = await tagsRes.text();
console.error('[api/admin/product] tags PUT failed:', tagsRes.status, text);
return Response.json({ error: `Kunde inte uppdatera taggar: ${text}` }, { status: tagsRes.status });
}
console.log('[api/admin/product] tags PUT OK');
// 3. Return the complete updated product
const fullRes = await fetch(`${API_BASE}/api/products/${productId}`, {
headers: authHeaders,
});
if (!fullRes.ok) {
return Response.json({ error: 'Produkt uppdaterad men kunde inte hämtas' }, { status: 500 });
}
const product = await fullRes.json();
console.log('[api/admin/product] returning full product id:', product?.id);
return Response.json(product);
} catch (err) {
console.error('[api/admin/product] PATCH error:', err);
return Response.json(
{ error: err instanceof Error ? err.message : 'Unknown error' },
{ status: 500 },
);
}
}
// DELETE /api/admin/product/[id]
export async function DELETE(
_req: Request,
{ params }: { params: Promise<{ id: string }> },
) {
try {
const { id } = await params;
const productId = Number(id);
if (!productId) return Response.json({ error: 'Invalid id' }, { status: 400 });
const authHeaders = await getAuthHeaders();
if (!authHeaders.Authorization) {
return Response.json({ error: 'Unauthorized' }, { status: 401 });
}
console.log('[api/admin/product] DELETE product', productId);
const res = await fetch(`${API_BASE}/api/products/${productId}`, {
method: 'DELETE',
headers: authHeaders,
});
if (!res.ok) {
const text = await res.text();
console.error('[api/admin/product] DELETE failed:', res.status, text);
return Response.json({ error: `Kunde inte ta bort produkt: ${text}` }, { status: res.status });
}
console.log('[api/admin/product] DELETE OK');
return new Response(null, { status: 204 });
} catch (err) {
console.error('[api/admin/product] DELETE error:', err);
return Response.json(
{ error: err instanceof Error ? err.message : 'Unknown error' },
{ status: 500 },
);
}
}