From 8efb02b81fe44bf98065e1de92b9f75e6260b82b Mon Sep 17 00:00:00 2001 From: NishikawaKoharu Date: Tue, 10 Nov 2026 09:15:41 +0900 Subject: [PATCH] =?UTF-8?q?Wiki=E6=AF=94=E8=BC=83=E3=83=91=E3=83=8D?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E5=88=9D=E6=9C=9F=E8=A1=A8=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/wiki/static/wikiPage.js | 2 +- addons/wiki/static/wikiPageMilkdown.js | 59 ++++++++++++++++------- addons/wiki/tests/test_wiki.py | 20 ++++++++ addons/wiki/views.py | 12 ++++- website/static/js/pages/wiki-edit-page.js | 3 +- 5 files changed, 75 insertions(+), 21 deletions(-) diff --git a/addons/wiki/static/wikiPage.js b/addons/wiki/static/wikiPage.js index 13538372714..9194b8442bb 100644 --- a/addons/wiki/static/wikiPage.js +++ b/addons/wiki/static/wikiPage.js @@ -161,7 +161,7 @@ var defaultOptions = { menuVisible: true, canEdit: true, viewVersion: 'current', - compareVersion: 'previous', + compareVersion: 'current', urls: { content: '', draft: '', diff --git a/addons/wiki/static/wikiPageMilkdown.js b/addons/wiki/static/wikiPageMilkdown.js index 2be8cd1852b..f716d948846 100644 --- a/addons/wiki/static/wikiPageMilkdown.js +++ b/addons/wiki/static/wikiPageMilkdown.js @@ -44,6 +44,18 @@ const wikiId = (wikiCtx.wiki.wikiName === 'home') ? wikiCtx.node.id : window.con const wsPrefix = (window.location.protocol === 'https:') ? 'wss://' : 'ws://'; const wsUrl = wsPrefix + window.contextVars.wiki.urls.y_websocket; +function getEditorMarkdown() { + var content = ''; + if (mEdit && typeof mEdit.action === 'function') { + mEdit.action((ctx) => { + const view = ctx.get(mCore.editorViewCtx); + const serializer = ctx.get(mCore.serializerCtx); + content = serializer(view.state.doc); + }); + } + return content; +} + import { underlineSchema, underlineInputRule, remarkUnderlineToMarkdown, remarkUnderlineFromMarkdown, toggleUnderlineCommand } from './underline.js'; import { colortextSchema, colortextInputRule, remarkColortextToMarkdown, remarkColortextFromMarkdown, toggleColortextCommand } from './colortext.js'; import { extendedImageSchemaPlugin, extendedInsertImageCommand, extendedUpdateImageCommand, updatedInsertImageInputRule } from './image.js'; @@ -131,13 +143,7 @@ async function createMEditor(editor, vm, template) { uploader, enableHtmlFileUploader, })); - const debouncedMarkdownUpdated = $osf.debounce(async (ctx, markdown, prevMarkdown) => { - const compareWidgetElement = document.getElementById("compareWidget"); - - if (compareWidgetElement && compareWidgetElement.style.display !== 'none') { - vm.viewVM.displaySource(markdown); - } - + const debouncedUndoButtonUpdate = $osf.debounce(async (ctx) => { const view = ctx.get(mCore.editorViewCtx); const state = view.state; const undoElement = document.getElementById("undoWiki"); @@ -148,7 +154,10 @@ async function createMEditor(editor, vm, template) { } }, 300); ctx.get(mListener.listenerCtx).markdownUpdated((ctx, markdown, prevMarkdown) => { - debouncedMarkdownUpdated(ctx, markdown, prevMarkdown); + // Keep the live editor body in displaySource even while Compare is + // closed, so opening Compare after edits diffs against the edits. + vm.viewVM.displaySource(markdown); + debouncedUndoButtonUpdate(ctx); }); ctx.update(mCore.editorViewOptionsCtx, (prev) => ({ ...prev, @@ -334,7 +343,7 @@ var defaultOptions = { menuVisible: true, canEdit: true, viewVersion: 'current', - compareVersion: 'previous', + compareVersion: 'current', urls: { content: '', draft: '', @@ -343,6 +352,27 @@ var defaultOptions = { metadata: {} }; +// Normalize compare target to a dropdown option value. +// Default / empty -> current (edit vs latest saved). Explicit previous -> prior version number. +function resolveCompareVersion(compareVersion) { + if (!compareVersion) { + return 'current'; + } + if (compareVersion !== 'previous') { + return String(compareVersion); + } + var select = document.getElementById('compareVersionSelect'); + if (select) { + for (var i = 0; i < select.options.length; i++) { + var val = select.options[i].value; + if (val && val !== 'current') { + return val; + } + } + } + return 'current'; +} + function ViewModel(options){ var self = this; // enabled? @@ -372,7 +402,7 @@ function ViewModel(options){ self.status = ko.observable('connecting'); self.throttledStatus = ko.observable(self.status()); - self.compareVersion = ko.observable(options.compareVersion); + self.compareVersion = ko.observable(resolveCompareVersion(options.compareVersion)); self.viewVersion = ko.observable(options.viewVersion); self.draftURL = options.urls.draft; self.contentURL = options.urls.content; @@ -545,13 +575,8 @@ function ViewModel(options){ if (panel === 'compare') { if(display && self.compareVis()){ self.viewVersion('preview'); - var toMarkdown = ''; - mEdit.action((ctx) => { - const view = ctx.get(mCore.editorViewCtx); - const serializer = ctx.get(mCore.serializerCtx); - toMarkdown = serializer(view.state.doc); - }); - self.viewVM.displaySource(toMarkdown); + // Always use the live editor body as the "after" side of the diff. + self.viewVM.displaySource(getEditorMarkdown()); } } diff --git a/addons/wiki/tests/test_wiki.py b/addons/wiki/tests/test_wiki.py index 6daffd6dead..50d6b5a40c1 100644 --- a/addons/wiki/tests/test_wiki.py +++ b/addons/wiki/tests/test_wiki.py @@ -295,6 +295,26 @@ def test_project_wiki_compare_scope(self): res = self.app.get(url, auth=self.user.auth, expect_errors=True) assert_equal(res.status_code, 400) + def test_project_wiki_compare_defaults_to_current(self): + # Bare ?compare and omitted compare both default to editing vs latest saved. + for url in ( + self.project.web_url_for('project_wiki_view', wname='home') + '?compare', + self.project.web_url_for('project_wiki_view', wname='home'), + ): + res = self.app.get(url, auth=self.user.auth) + assert_equal(res.status_code, 200) + assert_in('"compare": "current"', res.text) + assert_not_in('"compare": "previous"', res.text) + + def test_project_wiki_compare_previous_maps_to_version_number(self): + # home has versions 1 and 2; compare=1 collapses to 'previous' in + # format_wiki_version, then views remaps it to the dropdown option value. + url = self.project.web_url_for('project_wiki_view', wname='home', compare=1) + res = self.app.get(url, auth=self.user.auth) + assert_equal(res.status_code, 200) + assert_in('"compare": 1', res.text) + assert_not_in('"compare": "previous"', res.text) + def test_wiki_page_creation_strips_whitespace(self): # Regression test for: # https://github.com/CenterForOpenScience/openscienceframework.org/issues/1080 diff --git a/addons/wiki/views.py b/addons/wiki/views.py index a1051ba9110..3c4e459d7f8 100644 --- a/addons/wiki/views.py +++ b/addons/wiki/views.py @@ -340,11 +340,19 @@ def project_wiki_view(auth, wname, path=None, **kwargs): raise HTTPError(http_status.HTTP_403_FORBIDDEN) sharejs_uuid = None - # Default versions for view and compare + # Default versions for view and compare. + # Default compare to current so editing vs latest saved matches the dropdown. version_settings = { 'view': view or 'current', - 'compare': compare or 'previous', + 'compare': compare or 'current', } + # format_wiki_version may collapse the prior version number to 'previous'. + # Map that back to the dropdown option value. + if version_settings['compare'] == 'previous': + if len(versions) > 1: + version_settings['compare'] = versions[1]['version'] + else: + version_settings['compare'] = 'current' import_dirs = _get_import_folder(node) alive_task_id = WikiImportTask.objects.values_list('task_id').filter(status=WikiImportTask.STATUS_RUNNING, node=node) sortable_pages_ctn = node.wikis.filter(deleted__isnull=True).exclude(page_name='home').count() diff --git a/website/static/js/pages/wiki-edit-page.js b/website/static/js/pages/wiki-edit-page.js index 863db41afeb..fd473fc0b99 100644 --- a/website/static/js/pages/wiki-edit-page.js +++ b/website/static/js/pages/wiki-edit-page.js @@ -28,7 +28,8 @@ var comparable = (ctx.panelsUsed.indexOf('compare') !== -1); var menuVisible = (ctx.panelsUsed.indexOf('menu') !== -1); var viewVersion = ctx.versionSettings.view || (editable ? 'preview' : 'current'); -var compareVersion = ctx.versionSettings.compare || 'previous'; +// Default Current = editing body vs latest saved. Explicit previous is remapped server-side. +var compareVersion = ctx.versionSettings.compare || 'current'; var wikiPageOptions = { editVisible: editable,