From 4fa5f71d166090b3f8df0c536329c606cc8c995f Mon Sep 17 00:00:00 2001
From: DanielS <daniel.schumacher@caspos.de>
Date: Thu, 25 Jun 2026 09:19:28 +0200
Subject: [PATCH] feat: change products view sorting to category grouping with
 subheaders

---
 shop/components/admin/product-list.tsx | 162 ++++++++++++++-----------
 1 file changed, 90 insertions(+), 72 deletions(-)

diff --git a/shop/components/admin/product-list.tsx b/shop/components/admin/product-list.tsx
index f627ff4..c4dd7a8 100644
--- a/shop/components/admin/product-list.tsx
+++ b/shop/components/admin/product-list.tsx
@@ -14,12 +14,12 @@ import { Badge } from '@/components/ui/badge'
 import { Edit2, Trash2, Layers, ArrowUpDown } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { deleteProduct } from '@/lib/actions/products'
-import { useState, useEffect, useMemo } from 'react'
+import { useState, useEffect, useMemo, Fragment } from 'react'
 import { CreateProductDialog } from './create-product-dialog'
 
 export function ProductList({ initialProducts, categories }: { initialProducts: Product[], categories: Category[] }) {
   const [products, setProducts] = useState(initialProducts)
-  const [isSortedByCategory, setIsSortedByCategory] = useState(false)
+  const [isGroupedByCategory, setIsGroupedByCategory] = useState(false)
 
   useEffect(() => {
     setProducts(initialProducts)
@@ -32,25 +32,81 @@ export function ProductList({ initialProducts, categories }: { initialProducts:
     }
   }
 
-  const toggleSortByCategory = () => {
-    setIsSortedByCategory(!isSortedByCategory)
+  const toggleGroupByCategory = () => {
+    setIsGroupedByCategory(!isGroupedByCategory)
   }
 
-  const displayedProducts = useMemo(() => {
-    if (!isSortedByCategory) return products
-
-    return [...products].sort((a, b) => {
+  const groupedProducts = useMemo(() => {
+    const groups: Record<string, { category: Category | null; products: Product[] }> = {}
+    products.forEach(p => {
+      const catId = p.category_id || 'no-category'
+      if (!groups[catId]) {
+        groups[catId] = {
+          category: p.category || null,
+          products: []
+        }
+      }
+      groups[catId].products.push(p)
+    })
+    return Object.values(groups).sort((a, b) => {
       const orderA = a.category?.sort_order ?? 9999
       const orderB = b.category?.sort_order ?? 9999
-      if (orderA !== orderB) return orderA - orderB
-
-      const catA = a.category?.name || ''
-      const catB = b.category?.name || ''
-      if (catA !== catB) return catA.localeCompare(catB)
-
-      return a.name.localeCompare(b.name)
+      return orderA - orderB
     })
-  }, [products, isSortedByCategory])
+  }, [products])
+
+  const renderProductRow = (product: Product) => (
+    <TableRow key={product.id} className="border-slate-100 dark:border-white/5 hover:bg-slate-50 dark:hover:bg-white/5 transition-colors">
+      <TableCell className="font-medium text-slate-900 dark:text-white">
+        <div className="flex flex-col gap-1">
+          <div className="flex items-center gap-2">
+            {product.name}
+            {product.category && (
+              <Badge variant="outline" className="text-[10px] uppercase border-primary/30 text-primary py-0 h-4">
+                {product.category.name}
+              </Badge>
+            )}
+            {product.billing_interval === 'monthly' && (
+              <Badge className="text-[10px] bg-blue-500/20 text-blue-600 dark:text-blue-400 border border-blue-500/30 py-0 h-4">Abo/Monat</Badge>
+            )}
+            {product.billing_interval === 'one_time' && (
+              <Badge className="text-[10px] bg-slate-500/20 text-slate-600 dark:text-slate-300 border border-slate-500/30 py-0 h-4">Einmalig</Badge>
+            )}
+          </div>
+          <p className="text-xs text-slate-500 dark:text-slate-400 font-normal">{product.description}</p>
+        </div>
+      </TableCell>
+      <TableCell className="text-slate-900 dark:text-white font-semibold">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(product.base_price)}</TableCell>
+      <TableCell>
+        <div className="flex items-center gap-1">
+          <Layers className="w-3 h-3 text-primary" />
+          <span className="text-slate-700 dark:text-slate-200">{product.modules?.length || 0} Module</span>
+        </div>
+      </TableCell>
+      <TableCell>
+        <Badge variant={product.billing_interval === 'monthly' ? 'default' : 'secondary'}>
+          {product.billing_interval === 'monthly' ? 'Abo/Monat' : 'Einmalig'}
+        </Badge>
+      </TableCell>
+      <TableCell className="text-right">
+        <div className="flex justify-end gap-2">
+          <CreateProductDialog categories={categories} product={product}>
+            <Button variant="ghost" size="icon" className="h-8 w-8 text-slate-500 hover:text-slate-900 dark:text-slate-400 dark:hover:text-white">
+              <Edit2 className="h-4 w-4" />
+            </Button>
+          </CreateProductDialog>
+          <Button 
+            variant="ghost" 
+            size="icon" 
+            className="h-8 w-8 text-destructive hover:text-destructive hover:bg-destructive/10"
+            onClick={() => handleDelete(product.id)}
+          >
+            <Trash2 className="h-4 w-4" />
+          </Button>
+        </div>
+      </TableCell>
+    </TableRow>
+  )
 
   return (
     <Card className="bg-white dark:bg-slate-900/50 border border-slate-200 dark:border-white/10 shadow-sm overflow-hidden text-slate-900 dark:text-white">
@@ -64,13 +120,13 @@ export function ProductList({ initialProducts, categories }: { initialProducts:
         <Button
           variant="outline"
           size="sm"
-          onClick={toggleSortByCategory}
+          onClick={toggleGroupByCategory}
           className={`border-slate-200 dark:border-white/10 hover:bg-slate-100 dark:hover:bg-white/10 text-slate-700 dark:text-white ${
-            isSortedByCategory ? 'bg-primary/10 border-primary text-primary hover:bg-primary/20 dark:bg-primary/20 dark:border-primary dark:text-primary-foreground' : ''
+            isGroupedByCategory ? 'bg-primary/10 border-primary text-primary hover:bg-primary/20 dark:bg-primary/20 dark:border-primary dark:text-primary-foreground' : ''
           }`}
         >
           <ArrowUpDown className="w-4 h-4 mr-2" />
-          {isSortedByCategory ? 'Kategoriesortierung aktiv' : 'Nach Kategorien sortieren'}
+          {isGroupedByCategory ? 'Kategoriengruppierung aktiv' : 'Nach Kategorien gruppieren'}
         </Button>
       </CardHeader>
       <CardContent>
@@ -85,59 +141,21 @@ export function ProductList({ initialProducts, categories }: { initialProducts:
             </TableRow>
           </TableHeader>
           <TableBody>
-            {displayedProducts.map((product) => (
-              <TableRow key={product.id} className="border-slate-100 dark:border-white/5 hover:bg-slate-50 dark:hover:bg-white/5 transition-colors">
-                <TableCell className="font-medium text-slate-900 dark:text-white">
-                  <div className="flex flex-col gap-1">
-                    <div className="flex items-center gap-2">
-                      {product.name}
-                      {product.category && (
-                        <Badge variant="outline" className="text-[10px] uppercase border-primary/30 text-primary py-0 h-4">
-                          {product.category.name}
-                        </Badge>
-                      )}
-                      {product.billing_interval === 'monthly' && (
-                        <Badge className="text-[10px] bg-blue-500/20 text-blue-600 dark:text-blue-400 border border-blue-500/30 py-0 h-4">Abo/Monat</Badge>
-                      )}
-                      {product.billing_interval === 'one_time' && (
-                        <Badge className="text-[10px] bg-slate-500/20 text-slate-600 dark:text-slate-300 border border-slate-500/30 py-0 h-4">Einmalig</Badge>
-                      )}
-                    </div>
-                    <p className="text-xs text-slate-500 dark:text-slate-400 font-normal">{product.description}</p>
-                  </div>
-                </TableCell>
-                <TableCell className="text-slate-900 dark:text-white font-semibold">{new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(product.base_price)}</TableCell>
-                <TableCell>
-                  <div className="flex items-center gap-1">
-                    <Layers className="w-3 h-3 text-primary" />
-                    <span className="text-slate-700 dark:text-slate-200">{product.modules?.length || 0} Module</span>
-                  </div>
-                </TableCell>
-                <TableCell>
-                  <Badge variant={product.billing_interval === 'monthly' ? 'default' : 'secondary'}>
-                    {product.billing_interval === 'monthly' ? 'Abo/Monat' : 'Einmalig'}
-                  </Badge>
-                </TableCell>
-                <TableCell className="text-right">
-                  <div className="flex justify-end gap-2">
-                    <CreateProductDialog categories={categories} product={product}>
-                      <Button variant="ghost" size="icon" className="h-8 w-8 text-slate-500 hover:text-slate-900 dark:text-slate-400 dark:hover:text-white">
-                        <Edit2 className="h-4 w-4" />
-                      </Button>
-                    </CreateProductDialog>
-                    <Button 
-                      variant="ghost" 
-                      size="icon" 
-                      className="h-8 w-8 text-destructive hover:text-destructive hover:bg-destructive/10"
-                      onClick={() => handleDelete(product.id)}
-                    >
-                      <Trash2 className="h-4 w-4" />
-                    </Button>
-                  </div>
-                </TableCell>
-              </TableRow>
-            ))}
-            {displayedProducts.length === 0 && (
+            {isGroupedByCategory ? (
+              groupedProducts.map((group) => (
+                <Fragment key={group.category?.id || 'no-category'}>
+                  <TableRow className="bg-slate-100 dark:bg-slate-800/40 hover:bg-slate-100 dark:hover:bg-slate-800/40 border-b border-slate-200 dark:border-white/10">
+                    <TableCell colSpan={5} className="text-primary font-bold py-2.5 text-xs uppercase tracking-wider">
+                      {group.category ? group.category.name : 'Keine Kategorie'}
+                    </TableCell>
+                  </TableRow>
+                  {group.products.map((product) => renderProductRow(product))}
+                </Fragment>
+              ))
+            ) : (
+              products.map((product) => renderProductRow(product))
+            )}
+            {products.length === 0 && (
               <TableRow>
                 <TableCell colSpan={5} className="text-center py-10 text-slate-500 dark:text-slate-400">
                   Keine Produkte gefunden. Erstellen Sie Ihr erstes Produkt!