fh-matui 0.9.7__py3-none-any.whl → 0.9.9__py3-none-any.whl

fh_matui/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.6"
+__version__ = "0.9.8"

fh_matui/datatable.py

@@ -22,10 +22,50 @@ from .components import *
 from math import ceil
 from urllib.parse import urlencode
 from typing import Callable, Optional, Any
+from dataclasses import asdict, is_dataclass
 
 # Default page size options
 PAGE_SIZES = [5, 10, 20, 50]
 
+
+def _to_dict(obj: Any) -> dict:
+    """
+    Convert any record type to dict.
+    
+    Handles:
+    - dict -> pass through
+    - dataclass -> asdict()
+    - namedtuple -> _asdict()
+    - Pydantic model -> model_dump() or dict()
+    - ORM/object with __dict__ -> vars() filtered
+    - dict-like with keys -> dict()
+    - None -> {}
+    """
+    if obj is None:
+        return {}
+    if isinstance(obj, dict):
+        return obj
+    # Dataclass
+    if is_dataclass(obj) and not isinstance(obj, type):
+        return asdict(obj)
+    # Namedtuple
+    if hasattr(obj, '_asdict'):
+        return obj._asdict()
+    # Pydantic v2
+    if hasattr(obj, 'model_dump'):
+        return obj.model_dump()
+    # Pydantic v1
+    if hasattr(obj, 'dict') and callable(getattr(obj, 'dict')):
+        return obj.dict()
+    # ORM-style objects with __dict__
+    if hasattr(obj, "__dict__"):
+        return {k: v for k, v in obj.__dict__.items() if not k.startswith("_")}
+    # Dict-like
+    if hasattr(obj, 'keys'):
+        return dict(obj)
+    return {}
+
+
 def _safe_int(value, default):
     """Safely convert to positive int or return default."""
     try:
@@ -113,8 +153,9 @@ def _action_menu(
         )
     
     items = []
-    # View is always available (read operation)
-    items.append(action_item("View", "visibility", "view"))
+    # View is conditional (read operation)
+    if crud_ops.get("view", True):
+        items.append(action_item("View", "visibility", "view"))
     
     if crud_ops.get("update", False):
         items.append(action_item("Edit", "edit", "edit"))
