From ba75463661fed7e9e09127ccc1cecc0c4737409c Mon Sep 17 00:00:00 2001 From: Chaim Date: Sat, 25 Apr 2026 14:15:36 +0000 Subject: [PATCH] feat(kb): topic picker + topic-scoped client (Phase 1, no manifest bump) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wires the EspoCRM extension to the multi-topic backend introduced in shira-hermes commit f03721e. The KB page header now shows a topic in the page header, with a kb-topic-name-suffix span that JS fills with the active name. - src/views/kb/index.js: module-level _topics cache + LS_TOPIC. setup reads localStorage; afterRender gates the picker fill + sources fetch on topics being loaded so a stale id from a deleted topic doesn't fire a 400-ing /sources call. switchTopic clears _activeAsk/Search + _lastAsk/Search + sessionStorage entries + this._sources, then reRenders. Cross-topic guard in afterRender drops cached state whose topicId !== this.topicId. _activeAsk / _lastAsk / _activeSearch / _lastSearch all carry topicId. EventSource URL gains &topicId. Refs Task Master #12. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../knowledge-base/res/templates/kb/index.tpl | 11 +- .../knowledge-base/src/views/kb/index.js | 195 ++++++++++++++++-- .../Controllers/KnowledgeBase.php | 31 ++- .../EntryPoints/KnowledgeBaseAskStream.php | 14 +- .../KnowledgeBase/Resources/routes.json | 8 + .../Services/KnowledgeBaseService.php | 39 +++- 6 files changed, 264 insertions(+), 34 deletions(-) diff --git a/files/client/custom/modules/knowledge-base/res/templates/kb/index.tpl b/files/client/custom/modules/knowledge-base/res/templates/kb/index.tpl index 8a9cc08..535c8e9 100644 --- a/files/client/custom/modules/knowledge-base/res/templates/kb/index.tpl +++ b/files/client/custom/modules/knowledge-base/res/templates/kb/index.tpl @@ -1,6 +1,13 @@
-
-

בסיס ידע — ביטוח לאומי

+
+

בסיס ידע

+
+ + +
    diff --git a/files/client/custom/modules/knowledge-base/src/views/kb/index.js b/files/client/custom/modules/knowledge-base/src/views/kb/index.js index 57a21b0..5d27511 100644 --- a/files/client/custom/modules/knowledge-base/src/views/kb/index.js +++ b/files/client/custom/modules/knowledge-base/src/views/kb/index.js @@ -6,14 +6,17 @@ define('modules/knowledge-base/views/kb/index', ['view'], function (Dep) { // it. sessionStorage backs the last completed answer so a hard reload // also recovers it. None of this leaks to the next browser session — // ask history is intentionally ephemeral. - let _activeAsk = null; // {question, promise, startedAt} while in flight - let _lastAsk = null; // {question, text, sources, completedAt} after success - let _activeSearch = null; // {query, kind, promise} while in flight - let _lastSearch = null; // {query, kind, hits, selectedIdx, completedAt} + let _activeAsk = null; // {question, topicId, promise, startedAt} while in flight + let _lastAsk = null; // {question, topicId, text, sources, completedAt} after success + let _activeSearch = null; // {query, kind, topicId, promise} while in flight + let _lastSearch = null; // {query, kind, topicId, hits, selectedIdx, completedAt} + let _topics = null; // [{id, slug, name, description, is_active}] + let _topicsPromise = null; // dedupe concurrent fetches across mounts const SS_ASK = 'kb-last-ask'; const SS_SEARCH = 'kb-last-search'; const LS_SPLIT = 'kb-split-pct'; // long-lived UI preference (not session) + const LS_TOPIC = 'kb-topic'; // selected topic id, persists across sessions // Cached results auto-expire after this long. The user explicitly asked // for a clear button, but auto-clearing also handles the case where they // come back hours later and the prior result is no longer relevant. @@ -46,6 +49,21 @@ define('modules/knowledge-base/views/kb/index', ['view'], function (Dep) { _lastSearch = _loadJson(sessionStorage, SS_SEARCH, x => x && typeof x.query === 'string' && Array.isArray(x.hits)); } + function _readPersistedTopicId() { + try { + const raw = localStorage.getItem(LS_TOPIC); + if (!raw) return null; + const v = parseInt(raw, 10); + return Number.isFinite(v) ? v : null; + } catch (e) { return null; } + } + function _writePersistedTopicId(id) { + try { + if (id == null) localStorage.removeItem(LS_TOPIC); + else localStorage.setItem(LS_TOPIC, String(id)); + } catch (e) { /* ignore */ } + } + return Dep.extend({ template: 'knowledge-base:kb/index', @@ -53,11 +71,13 @@ define('modules/knowledge-base/views/kb/index', ['view'], function (Dep) { // Active mode: 'search' (default) | 'ask' | 'browse' mode: 'search', kind: 'any', + topicId: null, data: function () { return { mode: this.mode, kind: this.kind, + topicId: this.topicId, }; }, @@ -91,6 +111,12 @@ define('modules/knowledge-base/views/kb/index', ['view'], function (Dep) { e.preventDefault(); this.clearResults(); }, + 'change select[data-name="topic"]': function (e) { + const raw = $(e.currentTarget).val(); + const id = parseInt(raw, 10); + if (!Number.isFinite(id) || id === this.topicId) return; + this.switchTopic(id); + }, }, // Cancel any in-flight ask/search, drop the cached last-result for @@ -133,28 +159,150 @@ define('modules/knowledge-base/views/kb/index', ['view'], function (Dep) { if (label && label !== 'KnowledgeBase') { document.title = label; } + + // Best-effort initial topic id from localStorage. Reconciled with + // the actual topics list once it loads (a stale id from a deleted + // topic falls back to the first active topic). + this.topicId = _readPersistedTopicId(); + + // Kick off the topics fetch before first render so the options with the loaded topics, reconcile + // this.topicId against the active list, and fire afterRender's + // mode-specific render path now that scope is known. + _populateTopicPicker: function () { + const $sel = this.$el.find('.kb-topic-select'); + if (!$sel.length || !_topics) return; + const topics = _topics.filter(t => t.is_active !== false); + if (!topics.length) { + $sel.html(''); + return; + } + // Reconcile: drop persisted id if it's not in the list any more. + const ids = topics.map(t => t.id); + if (!ids.includes(this.topicId)) { + this.topicId = topics[0].id; + _writePersistedTopicId(this.topicId); + } + const opts = topics.map(t => { + const sel = t.id === this.topicId ? ' selected' : ''; + return ''; + }).join(''); + $sel.html(opts); + // Header suffix shows the active domain so the page title stays + // self-explanatory across topics. + const active = topics.find(t => t.id === this.topicId); + const $suffix = this.$el.find('.kb-topic-name-suffix'); + if ($suffix.length) { + $suffix.text(active ? ' — ' + active.name : ''); + } + }, + + // Called from the topic