feat: implement merge_missing_catalog_widgets function to enhance dashboard layout
- Added the `merge_missing_catalog_widgets` function to append missing widget IDs from the catalog to the dashboard layout while preserving the existing order. - Updated the admin and app dashboard routes to utilize the new function, ensuring that new catalog entries are visible without requiring users to reset their layouts. - Enhanced tests to validate the functionality of the new merging logic, ensuring proper integration with existing layouts. - Bumped application version to reflect these changes.
This commit is contained in:
1 parent
2453da0da1
commit
01c0d1745f
6 files changed
+53
-6
No files matched your search
@@ -5,6 +5,7 @@ Erlaubte Widget-IDs und Reihenfolge: widget_catalog.WIDGET_CATALOG.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import copy
|
||||
from typing import Any, Literal
|
||||
|
||||
from pydantic import BaseModel, Field, field_validator, model_validator
|
||||
@@ -25,6 +26,7 @@ __all__ = [
|
||||
"coalesce_effective_layout",
|
||||
"default_layout_dict",
|
||||
"lab_default_layout_dict",
|
||||
"merge_missing_catalog_widgets",
|
||||
"product_default_layout_dict",
|
||||
]
|
||||
|
||||
@@ -52,6 +54,25 @@ def default_layout_dict() -> dict[str, Any]:
|
||||
return product_default_layout_dict()
|
||||
|
||||
|
||||
def merge_missing_catalog_widgets(layout: dict[str, Any]) -> dict[str, Any]:
|
||||
"""
|
||||
Hängt fehlende Widget-IDs aus WIDGET_CATALOG an (enabled=False, leere config).
|
||||
Bestehende Reihenfolge bleibt erhalten — nötig, damit neue Katalog-Einträge in
|
||||
„Übersicht anpassen“ / Lab erscheinen, ohne dass Nutzer:innen das Layout resetten müssen.
|
||||
"""
|
||||
out = copy.deepcopy(layout)
|
||||
widgets: list[dict[str, Any]] = list(out.get("widgets") or [])
|
||||
seen: set[str] = {str(w["id"]) for w in widgets if w.get("id")}
|
||||
for e in WIDGET_CATALOG:
|
||||
wid = e["id"]
|
||||
if wid not in seen:
|
||||
widgets.append({"id": wid, "enabled": False, "config": {}})
|
||||
seen.add(wid)
|
||||
out["version"] = out.get("version", 1)
|
||||
out["widgets"] = widgets
|
||||
return out
|
||||
|
||||
|
||||
class DashboardWidgetEntry(BaseModel):
|
||||
id: str = Field(min_length=1, max_length=64)
|
||||
enabled: bool = True
|
||||
|
||||
Reference in new issue
Block a user