@@ -122,6 +163,20 @@ def _action_menu(
     if crud_ops.get("delete", False):
         items.append(action_item("Delete", "delete", "delete", confirm="Delete this record?"))
     
+    # Custom actions
+    for custom_action in crud_ops.get("custom_actions", []):
+        # Check per-row condition if provided
+        condition = custom_action.get("condition")
+        if condition and not condition(row):
+            continue
+        
+        items.append(action_item(
+            label=custom_action["label"],
+            icon=custom_action["icon"],
+            action=custom_action["name"],
+            confirm=custom_action.get("confirm")
+        ))
+    
     return Div(
         Button(
             Icon("more_vert"),
@@ -158,6 +213,9 @@ def DataTable(
     container_id = container_id or f"crud-table-{base_route.replace('/', '-').strip('-')}"
     feedback_id = f"{container_id}-feedback"
     
+    # Auto-convert data records to dicts (supports dataclass, namedtuple, Pydantic, ORM)
+    data = [_to_dict(r) for r in data]
+    
     # Auto-generate columns from first data row if not provided
     if columns is None and data:
         columns = [{"key": k, "label": k.replace("_", " ").title()} for k in data[0].keys()]
@@ -206,87 +264,100 @@ def DataTable(
         )
         table_rows.append(row_dict)
     
-    # Empty state
-    if not table_rows:
-        empty_row = {col["key"]: "" for col in columns}
-        empty_row[columns[0]["key"]] = Span(empty_message, cls="small-text grey-text")
-        empty_row["actions"] = ""
-        table_rows.append(empty_row)
-    
-    # Build header content
-    header_content = DivFullySpaced(
-        H5(title),
-        Span(f"{total} total", cls="small-text grey-text")
-    )
+    # Create button
+    create_button = None
+    if crud_ops.get("create", False):
+        query = urlencode({"action": "create", "search": search, "page": page, "page_size": page_size})
+        create_button = Button(
+            Icon("add"),
+            create_label,
+            hx_get=f"{base_route}/action?{query}",
+            hx_target=f"#{feedback_id}",
+            hx_swap="outerHTML",
+            cls=ButtonT.primary
+        )
     
-    # Build search and create button row
-    toolbar_items = [
-        Field(
-            Input(
-                placeholder=search_placeholder,
-                name="search",
-                value=search,
-                hx_get=f"{base_route}?page_size={page_size}",
-                hx_trigger="keyup changed delay:500ms",
+    # Pagination controls
+    pagination = None
+    if total_pages > 1:
+        prev_params = urlencode({"search": search, "page": max(1, page - 1), "page_size": page_size})
+        next_params = urlencode({"search": search, "page": min(total_pages, page + 1), "page_size": page_size})
+        
+        pagination = Div(
+            Button(
+                Icon("navigate_before"),
+                hx_get=f"{base_route}?{prev_params}",
                 hx_target=f"#{container_id}",
                 hx_push_url="true",
-                hx_vals='{"page":1}',
-                autocomplete="off",
-                onfocus="this.parentElement.classList.add('max')",
-                onblur="if(!this.value) this.parentElement.classList.remove('max')"
+                disabled=page == 1,
+                cls="circle"
             ),
-            cls="border round",
-            style="transition: flex-grow 0.3s ease"
-        )
-    ]
-    
-    if crud_ops.get("create", False):
-        create_query = urlencode({"action": "create", "search": search, "page": page, "page_size": page_size})
-        toolbar_items.append(
+            Span(f"Page {page} of {total_pages}", cls="middle"),
             Button(
-                Icon("add"),
-                Span(create_label),
-                cls=ButtonT.primary,
-                hx_get=f"{base_route}/action?{create_query}",
-                hx_target=f"#{feedback_id}",
-                hx_swap="outerHTML"
-            )
+                Icon("navigate_next"),
+                hx_get=f"{base_route}?{next_params}",
+                hx_target=f"#{container_id}",
+                hx_push_url="true",
+                disabled=page == total_pages,
+                cls="circle"
+            ),
+            cls="row center-align"
         )
     
-    # Build footer with pagination - count on left, paginator centered below table
-    footer_content = Div(
-        Div(Span(summary, cls="small-text grey-text")),
+    # Search form
+    search_form = Form(
         Div(
-            _page_size_select(page_size, search, base_route, container_id, page_sizes),
-            Pagination(
-                page,
-                total_pages,
-                f"{base_route}?{base_query}",
-                hx_target=f"#{container_id}"
+            Icon("search", cls="small"),
+            Input(
+                type="search",
+                name="search",
+                value=search,
+                placeholder=search_placeholder,
+                hx_get=base_route,
+                hx_trigger="input changed delay:300ms, search",
+                hx_target=f"#{container_id}",
+                hx_push_url="true",
+                hx_include="[name='page_size']"
             ),
-            cls="row center-align middle-align small-space"
+            cls="field prefix"
         ),
-        cls="grid"
+        Input(type="hidden", name="page_size", value=page_size),
+        cls="max"
     )
     
-    # Create header label mapping for custom rendering
-    label_map = dict(zip(header_keys, header_labels))
-    
-    # Build the card
-    card = Card(
-        DivFullySpaced(*toolbar_items, cls="padding"),
-        TableFromDicts(
-            header_keys,
-            table_rows,
-            header_cell_render=lambda k: Th(label_map.get(k, k)),
-            cls="border"
+    # Build table with proper Thead/Tbody structure
+    data_table = Table(
+        Thead(Tr(*[Th(label) for label in header_labels])),
+        Tbody(*[
+            Tr(*[Td(row_dict.get(key, '')) for key in header_keys])
+            for row_dict in table_rows
+        ]),
+        cls="border"
+    ) if data else Div(empty_message, cls="center-align padding")
+    
+    return Article(
+        Div(id=feedback_id),  # Feedback container for modals/toasts
+        Div(
+            search_form,
+            create_button,
+            cls="row"
         ),
-        footer=footer_content,
-        header=header_content,
-        cls="surface-container border round"
+        data_table,
+        Div(
+            Div(
+                _page_size_select(page_size, search, base_route, container_id, page_sizes),
+                Span(summary, cls="small-text grey-text"),
+                cls="row"
+            ),
+            pagination,
+            cls="grid"
+        ) if total > 0 else None,
+        id=container_id,
+        hx_trigger=f"{container_id}-refresh from:body",
+        hx_get=f"{base_route}?{base_query}",
+        hx_target=f"#{container_id}",
+        hx_swap="outerHTML"
     )
-    
-    return Div(card, Div(id=feedback_id), id=container_id)
 
 # %% ../nbs/05_datatable.ipynb 9
 import asyncio
@@ -479,6 +550,29 @@ class DataTableResource:
             }
         else:
             self.crud_ops = crud_ops
+            
+            # Validate custom_actions if provided
+            custom_actions = crud_ops.get("custom_actions", [])
+            if custom_actions:
+                reserved_names = {"view", "edit", "delete", "create"}
+                for action in custom_actions:
+                    # Check required fields
+                    if "name" not in action:
+                        raise ValueError("Custom action missing required 'name' field")
+                    if "label" not in action:
+                        raise ValueError(f"Custom action '{action['name']}' missing required 'label' field")
+                    if "icon" not in action:
+                        raise ValueError(f"Custom action '{action['name']}' missing required 'icon' field")
+                    if "handler" not in action:
+                        raise ValueError(f"Custom action '{action['name']}' missing required 'handler' field")
+                    
+                    # Check for reserved name collisions
+                    if action["name"] in reserved_names:
+                        raise ValueError(f"Custom action name '{action['name']}' conflicts with reserved action name")
+                    
+                    # Validate handler is callable
+                    if not callable(action["handler"]):
+                        raise ValueError(f"Custom action '{action['name']}' handler must be callable")
         
         # CRUD hooks
         self.on_create_hook = on_create
@@ -743,6 +837,29 @@ class DataTableResource:
                 logger.error(f"Delete failed: {e}", exc_info=True)
                 return self._error_toast(f"Delete failed: {str(e)}")
         
+        # Handle CUSTOM ACTIONS
+        custom_actions = self.crud_ops.get("custom_actions", [])
+        for custom_action in custom_actions:
+            if action == custom_action["name"]:
+                try:
+                    ctx = self._build_context(req, record=record, record_id=record_id)
+                    handler = custom_action["handler"]
+                    
+                    # Execute handler (sync or async)
+                    if asyncio.iscoroutinefunction(handler):
+                        loop = asyncio.get_event_loop()
+                        result = loop.run_until_complete(handler(ctx))
+                    else:
+                        result = handler(ctx)
+                    
+                    # Return success toast with refresh trigger
+                    message = result if isinstance(result, str) else f"{custom_action['label']} completed successfully."
+                    return self._success_toast(message)
+                    
+                except Exception as e:
+                    logger.error(f"Custom action '{action}' failed: {e}", exc_info=True)
+                    return self._error_toast(f"{custom_action['label']} failed: {str(e)}")
+        
         return Div(id=self.feedback_id)
     
     async def _handle_save(self, req):

{fh_matui-0.9.7.dist-info → fh_matui-0.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fh-matui
-Version: 0.9.7
+Version: 0.9.9
 Summary: material-ui for fasthtml
 Home-page: https://github.com/abhisheksreesaila/fh-matui
 Author: abhishek sreesaila

{fh_matui-0.9.7.dist-info → fh_matui-0.9.9.dist-info}/RECORD

@@ -1,14 +1,14 @@
-fh_matui/__init__.py,sha256=DUP796j17_h9tFqkdOpSu_66sw_6eSK4S2hN7yd9i9o,23
+fh_matui/__init__.py,sha256=4eQCGJV2-GRHX8FlvA_4etK0E4LFj2or592J4aePZoA,23
 fh_matui/_modidx.py,sha256=naHwPQ4kCo-5saE_uozmdPA881kp1gnqvKhmaG-Ya-4,23914
 fh_matui/app_pages.py,sha256=Sn9-tgBpaPNbR-0nZtPLoSCmAWLOGB4UQ88IkFvzBRY,10361
 fh_matui/components.py,sha256=KjdTHzWRXpVWBEIGskW1HfhjPpzRYzi6UA_yRjZyMWM,48254
 fh_matui/core.py,sha256=xtVBN8CtC50ZJ4Iu7o-mUhaA87tWdnz8gBfKRk63Zhs,10680
-fh_matui/datatable.py,sha256=SeqQ1Tz7KPJdaM9tjWH8er7od_D22O0MDW-VsTmddUo,31714
+fh_matui/datatable.py,sha256=NNb6WvGZ0QY13md4itwYH4a9yKZrOdwcaDW7PGo-vQM,36558
 fh_matui/foundations.py,sha256=b7PnObJpKN8ZAU9NzCm9xpfnHzFjjAROU7E2YvA_tj4,1820
 fh_matui/web_pages.py,sha256=4mF-jpfVcZTVepfQ-aMGgIUp-nBp0YCkvcdsWhUYeaA,34879
-fh_matui-0.9.7.dist-info/licenses/LICENSE,sha256=xV8xoN4VOL0uw9X8RSs2IMuD_Ss_a9yAbtGNeBWZwnw,11337
-fh_matui-0.9.7.dist-info/METADATA,sha256=NaRFkfivpA9VdJASWuvs80jxZVKh3PWDvkZv9tyaszY,10490
-fh_matui-0.9.7.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-fh_matui-0.9.7.dist-info/entry_points.txt,sha256=zn4CR4gNTiAAxbFsCxHAf2tQhtW29_YOffjbUTgeoWI,38
-fh_matui-0.9.7.dist-info/top_level.txt,sha256=l80d5eoA2ZjqtPYwAorLMS5PiHxUxz3zKzxMJ41Xoso,9
-fh_matui-0.9.7.dist-info/RECORD,,
+fh_matui-0.9.9.dist-info/licenses/LICENSE,sha256=xV8xoN4VOL0uw9X8RSs2IMuD_Ss_a9yAbtGNeBWZwnw,11337
+fh_matui-0.9.9.dist-info/METADATA,sha256=OGoxCFS3_qRnEJe2EkD-dMDl21lhYt5ecds1B6f5xpU,10490
+fh_matui-0.9.9.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+fh_matui-0.9.9.dist-info/entry_points.txt,sha256=zn4CR4gNTiAAxbFsCxHAf2tQhtW29_YOffjbUTgeoWI,38
+fh_matui-0.9.9.dist-info/top_level.txt,sha256=l80d5eoA2ZjqtPYwAorLMS5PiHxUxz3zKzxMJ41Xoso,9
+fh_matui-0.9.9.dist-info/RECORD,,