Phase 6: Workspaces — Widget CRUD, Manager-Check, Cross-Tenant, Zustand Store, Settings Route

Backend: - Widget CRUD: get_widgets, create_widget, update_widget, delete_widget - Manager role check: is_workspace_manager - Cross-tenant validation: verify_user_same_tenant (UserTenant) - Default workspace seeding: seed_default_workspace with 12 standard modules - Set user default workspace: set_user_default_workspace - Fix create_workspace default uniqueness (unset others before insert) - Widget CRUD routes: GET/POST/PUT/DELETE /{workspace_id}/widgets - Set-default route: POST /{workspace_id}/set-default - Cross-tenant validation in assign_user route Frontend: - workspaceStore (Zustand): central state with sessionStorage persistence - API client interceptor: X-Workspace-ID header on all requests - useWorkspace hook refactored to use workspaceStore - Widget API hooks: useWorkspaceWidgets, useCreateWorkspaceWidget, etc. - useSetDefaultWorkspace hook - Settings route: /settings/workspaces with WorkspaceManagerPage - Settings nav item for Workspaces Tests: - 25 backend tests (CRUD, modules, widgets, users, manager, seeding, context, isolation) - 12 frontend tests (workspaceStore state, visibility, persistence, reset) - 48/48 backend tests passing - 12/12 frontend tests passing
2026-08-03 03:39:27 +02:00
parent 236f0d2a5d
commit 310a9f0542
13 changed files with 1481 additions and 50 deletions
@@ -14,6 +14,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import selectinload

 from app.models.workspace import Workspace, WorkspaceModule, WorkspaceUser, WorkspaceWidget
+from app.models.user import User, UserTenant


 def _workspace_to_dict(ws: Workspace, modules: list[WorkspaceModule] | None = None, user_count: int = 0) -> dict[str, Any]:
@@ -108,6 +109,17 @@ async def create_workspace(
    is_default: bool = False,
 ) -> dict[str, Any]:
    """Create a new workspace."""
