v5.5.0 Partage v2 : fenêtre Share rechargée, sidebar « Par moi »/« Avec moi », Library dir=made/received, badge 👥 + indicateurs

- Correctif : la fenêtre Share rechargait ses partages à chaque ouverture (before: liste vide après refresh)
- Sidebar « Shared » scindée en sous-groupes « Par moi » (partages nominatifs + liens) et « Avec moi » (partages reçus), sans doublons
- Bibliothèque : filtre « Tous / Par moi / Avec moi » sur l'onglet Shared ; /api/library/shared?dir=made|received|all + share_dir par élément
- Document : bouton barre affiche « 👥 Shared ▾ » quand la page est partagée (membre, lien ou publiée), recalculé à la volée
- Workspace local : emoji 👥 juste avant le nom des fichiers partagés (is_shared exposé par /api/local-workspace/tree)
- Tests +6 (tests/test_sharing.py) : direction made/received/all, fallback dir invalide, rendu pageIsShared ; suite 325 verte (+3 PDF pré-existants)

app/routers/board.py

@@ -338,20 +338,36 @@ def _sidebar_data(request: Request, owner: str = "", repo: str = "") -> dict:
             "children": [],
         })
 
-    # Load shared pages (anyone with link or published)
+    # Load shared pages: made (page_shares created by me + link-mode pages) and
+    # received (page_shares toward me), plus published pages.
     with get_conn() as conn:
-        shared_rows = conn.execute(
-            "SELECT id, title, workspace, share_mode, published FROM pages "
-            "WHERE share_mode='anyone' OR published=1 ORDER BY updated_at DESC LIMIT 20"
+        made_nominal = conn.execute(
+            "SELECT DISTINCT p.id, p.title, p.workspace, p.updated_at FROM page_shares s "
+            "JOIN pages p ON p.id=s.page_id "
+            "WHERE s.created_by=? AND p.deleted_at IS NULL",
+            (uid,),
         ).fetchall()
-    shared_pages = []
-    published_pages = []
-    for r in shared_rows:
-        page_entry = {
+        made_link = conn.execute(
+            "SELECT id, title, workspace, updated_at FROM pages "
+            "WHERE share_mode='anyone' AND published=0 AND deleted_at IS NULL"
+        ).fetchall()
+        published_rows = conn.execute(
+            "SELECT id, title, workspace, updated_at FROM pages "
+            "WHERE published=1 AND deleted_at IS NULL ORDER BY updated_at DESC LIMIT 20"
+        ).fetchall()
+        received_rows = conn.execute(
+            "SELECT DISTINCT p.id, p.title, p.workspace, p.updated_at FROM page_shares s "
+            "JOIN pages p ON p.id=s.page_id "
+            "WHERE s.shared_with_user_id=? AND p.deleted_at IS NULL",
+            (uid,),
+        ).fetchall()
+
+    def _shared_entry(r, icon):
+        return {
             "id": f"page/{r['id']}",
             "db_id": r["id"],
             "name": r["title"] or "New page",
-            "icon": "🌐" if r["published"] else "🔗",
+            "icon": icon,
             "url": f"/pages/{r['id']}",
             "active": False,
             "indent": 0,
@@ -359,10 +375,17 @@ def _sidebar_data(request: Request, owner: str = "", repo: str = "") -> dict:
             "has_children": False,
             "children": [],
         }
-        if r["published"]:
-            published_pages.append(page_entry)
-        else:
-            shared_pages.append(page_entry)
+
+    made_map = {}
+    for r in (*made_nominal, *made_link):
+        made_map.setdefault(r["id"], r)
+    made_sorted = sorted(made_map.values(), key=lambda r: r["updated_at"] or "", reverse=True)[:20]
+    shared_made_pages = [_shared_entry(r, "link") for r in made_sorted]
+    received_sorted = [r for r in received_rows if r["id"] not in made_map]
+    received_sorted = sorted(received_sorted, key=lambda r: r["updated_at"] or "", reverse=True)[:20]
+    shared_received_pages = [_shared_entry(r, "users") for r in received_sorted]
+    published_pages = [_shared_entry(r, "globe") for r in published_rows]
+    shared_pages = [_shared_entry(r, "link") for r in made_sorted]
 
     # Auth method & OAuth badge data
     auth_method = "local"
@@ -396,6 +419,8 @@ def _sidebar_data(request: Request, owner: str = "", repo: str = "") -> dict:
             "current_page": repo or "Dashboard", "last_edited": "now",
             "recent_pages": recent, "private_pages": private_items,
             "favorite_pages": favorites, "shared_pages": shared_pages,
+            "shared_made_pages": shared_made_pages,
+            "shared_received_pages": shared_received_pages,
             "published_pages": published_pages,
             "user": user,
             "auth_method": auth_method,
@@ -542,6 +567,8 @@ async def library_page(request: Request, owner: str = Query(default=""), repo: s
     sidebar["favorite_pages"] = []
     sidebar["private_pages"] = [p for p in all_pages if p.get("source") == "🔒 Private"]
     sidebar["shared_pages"] = []
+    sidebar["shared_made_pages"] = []
+    sidebar["shared_received_pages"] = []
     template = env.get_template("library.html")
     return template.render(**sidebar)
 
@@ -1016,6 +1043,7 @@ async def view_page(request: Request, page_id: int):
     ctx = {**sidebar, "page": page, "page_favorited": fav is not None,
            "page_share_mode": page.get("share_mode", "private"),
            "page_published": bool(page.get("published", 0)),
+           "page_is_shared": bool(page.get("is_shared", 0)) or page.get("share_mode", "private") != "private" or bool(page.get("published", 0)),
            "page_data": page_data,
            "breadcrumb_items": nav_crumbs,
            "nav_workspace_id": page.get("workspace_id") or 0,

app/routers/dashboard.py

@@ -222,6 +222,8 @@ def _sidebar_data(request: Request, repos: list[dict], include_workspace: bool =
         "private_pages": private_pages,
         "favorite_pages": [],
         "shared_pages": [],
+        "shared_made_pages": [],
+        "shared_received_pages": [],
         "published_pages": [],
         "user": user,
         "avatar_url": avatar_url,
@@ -384,6 +386,7 @@ async def view_page_root(request: Request, page_id: int):
            "page_favorited": fav is not None,
            "page_share_mode": page.get("share_mode", "private"),
            "page_published": bool(page.get("published", 0)),
+           "page_is_shared": bool(page.get("is_shared", 0)) or page.get("share_mode", "private") != "private" or bool(page.get("published", 0)),
            "page_data": page_data,
            "collection_data": collection_data,
            "breadcrumb_items": nav_crumbs,
@@ -1021,7 +1024,7 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list:
     if parent_id is None:
         rows = conn.execute(
             "SELECT id, title, parent_section, content_format, content, "
-            "created_at, updated_at FROM pages "
+            "is_shared, created_at, updated_at FROM pages "
             "WHERE parent_id IS NULL AND workspace_id=? AND deleted_at IS NULL "
             "ORDER BY created_at DESC",
             (ws_id,),
@@ -1029,7 +1032,7 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list:
     else:
         rows = conn.execute(
             "SELECT id, title, parent_section, content_format, content, "
-            "created_at, updated_at FROM pages "
+            "is_shared, created_at, updated_at FROM pages "
             "WHERE parent_id=? AND workspace_id=? AND deleted_at IS NULL "
             "ORDER BY created_at DESC",
             (parent_id, ws_id),
@@ -1089,6 +1092,7 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list:
             "updated_at": r["updated_at"],
             "author": author,
             "tags": tags_map.get(r["id"], []),
+            "is_shared": bool(r["is_shared"]),
         })
     return tree
 

app/routers/library.py

@@ -84,6 +84,7 @@ def _build_item(db_row: dict, uid: int = 1) -> dict:
         "url": url,
         "content_format": content_format,
         "favorited": bool(db_row.get("favorited", 0)),
+        "share_mode": db_row.get("share_mode", "private"),
     }
 
 
@@ -197,13 +198,45 @@ async def library_shared(
     request: Request,
     source_type: str = Query(default="all"),
     tree: int = Query(default=0),
+    dir: str = Query(default="all"),
 ):
     if source_type not in SOURCE_TYPES:
         source_type = "all"
+    if dir not in ("made", "received", "all"):
+        dir = "all"
 
     uid = _get_user_id(request)
-    query = f"{BASE_SELECT} FROM pages p WHERE p.share_mode != 'private' AND p.parent_section != 'Trash' AND p.deleted_at IS NULL"
+
+    # Page ids the user shares toward others (nominal page_shares) or receives
+    with get_conn() as conn:
+        made_rows = conn.execute(
+            "SELECT DISTINCT s.page_id FROM page_shares s WHERE s.created_by=?",
+            (uid,),
+        ).fetchall()
+        recv_rows = conn.execute(
+            "SELECT DISTINCT s.page_id FROM page_shares s WHERE s.shared_with_user_id=?",
+            (uid,),
+        ).fetchall()
+    made_ids = {r[0] for r in made_rows}
+    recv_ids = {r[0] for r in recv_rows}
+
+    conds: list[str] = []
     params: list = []
+    if dir in ("all", "made"):
+        conds.append("p.share_mode != 'private'")
+    if dir in ("all", "received") and recv_ids:
+        conds.append(f"p.id IN ({','.join('?' for _ in recv_ids)})")
+        params.extend(recv_ids)
+    if dir == "made" and made_ids:
+        conds.append(f"p.id IN ({','.join('?' for _ in made_ids)})")
+        params.extend(made_ids)
+    if dir == "received" and not recv_ids:
+        return {"items": []}
+
+    query = (
+        f"{BASE_SELECT} FROM pages p "
+        f"WHERE ({' OR '.join(conds)}) AND p.parent_section != 'Trash' AND p.deleted_at IS NULL"
+    )
     if tree:
         query += " AND p.parent_id IS NULL"
     query, params = _apply_source_filter(query, params, source_type)
@@ -213,6 +246,11 @@ async def library_shared(
         rows = conn.execute(query, params).fetchall()
 
     items = _rows_to_items(rows, uid)
+    for it in items:
+        sid = it["id"]
+        is_made = sid in made_ids or it.get("share_mode", "private") != "private"
+        is_recv = sid in recv_ids
+        it["share_dir"] = "both" if (is_made and is_recv) else ("made" if is_made else ("received" if is_recv else ""))
     _enrich_children(items)
     return {"items": items}