From c36082be6ad280bb938063696afa457729881cd1 Mon Sep 17 00:00:00 2001 From: Bruno Charest Date: Fri, 11 Sep 2026 22:00:54 -0400 Subject: [PATCH] fix(ctxmenu): repair library rendering and complete unified row menu - library.html: remove leftover syntax error + orphan that broke libraryPage() (page showed 'undefined' and no files), call the correct fdCtx.openMenu and use self instead of a throwaway libraryPage() instance - _ctx_menu.html: full conventional menu with shortcuts, tags + colour picker, edit-icon picker; closes on outside click and Escape - local_workspace.html: migrate onContextMenu to the shared fdCtx store with complete handlers; drop legacy window._ctxMenuData DOM hacks - dashboard.py: expose page_icon + favorited in the workspace tree --- app/routers/dashboard.py | 22 ++- app/templates/_ctx_menu.html | 243 ++++++++++++++++++-------- app/templates/library.html | 79 ++++++--- app/templates/local_workspace.html | 268 +++++++++++++---------------- 4 files changed, 359 insertions(+), 253 deletions(-) diff --git a/app/routers/dashboard.py b/app/routers/dashboard.py index 9e3469b..53ba168 100644 --- a/app/routers/dashboard.py +++ b/app/routers/dashboard.py @@ -992,16 +992,17 @@ async def local_workspace_tree(request: Request, folder: int = None): ws_id = ws["id"] if ws else None if not ws_id: return {"tree": [], "breadcrumb": []} + uid = _get_user_id(request) with get_conn() as conn: if folder: # Show only this folder's children + build breadcrumb - children = _build_tree_children(conn, folder, ws_id) + children = _build_tree_children(conn, folder, ws_id, uid) breadcrumb = _build_breadcrumb(conn, folder) return {"tree": children, "breadcrumb": breadcrumb, "current_folder": folder} else: # Full tree from root - roots = _build_tree_children(conn, None, ws_id) + roots = _build_tree_children(conn, None, ws_id, uid) return {"tree": roots, "breadcrumb": [], "current_folder": None} @@ -1028,11 +1029,11 @@ async def local_workspace_breadcrumb(request: Request, folder: int): return {"breadcrumb": breadcrumb} -def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list: +def _build_tree_children(conn, parent_id: int | None, ws_id: int, uid: int | None = None) -> list: """Recursively build the tree of children for a node.""" if parent_id is None: rows = conn.execute( - "SELECT id, title, parent_section, content_format, content, " + "SELECT id, title, parent_section, content_format, content, page_icon, " "(is_shared OR share_mode != 'private' OR COALESCE(published,0)) as is_shared, " "created_at, updated_at FROM pages " "WHERE parent_id IS NULL AND workspace_id=? AND deleted_at IS NULL " @@ -1041,7 +1042,7 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list: ).fetchall() else: rows = conn.execute( - "SELECT id, title, parent_section, content_format, content, " + "SELECT id, title, parent_section, content_format, content, page_icon, " "(is_shared OR share_mode != 'private' OR COALESCE(published,0)) as is_shared, " "created_at, updated_at FROM pages " "WHERE parent_id=? AND workspace_id=? AND deleted_at IS NULL " @@ -1059,6 +1060,7 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list: # Collect all page IDs to fetch tags in one query all_ids = [r["id"] for r in rows] tags_map = {} + favorited_ids = set() if all_ids: placeholders = ",".join("?" for _ in all_ids) tag_rows = conn.execute( @@ -1070,11 +1072,17 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list: tags_map.setdefault(tr["page_id"], []).append({ "id": tr["id"], "name": tr["name"], "color": tr["color"], }) + if uid is not None: + fav_rows = conn.execute( + f"SELECT page_id FROM favorites WHERE user_id=? AND page_id IN ({placeholders})", + [uid, *all_ids], + ).fetchall() + favorited_ids = {fr["page_id"] for fr in fav_rows} tree = [] for r in rows: is_folder = r["parent_section"] == "Workspace" - children = _build_tree_children(conn, r["id"], ws_id) + children = _build_tree_children(conn, r["id"], ws_id, uid) # Compute size size = 0 @@ -1094,6 +1102,7 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list: "type": "folder" if is_folder else "page", "is_folder": is_folder, "content_format": r["content_format"] if not is_folder else None, + "page_icon": r["page_icon"] or "", "children": children, "has_children": len(children) > 0, "child_count": len(children), @@ -1104,6 +1113,7 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list: "author": author, "tags": tags_map.get(r["id"], []), "is_shared": bool(r["is_shared"]), + "favorited": r["id"] in favorited_ids, }) return tree diff --git a/app/templates/_ctx_menu.html b/app/templates/_ctx_menu.html index c8692c1..d5fe7a9 100644 --- a/app/templates/_ctx_menu.html +++ b/app/templates/_ctx_menu.html @@ -1,5 +1,5 @@ {############################################################################### - _ctx_menu.html — LE menu contextuel UNIQUE de FlowDeck (v5.4.x) + _ctx_menu.html — LE menu contextuel UNIQUE de FlowDeck ═══════════════════════════════════════════════════════════════════════════ Inclus par library.html ET local_workspace.html (les 2 seules pages du contexte fichier). Ce partial est LE SEUL menu : son markup décrit l'UNION @@ -7,21 +7,13 @@ chaque page au travers d'un store Alpine enregistré PLUS BAS (IIFE + défense d'exécution unique → include 2 fois = store 1 fois). - Union des items (identiques sur les 2 pages) : - 1. Open .................... library: openItem / ws: ctxMenuOpenPage - 2. Open in side peek ....... library: openPeek (ws: item caché) - 3. Open folder ............. ws: ctxMenuOpenFolder (dossier uniquement) - 4. Rename .................. library: startRename / ws: ctxMenuRename - 5. Add/Remove Favorites .... library: toggleFavoriteItem (ws: caché) - 6. Duplicate ............... library: duplicateItem / ws: ctxMenuDuplicate - 7. Copy link ............... library: copyLink (ws: caché) - 8. Move to ................. library: openMovePicker (ws: caché) - 9. Tags (section dynamique) ws: ctxTagExisting/… (s'affiche si node.tags) - 10. Delete .................. library: deleteItem / ws: ctxMenuDelete (danger) + Chaque item se masque quand le handler correspondant n'existe pas sur la + page (x-show="$store.fdCtx.has('key')") → menu structurellement identique, + avec la capacité respective de la page au clic. - Chaque item masque ses entrées quand `handlers` de l'autre page est vide - (x-show="fdCtx.has('key')") → le menu est STRUCTURELLEMENT identique des - deux côtés, avec la capacité respective au clic. + Handlers attendus (tous optionnels) : + open, openTab, peek, folder, rename, setIcon, duplicate, link, move, + fav, recent, delete, tagExisting, tagAdd, tagRemove ############################################################################} -
+.fd-ctx-menu{position:fixed !important;top:0;left:0;min-width:230px;max-width:280px;max-height:calc(100vh - 16px);overflow-y:auto;z-index:2000;padding:4px;} +.fd-ctx-menu .menu-item{display:flex;align-items:center;gap:8px;padding:6px 10px;font-size:13px;color:var(--text-primary);cursor:pointer;border-radius:4px;transition:background .1s;white-space:nowrap;} +.fd-ctx-menu .menu-item:hover{background:var(--bg-hover);} +.fd-ctx-menu .menu-item svg{width:14px;height:14px;flex-shrink:0;} +.fd-ctx-menu .menu-danger{color:var(--danger);} +.fd-ctx-menu .menu-shortcut{margin-left:auto;font-size:11px;color:var(--text-dim);padding-left:16px;} +.fd-ctx-menu .more-sep{height:1px;background:var(--border);margin:4px 6px;} +.fd-ctx-menu .ctx-label{color:var(--text-dim);font-size:11px;cursor:default;text-transform:uppercase;letter-spacing:.04em;} +.fd-ctx-menu .ctx-label:hover{background:transparent;} +.fd-ctx-menu .ctx-empty{color:var(--text-dim);font-size:11px;cursor:default;} +.fd-ctx-menu .ctx-empty:hover{background:transparent;} +.fd-ctx-menu .ctx-caret{font-size:10px;color:var(--text-dim);} +.fd-ctx-menu .ctx-x{color:var(--text-dim);font-size:14px;line-height:1;padding:0 2px;} +.fd-ctx-menu .ctx-x:hover{color:var(--danger);} +.fd-ctx-menu .ctx-sub{padding:2px 0 4px;background:var(--bg-tertiary);border-radius:6px;margin:2px 6px;} +.fd-ctx-menu .ctx-tag-color{width:10px;height:10px;border-radius:3px;display:inline-block;flex-shrink:0;} +.fd-ctx-menu .ctx-colors{display:grid;grid-template-columns:repeat(7,1fr);gap:4px;padding:2px 4px 6px;} +.fd-ctx-menu .ctx-swatch{width:16px;height:16px;border-radius:4px;cursor:pointer;border:2px solid transparent;} +.fd-ctx-menu .ctx-swatch.selected{border-color:var(--text-primary);} +.fd-ctx-menu .ctx-input{flex:1;min-width:0;font-size:12px;padding:3px 6px;background:var(--bg-primary);border:1px solid var(--border);border-radius:4px;color:var(--text-primary);outline:none;} +.fd-ctx-menu .ctx-input:focus{border-color:var(--accent);} +.fd-ctx-menu .ctx-btn{padding:3px 10px;font-size:12px;background:var(--accent);color:#fff;border:none;border-radius:4px;cursor:pointer;} +.fd-ctx-menu .ctx-icons{display:grid;grid-template-columns:repeat(7,1fr);gap:2px;padding:2px 4px 4px;} +.fd-ctx-menu .ctx-icon{width:26px;height:26px;display:flex;align-items:center;justify-content:center;font-size:15px;background:transparent;border:none;border-radius:4px;cursor:pointer;} +.fd-ctx-menu .ctx-icon:hover{background:var(--bg-hover);} + + +
- {# ── 1. Open ── #} -
+ {# ── Open ── #} +
- Open + Open
- {# ── 2. Open in side peek (library) ── #} + {# ── Open in new tab ── #} +
+ + Open in new tabCtrl+⇧+↩ +
+ + {# ── Open in side peek ── #}
- - Open in side peek + + Open in side peekAlt+Click
- {# ── 3. Open folder (workspace, dossiers) ── #} + {# ── Open folder (workspace, dossiers) ── #}
- Open folder + Open folder
- {# ── 4. Rename ── #} -
+
+ + {# ── Rename ── #} +
- Rename + RenameCtrl+⇧+R
- {# ── 5. Add/Remove Favorites (library) ── #} -
- - + {# ── Edit icon ── #} +
+ + Edit icon +
+
+
+ +
+
+ + +
- {# ── 6. Duplicate ── #} -
+ {# ── Duplicate ── #} +
- Duplicate + Duplicate
- {# ── 7. Copy link (library) ── #} + {# ── Copy link ── #}
- Copy link + Copy link
- {# ── 8. Move to (library) ── #} + {# ── Move to ── #}
- Move to + Move toCtrl+⇧+P
- {# ── 9. Tags (workspace) ── #} -
- -
@@ -475,11 +473,6 @@ function libraryPage() { // More menu moreOpen: false, - // Row context menu - ctxMenuItem: null, - ctxMenuX: 0, - ctxMenuY: 0, - // Move-to modal moveModalOpen: false, moveIds: [], @@ -598,8 +591,10 @@ function libraryPage() { var name = icon || fallback || 'file'; // Only allow known icon names, otherwise use fallback var valid = ['folder','file','star','link','trash','book','home','settings','lock','globe','image','edit','calendar','users','user','search','tag','bar-chart','grid','list','align-left','zap','paperclip','key','refresh','upload']; - if (valid.indexOf(name) === -1) name = fallback || 'file'; - return getSvgIcon(name, 14); + if (valid.indexOf(name) !== -1) return getSvgIcon(name, 14); + // Custom emoji / non-ASCII icon (e.g. 📝) — render as-is + if (/[^\x00-\x7F]/.test(name)) return '' + this._escHtml(name) + ''; + return getSvgIcon(fallback || 'file', 14); }, _recomputeFlatItems() { @@ -673,27 +668,25 @@ function libraryPage() { evt.preventDefault(); var item = this._findItem(id); if (!item) return; + if (!(window.Alpine && Alpine.store('fdCtx'))) return; /* MENU UNIFIÉ (partial _ctx_menu.html + store fdCtx) — handlers library - complète l'union (8 items). Open folder/tags non prévus côté library : + complète l'union. Open folder/tags non prévus côté library : fdCtx les cache automatiquement via handlers absents. */ - var handlers = { - open: function (n) { libraryPage().openItem(n); }, - peek: function (n) { libraryPage().openPeek(n); }, - rename: function (n) { libraryPage().startRename(n); }, - fav: function (n) { libraryPage().toggleFavoriteItem(n); }, - duplicate: function (n) { libraryPage().duplicateItem(n); }, - link: function (n) { libraryPage().copyLink(n); }, - move: function (n) { libraryPage().openMovePicker([n.id]); }, - del: function (n) { libraryPage().deleteItem(n); } - }; var self = this; - if (window.Alpine && Alpine.store('fdCtx')) { - Alpine.store('fdCtx').open(evt, item, 'library', handlers); - Alpine.store('fdCtx').closeMenu = function () { ctxMenuItem = null; }; - } - this.ctxMenuItem = item parallels ?? null; - this.ctxMenuX = Math.min(evt.clientX, window.innerWidth - 220); - this.ctxMenuY = Math.min(evt.clientY, window.innerHeight - 320); + var handlers = { + open: function (n) { self.openItem(n); }, + openTab: function (n) { self.openInNewTab(n); }, + peek: function (n) { self.openPeek(n); }, + rename: function (n) { self.startRename(n); }, + setIcon: function (icon) { self.setItemIcon(item, icon); }, + duplicate: function (n) { self.duplicateItem(n); }, + link: function (n) { self.copyLink(n); }, + move: function (n) { self.openMovePicker([n.id]); }, + fav: function (n) { self.toggleFavoriteItem(n); }, + delete: function (n) { self.deleteItem(n); } + }; + if (this.tab === 'recents') handlers.recent = function (n) { self.removeItemFromRecents(n); }; + Alpine.store('fdCtx').openMenu(evt, item, 'library', handlers); }, // ── Drag & drop (move / reparent) ── @@ -1058,6 +1051,38 @@ function libraryPage() { if (window.showToast) window.showToast('Link copied', 'success'); }, + openInNewTab(item) { + if (!item || !item.id) return; + window.open('/pages/' + item.id, '_blank'); + }, + + removeItemFromRecents(item) { + if (!item) return; + var id = item.id; + this.items = this.items.filter(function(it) { return it.id !== id; }); + this._recomputeFlatItems(); + if (window.showToast) window.showToast('Removed from Recents', 'success'); + }, + + async setItemIcon(item, icon) { + if (!item || !item.id) return; + icon = (icon || '').trim(); + if (!icon) return; + try { + var r = await fetch('/board/api/pages/' + item.id + '/icon', { + method: 'POST', + headers: {'Content-Type': 'application/json', 'X-CSRF-Token': this._getCsrf()}, + body: JSON.stringify({icon: icon}) + }); + if (!r.ok) throw new Error('icon update failed'); + item.icon = icon; + this._renderTable(); + if (window.showToast) window.showToast('Icon updated', 'success'); + } catch(e) { + if (window.showToast) window.showToast('Failed to update icon', 'error'); + } + }, + async toggleFavoriteItem(item) { if (!item) return; var csrf = this._getCsrf(); diff --git a/app/templates/local_workspace.html b/app/templates/local_workspace.html index 89ff095..2b9daf6 100644 --- a/app/templates/local_workspace.html +++ b/app/templates/local_workspace.html @@ -526,13 +526,7 @@ window._wsInitData = (function() { viewIcons: {tree:'',list:'',details:'',title:'',content:''}, viewLabels: {tree:'Tree',list:'List',details:'Details',title:'Cards',content:'Content'}, - // Context menu - ctxMenu: {visible:false,x:0,y:0,node:null,tags:[]}, - ctxTagAdding: false, - ctxTagExistingOpen: false, - ctxAvailTags: [], - ctxNewTagColor: '#787774', - ctxTagColors: ['#787774','#E03E3E','#D9730D','#DFAB01','#0F7B6C','#0B6E99','#6940A5','#AD1A72','#E16259','#D4A72C','#448361','#337EA9','#9065B0','#C94D8B'], + // Context menu — state lives in the shared fdCtx Alpine store (_ctx_menu.html) // Tags workspaceTags: [], @@ -869,7 +863,7 @@ window._wsInitData = (function() { selectForPreview(node) { var panel = document.getElementById('ws-preview-panel'); if (!panel) return; - document.getElementById('ws-preview-icon').innerHTML = this._fileIcon(node.name, node.is_folder, node.content_format); + document.getElementById('ws-preview-icon').innerHTML = this._fileIcon(node.name, node.is_folder, node.content_format, node.page_icon); document.getElementById('ws-preview-title').textContent = node.name; var openBtn = document.getElementById('ws-preview-open-btn'); openBtn.onclick = function() { window.location = '/pages/' + node.id; }; @@ -1008,61 +1002,95 @@ window._wsInitData = (function() { // ── Content snippet for content view ── contentSnippetMap: {}, - // ── Context menu ── + // ── Context menu (menu unifié partagé via le store Alpine fdCtx) ── onContextMenu(ev) { var el = ev.target.closest('[data-ws-id]'); - var menu = document.querySelector('.more-menu'); - if (!el || !menu) { if (menu) menu.style.display = 'none'; return; } + if (!el) return; var id = parseInt(el.getAttribute('data-ws-id')); - if (!id) { menu.style.display = 'none'; return; } - var node = this._findNodeById(this.displayTree, id); - if (!node) { menu.style.display = 'none'; return; } - // Ensure workspace tags are loaded - if (!this.workspaceTags || this.workspaceTags.length === 0) { - this.loadWorkspaceTags(); - } - // Store in Alpine data for menu actions (ctxMenuOpenPage, etc.) - this.ctxMenu = {visible:true, x:ev.clientX, y:ev.clientY, node:node, tags:[...(node.tags||[])]}; - this.ctxTagAdding = false; - this.ctxTagExistingOpen = false; - this.ctxNewTagColor = '#787774'; - this.ctxAvailTags = (this.workspaceTags || []).filter(function(t) { - return !(node.tags||[]).some(function(nt) { return nt.id === t.id; }); + if (!id) return; + var node = this._findNodeById(this.displayTree, id) || this._findNodeById(this.tree, id); + if (!node) return; + var store = window.Alpine && Alpine.store('fdCtx'); + if (!store) return; + var self = this; + if (!this.workspaceTags || this.workspaceTags.length === 0) this.loadWorkspaceTags(); + store.setAvail(this._ctxAvailTags(node)); + var handlers = { + open: function (n) { self.openPage(n.id); }, + openTab: function (n) { window.open('/pages/' + n.id, '_blank'); }, + peek: function (n) { self.openSidePeek(n.id); }, + folder: function (n) { if (n.is_folder) self.navigateToFolder(n.id); }, + rename: function (n) { self.startRename(n); }, + setIcon: function (icon) { self.setItemIcon(node, icon); }, + duplicate: function (n) { self.duplicateItem(n); }, + link: function (n) { self.copyItemLink(n); }, + move: function (n) { self._ctxMove(n); }, + fav: function (n) { self.toggleFavorite(n); }, + delete: function (n) { self.deleteWithUndo(n); }, + tagExisting: function (t) { self.ctxAddExistingTag(t); }, + tagAdd: function (name, color) { self.ctxAddNewTag(name, color); }, + tagRemove: function (tagId) { self.ctxRemoveTag(tagId); } + }; + store.openMenu(ev, node, 'workspace', handlers); + }, + + _ctxAvailTags(node) { + return (this.workspaceTags || []).filter(function(t) { + return !((node && node.tags) || []).some(function(nt) { return nt.id === t.id; }); }); - // DOM manipulation (bypasses Alpine reactivity issues) - menu.style.display = 'block'; - menu.style.left = ev.clientX + 'px'; - menu.style.top = ev.clientY + 'px'; - // Reposition if offscreen - var rect = menu.getBoundingClientRect(); - var x = ev.clientX, y = ev.clientY; - if (x + rect.width > window.innerWidth - 4) x = window.innerWidth - rect.width - 4; - if (y + rect.height > window.innerHeight - 4) y = window.innerHeight - rect.height - 4; - if (x < 4) x = 4; - if (y < 4) y = 4; - menu.style.left = x + 'px'; - menu.style.top = y + 'px'; - this.ctxMenu.x = x; - this.ctxMenu.y = y; - // Sync to _ctxMenuData for Alpine reactivity - var c = window._ctxMenuData; - c.ctxMenu = this.ctxMenu; - c.ctxTagAdding = this.ctxTagAdding; - c.ctxTagExistingOpen = this.ctxTagExistingOpen; - c.ctxAvailTags = this.ctxAvailTags; - c.ctxNewTagColor = this.ctxNewTagColor; - // Also force Alpine update on the menu element - var menuEl = document.querySelector('.more-menu'); - if (menuEl && menuEl._x_dataStack && menuEl._x_dataStack[0]) { - var d = menuEl._x_dataStack[0]; - d.ctxMenu = this.ctxMenu; - d.ctxTagAdding = this.ctxTagAdding; - d.ctxTagExistingOpen = this.ctxTagExistingOpen; - d.ctxAvailTags = [...this.ctxAvailTags]; - d.ctxNewTagColor = this.ctxNewTagColor; + }, + + _ctxRefreshAvail() { + var store = window.Alpine && Alpine.store('fdCtx'); + if (store && store.node) store.setAvail(this._ctxAvailTags(store.node)); + }, + + copyItemLink(node) { + if (!node) return; + navigator.clipboard.writeText(window.location.origin + '/pages/' + node.id); + if (window.showToast) window.showToast('Link copied', 'success'); + }, + + async toggleFavorite(node) { + if (!node) return; + try { + var method = node.favorited ? 'DELETE' : 'POST'; + var r = await fetch('/board/api/favorites/' + node.id, { method: method }); + if (r.ok) { + node.favorited = !node.favorited; + if (window.appState && window.appState.refreshFavorites) window.appState.refreshFavorites(); + if (window.showToast) window.showToast(node.favorited ? 'Added to Favorites' : 'Removed from Favorites', 'success'); + } + } catch(e) {} + }, + + async setItemIcon(node, icon) { + if (!node || !node.id) return; + icon = (icon || '').trim(); + if (!icon) return; + try { + var r = await fetch('/board/api/pages/' + node.id + '/icon', { + method: 'POST', + headers: {'Content-Type': 'application/json'}, + body: JSON.stringify({icon: icon}) + }); + if (!r.ok) throw new Error('icon update failed'); + node.page_icon = icon; + this.displayTree = [...this.tree]; + this._reloadAfterAction(); + if (window.showToast) window.showToast('Icon updated', 'success'); + } catch(e) { + if (window.showToast) window.showToast('Failed to update icon', 'error'); } }, + _ctxMove(node) { + if (!node) return; + this.selectedIds = {}; + this.selectedIds[node.id] = true; + this.openMovePicker(); + }, + // ── Long-press (mobile context menu) ── _touchStartX: 0, _touchStartY: 0, @@ -1107,84 +1135,37 @@ window._wsInitData = (function() { this.ctxAddNewTag(tag.name, tag.color); }, - ctxMenuOpenPage() { - if (this.ctxMenu.node) this.openPage(this.ctxMenu.node.id); - document.querySelector('.more-menu').style.display = 'none'; - }, - - ctxMenuOpenFolder() { - if (this.ctxMenu.node) this.navigateToFolder(this.ctxMenu.node.id); - document.querySelector('.more-menu').style.display = 'none'; - }, - - ctxMenuRename() { - if (this.ctxMenu.node) { this.startRename(this.ctxMenu.node); document.querySelector('.more-menu').style.display = 'none'; } - }, - - ctxMenuDuplicate() { - if (this.ctxMenu.node) { this.duplicateItem(this.ctxMenu.node); document.querySelector('.more-menu').style.display = 'none'; } - }, - - ctxMenuDelete() { - if (this.ctxMenu.node) { this.deleteWithUndo(this.ctxMenu.node); document.querySelector('.more-menu').style.display = 'none'; } - }, - ctxRemoveTag(tagId) { - var node = this.ctxMenu.node; + var store = window.Alpine && Alpine.store('fdCtx'); + var node = store && store.node; if (!node) return; this.removeTag(node.id, tagId); - this.ctxMenu.tags = this.ctxMenu.tags.filter(function(t) { return t.id !== tagId; }); - // Refresh available tags - this.ctxAvailTags = (this.workspaceTags || []).filter(function(t) { - return !(this.ctxMenu.tags||[]).some(function(nt) { return nt.id === t.id; }); - }.bind(this)); - // Sync to _ctxMenuData - window._ctxMenuData.ctxAvailTags = this.ctxAvailTags; - window._ctxMenuData.ctxMenu = this.ctxMenu; - // Also force Alpine update - var menuEl = document.querySelector('.more-menu'); - if (menuEl && menuEl._x_dataStack && menuEl._x_dataStack[0]) { - menuEl._x_dataStack[0].ctxAvailTags = [...this.ctxAvailTags]; - menuEl._x_dataStack[0].ctxMenu = this.ctxMenu; - } + node.tags = (node.tags || []).filter(function(t) { return t.id !== tagId; }); + this._ctxRefreshAvail(); }, async ctxAddNewTag(tagName, color) { tagName = (tagName || '').trim(); if (!tagName) return; - var node = this.ctxMenu.node; + var store = window.Alpine && Alpine.store('fdCtx'); + var node = store && store.node; if (!node) return; - color = color || window._ctxMenuData.ctxNewTagColor; - var r = await fetch('/api/local-workspace/items/' + node.id + '/tags', { - method: 'POST', headers: {'Content-Type':'application/json'}, - body: JSON.stringify({name: tagName.trim(), color: color}) - }); - if (r.ok) { - var d = await r.json(); - this.ctxMenu.tags.push(d.tag); - this._updateNodeTags(this.tree, node.id, d.tag, 'add'); - this.displayTree = [...this.tree]; - this.loadWorkspaceTags(); - // Refresh available tags - var self = this; - setTimeout(function() { self.loadWorkspaceTags().then(function() { - self.ctxAvailTags = (self.workspaceTags || []).filter(function(t) { - return !(self.ctxMenu.tags||[]).some(function(nt) { return nt.id === t.id; }); - }); - // Sync to _ctxMenuData - window._ctxMenuData.ctxAvailTags = self.ctxAvailTags; - window._ctxMenuData.ctxMenu = self.ctxMenu; - // Also force Alpine update - var menuEl = document.querySelector('.more-menu'); - if (menuEl && menuEl._x_dataStack && menuEl._x_dataStack[0]) { - menuEl._x_dataStack[0].ctxAvailTags = [...self.ctxAvailTags]; - menuEl._x_dataStack[0].ctxMenu = self.ctxMenu; - } - // Close menu after successful add - document.querySelector('.more-menu').style.display = 'none'; - }); }, 200); - } - this.ctxTagAdding = false; + color = color || (store && store.newTagColor) || '#787774'; + try { + var r = await fetch('/api/local-workspace/items/' + node.id + '/tags', { + method: 'POST', headers: {'Content-Type':'application/json'}, + body: JSON.stringify({name: tagName, color: color}) + }); + if (r.ok) { + var d = await r.json(); + if (!node.tags) node.tags = []; + if (!node.tags.some(function(t) { return t.id === d.tag.id; })) node.tags.push(d.tag); + this._updateNodeTags(this.tree, node.id, d.tag, 'add'); + this.displayTree = [...this.tree]; + this.loadWorkspaceTags(); + this._ctxRefreshAvail(); + } + } catch(e) {} }, _markTree(nodes, depth) { @@ -1205,7 +1186,7 @@ window._wsInitData = (function() { for (var i=0; i 0; - var icon = this._fileIcon(c.name, c.is_folder, c.content_format); + var icon = this._fileIcon(c.name, c.is_folder, c.content_format, c.page_icon); var escName = this.esc(c.name); var escId = c.id; html += '
  • '+this.esc(customIcon)+''; if (isFolder) return ''+getSvgIcon('folder',14)+''; // FlowDeck internal pages (no extension, blocks/markdown format) if (contentFormat && contentFormat !== 'file') return ''+getSvgIcon('edit',14)+''; @@ -2428,32 +2410,12 @@ for (var _i = 0; _i < _wsKeys.length; _i++) { try { window[_wsKeys[_i]] = window._wsInitData[_wsKeys[_i]]; } catch(e) {} } _wsInitData = window._wsInitData; -// Objet léger pour le ctx-menu (évite le conflit $nextTick avec Alpine) -window._ctxMenuData = { - ctxMenu: {visible:false,x:0,y:0,node:null,tags:[]}, - ctxTagAdding: false, - ctxTagExistingOpen: false, - ctxAvailTags: [], - ctxNewTagColor: '#787774', - ctxTagColors: ['#787774','#E03E3E','#D9730D','#DFAB01','#0F7B6C','#0B6E99','#6940A5','#AD1A72','#E16259','#D4A72C','#448361','#337EA9','#9065B0','#C94D8B'], - // Use Alpine proxy (window._wsData) for reactivity, not raw object (window._wsInitData) - _ws() { return window._wsData || window._wsInitData; }, - ctxMenuOpenPage() { this._ws().ctxMenuOpenPage(); }, - ctxMenuOpenFolder() { this._ws().ctxMenuOpenFolder(); }, - ctxMenuRename() { this._ws().ctxMenuRename(); }, - ctxMenuDuplicate() { this._ws().ctxMenuDuplicate(); }, - ctxMenuDelete() { this._ws().ctxMenuDelete(); }, - ctxAddExistingTag(t) { this._ws().ctxAddExistingTag(t); }, - ctxAddNewTag(n, c) { this._ws().ctxAddNewTag(n, c); }, - ctxRemoveTag(id) { this._ws().ctxRemoveTag(id); }, -}; console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(window._wsInitData).length);
    - +