+    # If this is the default workspace, unset others FIRST (avoids unique constraint violation)
+    if is_default:
+        await db.execute(
+            update(Workspace)
+            .where(
+                Workspace.tenant_id == tenant_id,
+            )
+            .values(is_default=False)
+        )
+        await db.flush()
+
    ws = Workspace(
        tenant_id=tenant_id,
        name=name,
@@ -121,17 +133,6 @@ async def create_workspace(
    await db.flush()
    await db.refresh(ws)
    
-    # If this is the default workspace, unset others
-    if is_default:
-        await db.execute(
-            update(Workspace)
-            .where(
-                Workspace.tenant_id == tenant_id,
-                Workspace.id != ws.id,
-            )
-            .values(is_default=False)
-        )
-    
    # Auto-assign creator as manager
    wu = WorkspaceUser(
        tenant_id=tenant_id,
@@ -424,3 +425,240 @@ async def get_workspace_context(
            for w in widgets
        ],
    }
+
+# ─── Widget CRUD ─────────────────────────────────────────────
+
+async def get_widgets(
+    db: AsyncSession, tenant_id: uuid.UUID, workspace_id: uuid.UUID
+) -> list[dict[str, Any]]:
+    """List all widgets for a workspace."""
+    q = select(WorkspaceWidget).where(
+        WorkspaceWidget.workspace_id == workspace_id,
+        WorkspaceWidget.tenant_id == tenant_id,
+    ).order_by(WorkspaceWidget.position_y, WorkspaceWidget.position_x)
+    result = await db.execute(q)
+    widgets = result.scalars().all()
+    return [
+        {
+            "id": str(w.id),
+            "workspace_id": str(w.workspace_id),
+            "widget_key": w.widget_key,
+            "position_x": w.position_x,
+            "position_y": w.position_y,
+            "width": w.width,
+            "height": w.height,
+            "config": w.config or {},
+        }
+        for w in widgets
+    ]
+
+
+async def create_widget(
+    db: AsyncSession, tenant_id: uuid.UUID, workspace_id: uuid.UUID,
+    widget_key: str, position_x: int = 0, position_y: int = 0,
+    width: int = 1, height: int = 1, config: dict | None = None,
+) -> dict[str, Any]:
+    """Create a new widget in a workspace. Multiple instances of the same widget_key allowed."""
+    w = WorkspaceWidget(
+        tenant_id=tenant_id,
+        workspace_id=workspace_id,
+        widget_key=widget_key,
+        position_x=position_x,
+        position_y=position_y,
+        width=width,
+        height=height,
+        config=config or {},
+    )
+    db.add(w)
+    await db.flush()
+    await db.refresh(w)
+    return {
+        "id": str(w.id),
+        "workspace_id": str(w.workspace_id),
+        "widget_key": w.widget_key,
+        "position_x": w.position_x,
+        "position_y": w.position_y,
+        "width": w.width,
+        "height": w.height,
+        "config": w.config or {},
+    }
+
+
+async def update_widget(
+    db: AsyncSession, tenant_id: uuid.UUID, widget_id: uuid.UUID,
+    position_x: int | None = None, position_y: int | None = None,
+    width: int | None = None, height: int | None = None,
+    config: dict | None = None,
+) -> dict[str, Any] | None:
+    """Update a widget."""
+    q = select(WorkspaceWidget).where(
+        WorkspaceWidget.id == widget_id,
+        WorkspaceWidget.tenant_id == tenant_id,
+    )
+    result = await db.execute(q)
+    w = result.scalar_one_or_none()
+    if w is None:
+        return None
+    if position_x is not None:
+        w.position_x = position_x
+    if position_y is not None:
+        w.position_y = position_y
+    if width is not None:
+        w.width = width
+    if height is not None:
+        w.height = height
+    if config is not None:
+        w.config = config
+    await db.flush()
+    await db.refresh(w)
+    return {
+        "id": str(w.id),
+        "workspace_id": str(w.workspace_id),
+        "widget_key": w.widget_key,
+        "position_x": w.position_x,
+        "position_y": w.position_y,
+        "width": w.width,
+        "height": w.height,
+        "config": w.config or {},
+    }
+
+
+async def delete_widget(
+    db: AsyncSession, tenant_id: uuid.UUID, widget_id: uuid.UUID
+) -> bool:
+    """Delete a widget."""
+    q = select(WorkspaceWidget).where(
+        WorkspaceWidget.id == widget_id,
+        WorkspaceWidget.tenant_id == tenant_id,
+    )
+    result = await db.execute(q)
+    w = result.scalar_one_or_none()
+    if w is None:
+        return False
+    await db.delete(w)
+    await db.flush()
+    return True
+
+
+# ─── Manager Role Check ───────────────────────────────────────
+
+async def is_workspace_manager(
+    db: AsyncSession, tenant_id: uuid.UUID, workspace_id: uuid.UUID, user_id: uuid.UUID
+) -> bool:
+    """Check if a user is a manager of a workspace (or system admin)."""
+    q = select(WorkspaceUser).where(
+        WorkspaceUser.workspace_id == workspace_id,
+        WorkspaceUser.user_id == user_id,
+        WorkspaceUser.tenant_id == tenant_id,
+        WorkspaceUser.role == "manager",
+    )
+    result = await db.execute(q)
+    return result.scalar_one_or_none() is not None
+
+
+# ─── Cross-Tenant Validation ──────────────────────────────────
+
+async def verify_user_same_tenant(
+    db: AsyncSession, tenant_id: uuid.UUID, user_id: uuid.UUID
+) -> bool:
+    """Verify that a user belongs to the same tenant. Prevents cross-tenant assignment."""
+    q = select(UserTenant).where(
+        UserTenant.user_id == user_id,
+        UserTenant.tenant_id == tenant_id,
+    )
+    result = await db.execute(q)
+    return result.scalar_one_or_none() is not None
+
+
+# ─── Default Workspace Seeding ────────────────────────────────
+
+async def seed_default_workspace(
+    db: AsyncSession, tenant_id: uuid.UUID, user_id: uuid.UUID
+) -> dict[str, Any] | None:
+    """Create a default workspace for a tenant if none exists.
+    Called during tenant setup or user creation.
+    """
+    # Check if any workspace exists for this tenant
+    existing_q = select(Workspace).where(
+        Workspace.tenant_id == tenant_id,
+        Workspace.is_active == True,  # noqa: E712
+    )
+    result = await db.execute(existing_q)
+    if result.scalars().first() is not None:
+        return None  # Already has workspaces
+
+    # Create default workspace with all standard modules visible
+    ws = Workspace(
+        tenant_id=tenant_id,
+        name="Standard",
+        icon="LayoutGrid",
+        description="Standard-Workspace mit allen Modulen",
+        is_default=True,
+        is_active=True,
+        created_by=user_id,
+    )
+    db.add(ws)
+    await db.flush()
+    await db.refresh(ws)
+
+    # Auto-assign creator as manager
+    wu = WorkspaceUser(
+        tenant_id=tenant_id,
+        workspace_id=ws.id,
+        user_id=user_id,
+        role="manager",
+        is_default=True,
+        assigned_by=user_id,
+    )
+    db.add(wu)
+
+    # Add all standard modules visible by default
+    standard_modules = [
+        ("dashboard", 0), ("contacts", 10), ("calendar", 20),
+        ("mail", 30), ("tasks", 40), ("dms", 50),
+        ("kommunikation", 60), ("reports", 70), ("automation", 80),
+        ("tags", 90), ("settings", 100), ("audit", 110),
+    ]
+    for key, order in standard_modules:
+        wm = WorkspaceModule(
+            tenant_id=tenant_id,
+            workspace_id=ws.id,
+            module_key=key,
+            is_visible=True,
+            menu_order=order,
+            config={},
+        )
+        db.add(wm)
+
+    await db.flush()
+    return _workspace_to_dict(ws, user_count=1)
+
+
+# ─── Set User Default Workspace ───────────────────────────────
+
+async def set_user_default_workspace(
+    db: AsyncSession, tenant_id: uuid.UUID, user_id: uuid.UUID, workspace_id: uuid.UUID
+) -> bool:
+    """Set a workspace as the user's default. Unsets previous default."""
+    # Unset previous default
+    await db.execute(
+        update(WorkspaceUser)
+        .where(
+            WorkspaceUser.user_id == user_id,
+            WorkspaceUser.tenant_id == tenant_id,
+            WorkspaceUser.workspace_id != workspace_id,
+        )
+        .values(is_default=False)
+    )
+    # Set new default
+    await db.execute(
+        update(WorkspaceUser)
+        .where(
+            WorkspaceUser.user_id == user_id,
+            WorkspaceUser.tenant_id == tenant_id,
+            WorkspaceUser.workspace_id == workspace_id,
+        )
+        .values(is_default=True)
+    )
+    await db.flush()
+    return True