zebra-day 1.0.2__py3-none-any.whl → 2.1.4__py3-none-any.whl

zebra_day/web/routers/ui.py

@@ -2,26 +2,22 @@
 UI router for zebra_day web interface.
 
 Provides HTML endpoints for the web-based management interface.
-Supports dual interfaces:
-- Modern UI: Root routes (/, /printers, /print, /templates, /config)
-- Legacy UI: Routes under /legacy prefix
+All routes use the modern UI design with responsive layouts.
 """
+
 from __future__ import annotations
 
 import json
-import os
-import subprocess
 import tempfile
 import time
 from datetime import datetime
 from pathlib import Path
-from typing import Optional
 
-from fastapi import APIRouter, Request, Form, HTTPException
+from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import HTMLResponse, RedirectResponse, Response
 
-from zebra_day.logging_config import get_logger
 import zebra_day.cmd_mgr as zdcm
+from zebra_day.logging_config import get_logger
 
 _log = get_logger(__name__)
 
@@ -29,7 +25,7 @@ router = APIRouter()
 
 
 def get_template_context(request: Request, **kwargs) -> dict:
-    """Build common template context for legacy templates."""
+    """Build common template context for templates."""
     return {
         "request": request,
         "css_theme": f"static/{request.app.state.css_theme}",
@@ -73,7 +69,8 @@ def get_templates_list(pkg_path: Path) -> tuple[list, list]:
 def get_stats(zp, pkg_path: Path) -> dict:
     """Calculate dashboard statistics."""
     labs = zp.printers.get("labs", {})
-    total_printers = sum(len(printers) for printers in labs.values())
+    # Count printers via nested 'printers' key (v2 schema)
+    total_printers = sum(len(lab_data.get("printers", {})) for lab_data in labs.values())
     stable, draft = get_templates_list(pkg_path)
 
     # Count backup files
@@ -93,6 +90,7 @@ def get_stats(zp, pkg_path: Path) -> dict:
 # MODERN UI ROUTES (root level)
 # =============================================================================
 
+
 @router.get("/", response_class=HTMLResponse)
 async def modern_dashboard(request: Request):
     """Modern dashboard - home page."""
@@ -141,16 +139,26 @@ async def modern_printers_by_lab(request: Request, lab: str):
     if lab not in zp.printers.get("labs", {}):
         raise HTTPException(status_code=404, detail=f"Lab '{lab}' not found")
 
+    lab_data = zp.printers["labs"][lab]
+    lab_printers = lab_data.get("printers", {})
+
     printers = []
-    for name, info in zp.printers["labs"][lab].items():
-        printers.append({
-            "name": name,
-            "ip_address": info.get("ip_address", ""),
-            "model": info.get("model", ""),
-            "serial": info.get("serial", ""),
-            "label_zpl_styles": info.get("label_zpl_styles", []),
-            "status": "online" if info.get("ip_address") else "unknown",
-        })
+    for name, info in lab_printers.items():
+        printers.append(
+            {
+                "id": name,
+                "name": info.get("printer_name") or name,  # Display name or fallback to ID
+                "printer_name": info.get("printer_name"),
+                "ip_address": info.get("ip_address", ""),
+                "lab_location": info.get("lab_location"),
+                "manufacturer": info.get("manufacturer", "zebra"),
+                "model": info.get("model", ""),
+                "serial": info.get("serial", ""),
+                "label_zpl_styles": info.get("label_zpl_styles", []),
+                "status": "online" if info.get("ip_address") else "unknown",
+                "notes": info.get("notes", ""),
+            }
+        )
 
     ip_root = ".".join(request.app.state.local_ip.split(".")[:-1])
 
@@ -160,23 +168,29 @@ async def modern_printers_by_lab(request: Request, lab: str):
         labs=list(zp.printers.get("labs", {}).keys()),
         printers=printers,
         lab=lab,
+        lab_name=lab_data.get("lab_name", lab),
+        available_locations=lab_data.get("available_locations", []),
         ip_root=ip_root,
     )
     return templates.TemplateResponse("modern/printers.html", context)
 
 
-@router.get("/printers/{lab}/{printer_name}", response_class=HTMLResponse)
-async def modern_printer_detail(request: Request, lab: str, printer_name: str):
+@router.get("/printers/{lab}/{printer_id}", response_class=HTMLResponse)
+async def modern_printer_detail(request: Request, lab: str, printer_id: str):
     """Modern printer detail page."""
     zp = request.app.state.zp
     templates = request.app.state.templates
 
     if lab not in zp.printers.get("labs", {}):
         raise HTTPException(status_code=404, detail=f"Lab '{lab}' not found")
-    if printer_name not in zp.printers["labs"][lab]:
-        raise HTTPException(status_code=404, detail=f"Printer '{printer_name}' not found")
 
-    printer_info = zp.printers["labs"][lab][printer_name]
+    lab_data = zp.printers["labs"][lab]
+    lab_printers = lab_data.get("printers", {})
+
+    if printer_id not in lab_printers:
+        raise HTTPException(status_code=404, detail=f"Printer '{printer_id}' not found")
+
+    printer_info = lab_printers[printer_id]
 
     # Try to get printer configuration
     printer_config = ""
@@ -190,8 +204,11 @@ async def modern_printer_detail(request: Request, lab: str, printer_name: str):
     context = get_modern_context(
         request,
         active_page="printers",
-        printer_name=printer_name,
+        printer_id=printer_id,
+        printer_name=printer_info.get("printer_name") or printer_id,
         lab=lab,
+        lab_name=lab_data.get("lab_name", lab),
+        available_locations=lab_data.get("available_locations", []),
         printer_info=printer_info,
         printer_config=printer_config,
     )
@@ -278,6 +295,53 @@ async def modern_template_edit(
     return templates.TemplateResponse("modern/template_editor.html", context)
 
 
+@router.get("/templates/preview")
+async def modern_template_preview(
+    request: Request,
+    filename: str,
+    dtype: str = "",
+):
+    """Generate a PNG preview of a ZPL template.
+
+    Returns the PNG image directly or redirects to the generated file.
+    """
+    zp = request.app.state.zp
+    pkg_path = request.app.state.pkg_path
+
+    # Find the template file
+    if dtype:
+        filepath = pkg_path / "etc" / "label_styles" / dtype / filename
+    else:
+        # Try with .zpl extension if not provided
+        if not filename.endswith(".zpl"):
+            filepath = pkg_path / "etc" / "label_styles" / f"{filename}.zpl"
+        else:
+            filepath = pkg_path / "etc" / "label_styles" / filename
+
+    if not filepath.exists():
+        raise HTTPException(status_code=404, detail=f"Template '{filename}' not found")
+
+    try:
+        # Read template content
+        zpl_content = filepath.read_text()
+
+        # Generate PNG preview
+        output_dir = pkg_path / "files"
+        output_dir.mkdir(parents=True, exist_ok=True)
+
+        # Use template name for output file
+        template_name = filepath.stem
+        output_path = output_dir / f"{template_name}_preview.png"
+
+        zp.generate_label_png(zpl_content, str(output_path), False)
+
+        # Return redirect to the generated file
+        return RedirectResponse(url=f"/files/{template_name}_preview.png", status_code=303)
+
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"Preview generation failed: {e}") from None
+
+
 @router.get("/config", response_class=HTMLResponse)
 async def modern_config(request: Request):
     """Modern configuration page."""
@@ -297,438 +361,89 @@ async def modern_config(request: Request):
         "backups": stats["backups"],
     }
 
+    # Get the config file path that was loaded
+    config_file_path = getattr(zp, "printers_filename", "Unknown")
+
     context = get_modern_context(
         request,
         active_page="config",
         labs=labs,
         ip_root=ip_root,
         config_summary=config_summary,
+        config_file_path=config_file_path,
     )
     return templates.TemplateResponse("modern/config.html", context)
 
 
 @router.get("/config/view", response_class=HTMLResponse)
 async def modern_config_view(request: Request):
-    """View printer configuration JSON (redirects to legacy for now)."""
-    return RedirectResponse(url="/legacy/view_pstation_json", status_code=303)
-
-
-@router.get("/config/edit", response_class=HTMLResponse)
-async def modern_config_edit(request: Request):
-    """Edit printer configuration JSON (redirects to legacy for now)."""
-    return RedirectResponse(url="/legacy/view_pstation_json", status_code=303)
-
-
-@router.get("/config/backups", response_class=HTMLResponse)
-async def modern_config_backups(request: Request):
-    """List prior config files (redirects to legacy for now)."""
-    return RedirectResponse(url="/legacy/list_prior_printer_config_files", status_code=303)
-
-
-@router.get("/config/new", response_class=HTMLResponse)
-async def modern_config_new(request: Request):
-    """Build new config (redirects to legacy for now)."""
-    return RedirectResponse(url="/legacy/build_new_printers_config_json", status_code=303)
-
-
-@router.get("/config/scan", response_class=HTMLResponse)
-async def modern_config_scan(
-    request: Request,
-    ip_stub: str = "192.168.1",
-    scan_wait: str = "0.25",
-    lab: str = "scan-results",
-):
-    """Scan network for printers."""
-    zp = request.app.state.zp
-    zp.probe_zebra_printers_add_to_printers_json(
-        ip_stub=ip_stub, scan_wait=scan_wait, lab=lab
-    )
-    time.sleep(2.2)
-    return RedirectResponse(url=f"/printers/{lab}", status_code=303)
-
-
-@router.get("/_print_label", response_class=HTMLResponse)
-async def modern_print_label(
-    request: Request,
-    lab: Optional[str] = None,
-    printer: str = "",
-    printer_ip: str = "",
-    label_zpl_style: str = "",
-    uid_barcode: str = "",
-    alt_a: str = "",
-    alt_b: str = "",
-    alt_c: str = "",
-    alt_d: str = "",
-    alt_e: str = "",
-    alt_f: str = "",
-    labSelect: str = "",
-):
-    """Execute print request - modern UI."""
+    """View printer configuration JSON."""
     zp = request.app.state.zp
     templates = request.app.state.templates
-    rate_limiter = request.app.state.print_rate_limiter
-
-    if lab is None:
-        lab = labSelect
-
-    client_ip = request.client.host if request.client else "unknown"
 
-    # Check rate limit
-    allowed, reason = await rate_limiter.acquire(client_ip)
-    if not allowed:
-        raise HTTPException(status_code=429, detail=reason)
-
-    try:
-        result = zp.print_zpl(
-            lab=lab,
-            printer_name=printer,
-            label_zpl_style=label_zpl_style,
-            uid_barcode=uid_barcode,
-            alt_a=alt_a,
-            alt_b=alt_b,
-            alt_c=alt_c,
-            alt_d=alt_d,
-            alt_e=alt_e,
-            alt_f=alt_f,
-            client_ip=client_ip,
-        )
-    finally:
-        rate_limiter.release()
-
-    # Build the full URL for reference
-    full_url = str(request.url)
-
-    png_url = None
-    if result and ".png" in str(result):
-        png_name = str(result).split("/")[-1]
-        png_url = f"/files/{png_name}"
-
-    context = get_modern_context(
-        request,
-        title="Print Result",
-        success=True,
-        full_url=full_url,
-        png_url=png_url,
-    )
-    return templates.TemplateResponse("modern/print_result.html", context)
-
-
-@router.post("/save", response_class=HTMLResponse)
-async def modern_save_template(
-    request: Request,
-    filename: str = Form(...),
-    content: str = Form(...),
-    ftag: str = Form("na"),
-    lab: str = Form(""),
-    printer: str = Form(""),
-):
-    """Save ZPL template as a new draft file - modern UI."""
-    templates = request.app.state.templates
-    pkg_path = request.app.state.pkg_path
-
-    rec_date = str(datetime.now()).replace(" ", "_")
-    new_filename = filename.replace(".zpl", f".{ftag}.{rec_date}.zpl")
-
-    tmps_dir = pkg_path / "etc" / "label_styles" / "tmps"
-    tmps_dir.mkdir(parents=True, exist_ok=True)
-
-    temp_filepath = tmps_dir / new_filename
-    temp_filepath.write_text(content)
-
-    context = get_modern_context(
-        request,
-        title="Template Saved",
-        new_filename=new_filename,
-    )
-    return templates.TemplateResponse("modern/save_result.html", context)
-
-
-@router.post("/png_renderer")
-async def modern_png_renderer(
-    request: Request,
-    filename: str = Form(...),
-    content: str = Form(...),
-    lab: str = Form(""),
-    printer: str = Form(""),
-    ftag: str = Form(""),
-):
-    """Render ZPL content to PNG - modern UI."""
-    zp = request.app.state.zp
-    pkg_path = request.app.state.pkg_path
-
-    files_dir = pkg_path / "files"
-    files_dir.mkdir(parents=True, exist_ok=True)
-
-    png_tmp_f = tempfile.NamedTemporaryFile(
-        suffix=".png", dir=str(files_dir), delete=False
-    ).name
-
-    zp.generate_label_png(content, png_fn=png_tmp_f)
-
-    # Return just the relative path for the img src
-    return Response(
-        content=f"files/{Path(png_tmp_f).name}",
-        media_type="text/plain",
-    )
-
-
-# =============================================================================
-# LEGACY UI ROUTES (under /legacy prefix)
-# =============================================================================
-
-@router.get("/legacy", response_class=HTMLResponse)
-async def legacy_index(request: Request):
-    """Legacy home page."""
-    zp = request.app.state.zp
-    templates = request.app.state.templates
-
-    labs = list(zp.printers.get("labs", {}).keys())
-
-    context = get_template_context(
-        request,
-        title="Zebra Day - Home",
-        labs=labs,
-    )
-    return templates.TemplateResponse("legacy/index.html", context)
-
-
-@router.get("/legacy/printer_status", response_class=HTMLResponse)
-async def legacy_printer_status(request: Request, lab: str = "scan-results"):
-    """Legacy printer status page for a lab."""
-    zp = request.app.state.zp
-    templates = request.app.state.templates
-
-    if lab not in zp.printers.get("labs", {}):
-        raise HTTPException(status_code=404, detail=f"Lab '{lab}' not found")
-
-    printers = []
-    for name, info in zp.printers["labs"][lab].items():
-        printer_data = {
-            "name": name,
-            "ip_address": info.get("ip_address", ""),
-            "model": info.get("model", ""),
-            "serial": info.get("serial", ""),
-            "label_zpl_styles": info.get("label_zpl_styles", []),
-            "arp_data": info.get("arp_data", ""),
-            "status": "unknown",
-        }
-
-        # Try to get printer status (curl check)
-        if info.get("ip_address") and info["ip_address"] != "dl_png":
-            try:
-                result = subprocess.run(
-                    ["curl", "-m", "4", info["ip_address"]],
-                    capture_output=True,
-                    text=True,
-                    timeout=5,
-                )
-                for line in result.stdout.splitlines():
-                    if "Status:" in line:
-                        printer_data["status"] = line.strip()
-                        break
-            except Exception:
-                printer_data["status"] = "Unable to connect"
-
-        printers.append(printer_data)
-
-    ip_root = ".".join(request.app.state.local_ip.split(".")[:-1])
+    config_json = json.dumps(zp.printers, indent=4)
 
     context = get_template_context(
         request,
-        title=f"Printer Status - {lab}",
-        lab=lab,
-        printers=printers,
-        ip_root=ip_root,
-        labs=list(zp.printers.get("labs", {}).keys()),
+        title="View Configuration",
+        config_json=config_json,
+        mode="view",
     )
-    return templates.TemplateResponse("legacy/printer_status.html", context)
+    return templates.TemplateResponse("modern/config_editor.html", context)
 
 
-@router.get("/legacy/simple_print_request", response_class=HTMLResponse)
-async def legacy_simple_print_request(request: Request):
-    """Legacy simple print request form."""
-    zp = request.app.state.zp
-    templates = request.app.state.templates
-
-    pkg_path = request.app.state.pkg_path
-    styles_dir = pkg_path / "etc" / "label_styles"
-
-    template_names = []
-    if styles_dir.exists():
-        for f in sorted(styles_dir.iterdir()):
-            if f.is_file() and f.suffix == ".zpl":
-                template_names.append(f.stem)
-
-    labs_and_printers = {
-        lab: list(printers.keys())
-        for lab, printers in zp.printers.get("labs", {}).items()
-    }
-
-    context = get_template_context(
-        request,
-        title="Print Label",
-        templates=template_names,
-        labs=list(zp.printers.get("labs", {}).keys()),
-        labs_and_printers=json.dumps(labs_and_printers),
-    )
-    return templates.TemplateResponse("legacy/simple_print.html", context)
-
-
-@router.get("/legacy/edit_zpl", response_class=HTMLResponse)
-async def legacy_edit_zpl(request: Request):
-    """Legacy list ZPL templates for editing."""
-    templates = request.app.state.templates
-    pkg_path = request.app.state.pkg_path
-    styles_dir = pkg_path / "etc" / "label_styles"
-
-    stable_templates = []
-    draft_templates = []
-
-    if styles_dir.exists():
-        for f in sorted(styles_dir.iterdir()):
-            if f.is_file() and f.suffix == ".zpl":
-                stable_templates.append(f.name)
-
-    tmps_dir = styles_dir / "tmps"
-    if tmps_dir.exists():
-        for f in sorted(tmps_dir.iterdir()):
-            if f.is_file() and f.suffix == ".zpl":
-                draft_templates.append(f.name)
-
-    context = get_template_context(
-        request,
-        title="Edit ZPL Templates",
-        stable_templates=stable_templates,
-        draft_templates=draft_templates,
-    )
-    return templates.TemplateResponse("legacy/edit_zpl.html", context)
-
-
-@router.get("/legacy/chg_ui_style", response_class=HTMLResponse)
-async def legacy_chg_ui_style(request: Request, css_file: Optional[str] = None):
-    """Legacy change UI style or show available styles."""
-    if css_file:
-        request.app.state.css_theme = css_file
-        return RedirectResponse(url="/legacy", status_code=303)
-
-    templates = request.app.state.templates
-    pkg_path = request.app.state.pkg_path
-    static_dir = pkg_path / "static"
-
-    css_files = []
-    if static_dir.exists():
-        for f in sorted(static_dir.iterdir()):
-            if f.suffix == ".css":
-                css_files.append(f.name)
-
-    context = get_template_context(request, title="Change UI Style", css_files=css_files)
-    return templates.TemplateResponse("legacy/chg_ui_style.html", context)
-
-
-@router.get("/legacy/printer_details", response_class=HTMLResponse)
-async def legacy_printer_details(request: Request, printer_name: str, lab: str):
-    """Legacy show detailed printer information."""
-    zp = request.app.state.zp
-    templates = request.app.state.templates
-
-    if lab not in zp.printers.get("labs", {}):
-        raise HTTPException(status_code=404, detail=f"Lab '{lab}' not found")
-    if printer_name not in zp.printers["labs"][lab]:
-        raise HTTPException(status_code=404, detail=f"Printer '{printer_name}' not found")
-
-    printer_info = zp.printers["labs"][lab][printer_name]
-
-    # Try to get printer configuration
-    printer_config = ""
-    ip_addr = printer_info.get("ip_address", "")
-    if ip_addr and ip_addr != "dl_png":
-        try:
-            printer_config = zdcm.ZebraPrinter(ip_addr).get_configuration()
-        except Exception as e:
-            printer_config = f"Unable to retrieve config: {e}"
-
-    context = get_template_context(
-        request,
-        title=f"Printer Details - {printer_name}",
-        printer_name=printer_name,
-        lab=lab,
-        printer_info=printer_info,
-        printer_config=printer_config,
-    )
-    return templates.TemplateResponse("legacy/printer_details.html", context)
-
-
-@router.get("/legacy/view_pstation_json", response_class=HTMLResponse)
-async def legacy_view_pstation_json(request: Request, error_msg: Optional[str] = None):
-    """Legacy view and edit printer configuration JSON."""
+@router.get("/config/edit", response_class=HTMLResponse)
+async def modern_config_edit(request: Request, error_msg: str | None = None):
+    """Edit printer configuration JSON."""
     zp = request.app.state.zp
     templates = request.app.state.templates
 
-    config_data = json.dumps(zp.printers, indent=4)
+    config_json = json.dumps(zp.printers, indent=4)
 
     context = get_template_context(
         request,
-        title="View Printer Config JSON",
-        config_data=config_data,
+        title="Edit Configuration",
+        config_json=config_json,
+        mode="edit",
         error_msg=error_msg,
     )
-    return templates.TemplateResponse("legacy/view_pstation_json.html", context)
+    return templates.TemplateResponse("modern/config_editor.html", context)
 
 
-@router.post("/legacy/save_pstation_json")
-async def legacy_save_pstation_json(request: Request, json_data: str = Form(...)):
-    """Legacy save edited printer configuration JSON."""
+@router.post("/config/save")
+async def modern_config_save(request: Request, json_data: str = Form(...)):
+    """Save edited printer configuration JSON."""
     zp = request.app.state.zp
+    pkg_path = request.app.state.pkg_path
 
     try:
-        data = json.loads(json_data)
-    except json.JSONDecodeError as e:
-        return RedirectResponse(
-            url=f"/legacy/view_pstation_json?error_msg=Invalid+JSON:+{str(e)}",
-            status_code=303,
-        )
+        # Validate JSON
+        new_config = json.loads(json_data)
 
-    try:
-        # Backup and save
-        zp.save_printer_json()
+        # Backup current config
+        json_file = pkg_path / "etc" / "printer_config.json"
+        if json_file.exists():
+            bkup_dir = pkg_path / "etc" / "old_printer_config"
+            bkup_dir.mkdir(parents=True, exist_ok=True)
+            rec_date = str(datetime.now()).replace(" ", "_")
+            bkup_file = bkup_dir / f"printer_config.{rec_date}.json"
+            bkup_file.write_text(json_file.read_text())
 
-        # Write new config
-        with open(zp.printers_filename, "w") as f:
-            json.dump(data, f, indent=4)
+        # Save new config
+        json_file.write_text(json.dumps(new_config, indent=4))
 
         # Reload config
         zp.load_printer_json(json_file=zp.printers_filename, relative=False)
 
-        return RedirectResponse(url="/legacy", status_code=303)
-
-    except Exception as e:
-        return RedirectResponse(
-            url=f"/legacy/view_pstation_json?error_msg=Error+saving:+{str(e)}",
-            status_code=303,
-        )
-
+        return RedirectResponse(url="/config", status_code=303)
 
-@router.get("/legacy/clear_printers_json")
-async def legacy_clear_printers_json(request: Request):
-    """Legacy clear the printer configuration JSON."""
-    zp = request.app.state.zp
-    zp.clear_printers_json()
-    time.sleep(1.2)
-    return RedirectResponse(url="/legacy", status_code=303)
-
-
-@router.get("/legacy/reset_pstation_json")
-async def legacy_reset_pstation_json(request: Request):
-    """Legacy reset printer config from template."""
-    zp = request.app.state.zp
-    zp.replace_printer_json_from_template()
-    time.sleep(1.2)
-    return RedirectResponse(url="/legacy", status_code=303)
+    except json.JSONDecodeError as e:
+        return RedirectResponse(url=f"/config/edit?error_msg=Invalid JSON: {e}", status_code=303)
 
 
-@router.get("/legacy/list_prior_printer_config_files", response_class=HTMLResponse)
-async def legacy_list_prior_printer_config_files(request: Request):
-    """Legacy list backed up printer config files."""
+@router.get("/config/backups", response_class=HTMLResponse)
+async def modern_config_backups(request: Request):
+    """List prior config files."""
     templates = request.app.state.templates
     pkg_path = request.app.state.pkg_path
     bkup_dir = pkg_path / "etc" / "old_printer_config"
@@ -741,15 +456,15 @@ async def legacy_list_prior_printer_config_files(request: Request):
 
     context = get_template_context(
         request,
-        title="Prior Printer Config Files",
+        title="Configuration Backups",
         backup_files=backup_files,
     )
-    return templates.TemplateResponse("legacy/list_prior_configs.html", context)
+    return templates.TemplateResponse("modern/config_backups.html", context)
 
 
-@router.get("/legacy/build_new_printers_config_json", response_class=HTMLResponse)
-async def legacy_build_new_printers_config_json(request: Request):
-    """Legacy show network scan form."""
+@router.get("/config/new", response_class=HTMLResponse)
+async def modern_config_new(request: Request):
+    """Build new config page."""
     zp = request.app.state.zp
     templates = request.app.state.templates
 
@@ -757,109 +472,49 @@ async def legacy_build_new_printers_config_json(request: Request):
 
     context = get_template_context(
         request,
-        title="Scan Network for Printers",
+        title="New Configuration",
         ip_root=ip_root,
         labs=list(zp.printers.get("labs", {}).keys()),
     )
-    return templates.TemplateResponse("legacy/build_new_config.html", context)
+    return templates.TemplateResponse("modern/config_new.html", context)
 
 
-@router.get("/legacy/probe_zebra_printers_add_to_printers_json")
-async def legacy_probe_zebra_printers(
-    request: Request,
-    ip_stub: str = "192.168.1",
-    scan_wait: str = "0.25",
-    lab: str = "scan-results",
-):
-    """Legacy probe network for Zebra printers and add to config."""
-    zp = request.app.state.zp
-    zp.probe_zebra_printers_add_to_printers_json(
-        ip_stub=ip_stub, scan_wait=scan_wait, lab=lab
-    )
-    time.sleep(2.2)
-    return RedirectResponse(url=f"/legacy/printer_status?lab={lab}", status_code=303)
-
-
-@router.get("/legacy/bpr", response_class=HTMLResponse)
-async def legacy_bpr(request: Request):
-    """Legacy build print request - select lab, printer, template."""
+@router.get("/config/reset")
+async def modern_config_reset(request: Request):
+    """Reset printer config from template."""
     zp = request.app.state.zp
-    templates = request.app.state.templates
-    pkg_path = request.app.state.pkg_path
-
-    styles_dir = pkg_path / "etc" / "label_styles"
-
-    stable_templates = []
-    draft_templates = []
-
-    if styles_dir.exists():
-        for f in sorted(styles_dir.iterdir()):
-            if f.is_file() and f.suffix == ".zpl":
-                stable_templates.append(f.stem)
-
-    tmps_dir = styles_dir / "tmps"
-    if tmps_dir.exists():
-        for f in sorted(tmps_dir.iterdir()):
-            if f.is_file() and f.suffix == ".zpl":
-                draft_templates.append(f.stem)
-
-    labs_dict = zp.printers.get("labs", {})
-
-    context = get_template_context(
-        request,
-        title="Build Print Request",
-        labs=list(labs_dict.keys()),
-        labs_dict=json.dumps(labs_dict),
-        stable_templates=stable_templates,
-        draft_templates=draft_templates,
-    )
-    return templates.TemplateResponse("legacy/bpr.html", context)
+    zp.replace_printer_json_from_template()
+    time.sleep(1.2)
+    return RedirectResponse(url="/config", status_code=303)
 
 
-@router.get("/legacy/send_print_request", response_class=HTMLResponse)
-async def legacy_send_print_request(request: Request):
-    """Legacy send print request - stable templates only."""
+@router.get("/config/clear")
+async def modern_config_clear(request: Request):
+    """Clear the printer configuration JSON."""
     zp = request.app.state.zp
-    templates = request.app.state.templates
-
-    context = get_template_context(
-        request,
-        title="Send Print Request",
-        labs=zp.printers.get("labs", {}),
-    )
-    return templates.TemplateResponse("legacy/send_print_request.html", context)
+    zp.clear_printers_json()
+    time.sleep(1.2)
+    return RedirectResponse(url="/config", status_code=303)
 
 
-@router.get("/legacy/build_print_request", response_class=HTMLResponse)
-async def legacy_build_print_request(
+@router.get("/config/scan", response_class=HTMLResponse)
+async def modern_config_scan(
     request: Request,
-    lab: str = "",
-    printer: str = "",
-    printer_ip: str = "",
-    label_zpl_style: str = "",
-    filename: str = "",
+    ip_stub: str = "192.168.1",
+    scan_wait: str = "0.25",
+    lab: str = "scan-results",
 ):
-    """Legacy show print request form with pre-filled values."""
-    templates = request.app.state.templates
-
-    if label_zpl_style in ["", "None"] and filename not in ["", "None"]:
-        label_zpl_style = filename.replace(".zpl", "")
-
-    context = get_template_context(
-        request,
-        title="Build Print Request",
-        lab=lab,
-        printer=printer,
-        printer_ip=printer_ip,
-        label_zpl_style=label_zpl_style,
-    )
-    return templates.TemplateResponse("legacy/build_print_request.html", context)
+    """Scan network for printers."""
+    zp = request.app.state.zp
+    zp.probe_zebra_printers_add_to_printers_json(ip_stub=ip_stub, scan_wait=scan_wait, lab=lab)
+    time.sleep(2.2)
+    return RedirectResponse(url=f"/printers/{lab}", status_code=303)
 
 
-@router.get("/legacy/_print_label", response_class=HTMLResponse)
-async def legacy_print_label(
+@router.get("/_print_label", response_class=HTMLResponse)
+async def modern_print_label(
     request: Request,
-    lab: Optional[str] = None,
+    lab: str | None = None,
     printer: str = "",
     printer_ip: str = "",
     label_zpl_style: str = "",
@@ -872,7 +527,7 @@ async def legacy_print_label(
     alt_f: str = "",
     labSelect: str = "",
 ):
-    """Legacy execute print request."""
+    """Execute print request - modern UI."""
     zp = request.app.state.zp
     templates = request.app.state.templates
     rate_limiter = request.app.state.print_rate_limiter
@@ -910,55 +565,20 @@ async def legacy_print_label(
     png_url = None
     if result and ".png" in str(result):
         png_name = str(result).split("/")[-1]
-        png_url = f"/files/{png_name}"
+        png_url = f"/generated/{png_name}"
 
-    context = get_template_context(
+    context = get_modern_context(
         request,
         title="Print Result",
         success=True,
         full_url=full_url,
         png_url=png_url,
     )
-    return templates.TemplateResponse("legacy/print_result.html", context)
-
-
-@router.get("/legacy/edit", response_class=HTMLResponse)
-async def legacy_edit_template(
-    request: Request,
-    filename: str,
-    dtype: str = "",
-):
-    """Legacy edit a ZPL template file."""
-    zp = request.app.state.zp
-    templates = request.app.state.templates
-    pkg_path = request.app.state.pkg_path
-
-    if dtype:
-        filepath = pkg_path / "etc" / "label_styles" / dtype / filename
-    else:
-        filepath = pkg_path / "etc" / "label_styles" / filename
-
-    if not filepath.exists():
-        raise HTTPException(status_code=404, detail=f"Template '{filename}' not found")
-
-    content = filepath.read_text()
-
-    labs_dict = zp.printers.get("labs", {})
-
-    context = get_template_context(
-        request,
-        title=f"Edit: {filename}",
-        filename=filename,
-        content=content,
-        dtype=dtype,
-        labs=list(labs_dict.keys()),
-        labs_dict=json.dumps(labs_dict),
-    )
-    return templates.TemplateResponse("legacy/edit_template.html", context)
+    return templates.TemplateResponse("modern/print_result.html", context)
 
 
-@router.post("/legacy/save", response_class=HTMLResponse)
-async def legacy_save_template(
+@router.post("/save", response_class=HTMLResponse)
+async def modern_save_template(
     request: Request,
     filename: str = Form(...),
     content: str = Form(...),
@@ -966,7 +586,7 @@ async def legacy_save_template(
     lab: str = Form(""),
     printer: str = Form(""),
 ):
-    """Legacy save ZPL template as a new draft file."""
+    """Save ZPL template as a new draft file - modern UI."""
     templates = request.app.state.templates
     pkg_path = request.app.state.pkg_path
 
@@ -979,16 +599,16 @@ async def legacy_save_template(
     temp_filepath = tmps_dir / new_filename
     temp_filepath.write_text(content)
 
-    context = get_template_context(
+    context = get_modern_context(
         request,
         title="Template Saved",
         new_filename=new_filename,
     )
-    return templates.TemplateResponse("legacy/save_result.html", context)
+    return templates.TemplateResponse("modern/save_result.html", context)
 
 
-@router.post("/legacy/png_renderer")
-async def legacy_png_renderer(
+@router.post("/png_renderer")
+async def modern_png_renderer(
     request: Request,
     filename: str = Form(...),
     content: str = Form(...),
@@ -996,16 +616,14 @@ async def legacy_png_renderer(
     printer: str = Form(""),
     ftag: str = Form(""),
 ):
-    """Legacy render ZPL content to PNG."""
+    """Render ZPL content to PNG - modern UI."""
     zp = request.app.state.zp
     pkg_path = request.app.state.pkg_path
 
     files_dir = pkg_path / "files"
     files_dir.mkdir(parents=True, exist_ok=True)
 
-    png_tmp_f = tempfile.NamedTemporaryFile(
-        suffix=".png", dir=str(files_dir), delete=False
-    ).name
+    png_tmp_f = tempfile.NamedTemporaryFile(suffix=".png", dir=str(files_dir), delete=False).name
 
     zp.generate_label_png(content, png_fn=png_tmp_f)
 
@@ -1014,38 +632,3 @@ async def legacy_png_renderer(
         content=f"files/{Path(png_tmp_f).name}",
         media_type="text/plain",
     )
-
-
-@router.post("/legacy/build_and_send_raw_print_request")
-async def legacy_build_and_send_raw_print_request(
-    request: Request,
-    lab: str = Form(...),
-    printer: str = Form(...),
-    content: str = Form(...),
-    printer_ip: str = Form(""),
-    label_zpl_style: str = Form(""),
-    filename: str = Form(""),
-    ftag: str = Form(""),
-):
-    """Legacy send raw ZPL content to printer."""
-    zp = request.app.state.zp
-    rate_limiter = request.app.state.print_rate_limiter
-    client_ip = request.client.host if request.client else "unknown"
-
-    # Check rate limit
-    allowed, reason = await rate_limiter.acquire(client_ip)
-    if not allowed:
-        raise HTTPException(status_code=429, detail=reason)
-
-    try:
-        zp.print_zpl(
-            lab=lab,
-            printer_name=printer,
-            label_zpl_style=None,
-            zpl_content=content,
-            client_ip=client_ip,
-        )
-    finally:
-        rate_limiter.release()
-
-    return {"status": "sent"}