feat(frontend): improve manual knowledge editor and chat citation rendering
- Replace manual knowledge editor dialog with SettingDrawer and refine toolbar/footer layout - Add draft status resolution for manual knowledge items in the knowledge base - Fix citation placement near fenced code blocks and add regression tests - Update ChatRequestInfoButton icon and chat message/citation styles - Add i18n strings for manual knowledge editor features
This commit is contained in:
@@ -173,6 +173,32 @@ test('joinCitationTagsToPreviousLine keeps citations on a new line after a list'
|
||||
assert.equal(joinCitationTagsToPreviousLine(input), `1. first\n2. second\n\n${tag}`)
|
||||
})
|
||||
|
||||
test('joinCitationTagsToPreviousLine does not merge citations onto fenced code closing delimiter', () => {
|
||||
const tag = '<kb doc="guide.pdf" chunk_id="1" />'
|
||||
const input = '```bash\nunzip setup.zip\n```\n\n' + tag
|
||||
assert.equal(joinCitationTagsToPreviousLine(input), '```bash\nunzip setup.zip\n```\n\n' + tag)
|
||||
})
|
||||
|
||||
test('renderChatMarkdown keeps fenced code blocks closed when citations follow', () => {
|
||||
const renderer = createChatMarkdownRenderer({
|
||||
imageRenderer: ({ href, text }) => `<img src="${href}" alt="${text}">`,
|
||||
isValidImageUrl: () => true,
|
||||
})
|
||||
const tag = '<kb doc="guide.pdf" chunk_id="1" />'
|
||||
const html = renderChatMarkdown(
|
||||
['```bash', 'unzip setup.zip', '```', '', tag, '', '#### Next step'].join('\n'),
|
||||
{
|
||||
renderer,
|
||||
escapeMarkdown: (text) => text,
|
||||
sanitizeHtml: (html) => html,
|
||||
},
|
||||
)
|
||||
|
||||
assert.doesNotMatch(html, /#### Next step/)
|
||||
assert.match(html, /<h4>Next step<\/h4>/)
|
||||
assert.equal((html.match(/<pre>/g) || []).length, 1)
|
||||
})
|
||||
|
||||
test('collapseStandaloneCitationParagraphs merges citations across empty paragraphs', () => {
|
||||
const html = '<p>Steps:</p><p></p><p><span class="citation citation-kb" data-chunk-id="x">doc</span></p>'
|
||||
const out = collapseStandaloneCitationParagraphs(html)
|
||||
|
||||
@@ -201,6 +201,13 @@ export function restoreCitationHtmlPlaceholders(html: string, htmlSnippets: stri
|
||||
return html.replace(HTML_PLACEHOLDER_RE, (_match, idx) => htmlSnippets[Number(idx)] || '')
|
||||
}
|
||||
|
||||
/** Opening/closing fence for GFM fenced code blocks (up to 3 spaces indent). */
|
||||
const FENCED_CODE_DELIMITER_RE = /^ {0,3}(`{3,}|~{3,})(\s*\S.*)?\s*$/
|
||||
|
||||
function isFencedCodeDelimiterLine(line: string): boolean {
|
||||
return FENCED_CODE_DELIMITER_RE.test(line)
|
||||
}
|
||||
|
||||
/** Collapse newlines around <kb/> / <web/> so marked keeps citations inline. */
|
||||
export function joinCitationTagsToPreviousLine(content: string): string {
|
||||
if (!content) return content
|
||||
@@ -218,17 +225,26 @@ export function joinCitationTagsToPreviousLine(content: string): string {
|
||||
}
|
||||
|
||||
// Blank lines before citations: join to previous prose, but keep a break after lists
|
||||
// or fenced-code delimiters (``` / ~~~ must stay on their own line).
|
||||
result = result.replace(/\n[ \t]*\n+([ \t]*<(?:kb|web)\b)/gi, (match, kbStart, offset, full) => {
|
||||
const before = full.slice(0, offset)
|
||||
const lastLine = before.split('\n').filter((line) => line.trim()).pop() || ''
|
||||
const isListItem = /^\s*(\d+\.|[-*+])\s+\S/.test(lastLine)
|
||||
return isListItem ? `\n\n${kbStart}` : ` ${kbStart}`
|
||||
if (isListItem || isFencedCodeDelimiterLine(lastLine)) {
|
||||
return `\n\n${kbStart}`
|
||||
}
|
||||
return ` ${kbStart}`
|
||||
})
|
||||
|
||||
// Single newline before citation when it follows text or another citation (not after a blank line)
|
||||
result = result.replace(
|
||||
/(?<!\n)(<(?:kb|web)\b[^>]*?\s*\/?>|[ \t]*\S[^\n]*?)\n([ \t]*<(?:kb|web)\b)/g,
|
||||
'$1 $2',
|
||||
(match, beforePart: string, kbStart: string) => {
|
||||
if (isFencedCodeDelimiterLine(beforePart)) {
|
||||
return match
|
||||
}
|
||||
return `${beforePart} ${kbStart}`
|
||||
},
|
||||
)
|
||||
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user