Skip to content

Version diffs in the history modal, rendered on the document page #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
namedgraph wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Version diffs in the history modal, rendered on the document page #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e9f6be
Version diffs in the history modal
namedgraph Aug 18, 2026
f86266c
Render version diffs on the document page instead of Turtle text
namedgraph Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ li button.btn-edit-constructors, li button.btn-add-data, li button.btn-add-ontol
.content-body > [about].row-fluid.block { overflow-x: auto; margin-bottom: 20px; }
.content-body > [about].row-fluid.block, .constructor-triple.row-fluid { border-bottom: 2px solid rgb(223, 223, 223); }
.content-body > [about].row-fluid.block.drag-over { border-bottom: 4px dotted #0f82f5; }
.content-body > [about].row-fluid.block.diff-added { border: 2px solid #3fb618; }
.content-body > [about].row-fluid.block.diff-removed { border: 2px solid #ff0039; }
.content-body > [about].row-fluid.block.diff-changed { border: 2px solid #ff7518; }
dd.diff-added, .main > div.diff-added { border-left: 4px solid #3fb618; padding-left: 8px; }
dd.diff-removed, .main > div.diff-removed { border-left: 4px solid #ff0039; padding-left: 8px; }
.row-fluid.block { max-height: 80em; }
.row-fluid.block .drag-handle { display: none; width: 30px; background-color: #149bdf; background-image: radial-gradient(circle at 3px 3px, #0480be 1px, transparent 1.5px); background-size: 6px 6px; border-radius: 2px; cursor: move; }
.list-mode.active { background-image: url('../icons/ic_navigate_before_black_24px.svg'); }
Expand Down
166 changes: 136 additions & 30 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/memento.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<!ENTITY ac "https://w3id.org/atomgraph/client#">
<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<!ENTITY memento "http://mementoweb.org/ns#">
<!ENTITY sp "http://spinrdf.org/sp#">
]>
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
Expand All @@ -16,14 +17,15 @@ xmlns:lapp="&lapp;"
xmlns:ac="&ac;"
xmlns:rdf="&rdf;"
xmlns:memento="&memento;"
xmlns:sp="&sp;"
xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
exclude-result-prefixes="#all"
extension-element-prefixes="ixsl"
version="3.0"
>

<!-- Memento (RFC 7089) version history modal -->
<!-- Memento (RFC 7089) version history modal and version diff loading -->

<!-- open the version history modal instead of navigating to the TimeMap URL -->
<xsl:template match="a[contains-token(@class, 'document-history')]" mode="ixsl:onclick" priority="1">
Expand Down Expand Up @@ -71,35 +73,68 @@ version="3.0"
<div class="modal-body">
<xsl:choose>
<xsl:when test="$response?status = 200 and $response?media-type = 'application/rdf+xml'">
<table class="table table-striped">
<colgroup>
<col style="width: 60%;"/>
<col style="width: 40%;"/>
</colgroup>
<thead>
<tr>
<th>
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'version', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</th>
<th>
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'agent', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</th>
</tr>
</thead>
<tbody>
<xsl:variable name="mementos" select="$response?body//*[@rdf:about][rdf:type/@rdf:resource = '&memento;Memento']" as="element()*"/>
<!-- on the live document view, the latest version is the one being viewed -->
<xsl:variable name="latest-memento" select="sort($mementos, (), function($memento) { string($memento/memento:mementoDatetime) })[last()]/@rdf:about" as="attribute()?"/>
<xsl:apply-templates select="$mementos" mode="bs2:MementoList">
<xsl:sort select="memento:mementoDatetime" order="descending"/>
<xsl:with-param name="current-memento" select="if (map:contains(ldh:query-params(), 'version')) then xs:anyURI(ac:absolute-path(ldh:request-uri()) || '?version=' || ldh:query-params()?version) else xs:anyURI($latest-memento)"/>
</xsl:apply-templates>
</tbody>
</table>
<xsl:variable name="mementos" select="$response?body//*[@rdf:about][rdf:type/@rdf:resource = '&memento;Memento']" as="element()*"/>
<xsl:variable name="sorted-mementos" select="sort($mementos, (), function($memento) { string($memento/memento:mementoDatetime) })" as="element()*"/>
<!-- on the live document view, the latest version is the one being viewed -->
<xsl:variable name="current-memento" select="if (map:contains(ldh:query-params(), 'version')) then xs:anyURI(ac:absolute-path(ldh:request-uri()) || '?version=' || ldh:query-params()?version) else xs:anyURI($sorted-mementos[last()]/@rdf:about)" as="xs:anyURI?"/>
<xsl:variable name="current-index" select="index-of($sorted-mementos ! string(@rdf:about), string($current-memento))[1]" as="xs:integer?"/>
<!-- preselect the viewed version as the diff target and its predecessor as the diff source (the viewed version itself when there is none) -->
<xsl:variable name="from-memento" select="(xs:anyURI($sorted-mementos[$current-index - 1]/@rdf:about), $current-memento)[1]" as="xs:anyURI?"/>
<form id="form-version-diff">
<table class="table table-striped">
<colgroup>
<col style="width: 45%;"/>
<col style="width: 25%;"/>
<col style="width: 15%;"/>
<col style="width: 15%;"/>
</colgroup>
<thead>
<tr>
<th>
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'version', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</th>
<th>
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'agent', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</th>
<!-- header colors match the diff colors: removed content comes from the From version, added content from the To version -->
<th class="text-error">
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'from', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</th>
<th class="text-success">
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'to', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</th>
</tr>
</thead>
<tbody>
<xsl:apply-templates select="$mementos" mode="bs2:MementoList">
<xsl:sort select="memento:mementoDatetime" order="descending"/>
<xsl:with-param name="current-memento" select="$current-memento"/>
<xsl:with-param name="from-memento" select="$from-memento"/>
<xsl:with-param name="to-memento" select="$current-memento"/>
</xsl:apply-templates>
</tbody>
</table>
<div class="form-actions modal-footer">
<button type="submit" class="btn btn-primary">
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'compare', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</button>
<button type="button" class="btn btn-close">
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'close', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</button>
</div>
</form>
</xsl:when>
<xsl:otherwise>
<div class="alert alert-error">
Expand All @@ -114,4 +149,75 @@ version="3.0"
</xsl:for-each>
</xsl:function>

<!-- navigates to the version diff view instead of submitting the form -->
<xsl:template match="form[@id = 'form-version-diff']" mode="ixsl:onsubmit">
<xsl:sequence select="ixsl:call(ixsl:event(), 'preventDefault', [])"/>
<xsl:variable name="from-uri" select=".//input[@name = 'from'][ixsl:get(., 'checked')] ! xs:anyURI(ixsl:get(., 'value'))" as="xs:anyURI?"/>
<xsl:variable name="to-uri" select=".//input[@name = 'to'][ixsl:get(., 'checked')] ! xs:anyURI(ixsl:get(., 'value'))" as="xs:anyURI?"/>

<xsl:if test="exists($from-uri) and exists($to-uri)">
<!-- the memento URI is <doc>?version=<sha>; the diff view URL appends the compared version's SHA as display state -->
<xsl:variable name="href" select="xs:anyURI($to-uri || '&amp;diff=' || substring-after($from-uri, '?version='))" as="xs:anyURI"/>
<xsl:variable name="parsed" select="ldh:parse-href($href)" as="map(xs:string, item()?)"/>

<xsl:for-each select="ancestor::div[contains-token(@class, 'modal')]">
<xsl:sequence select="ixsl:call(., 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
</xsl:for-each>

<xsl:call-template name="ldh:DocumentNavigate">
<xsl:with-param name="doc-uri" select="map:get($parsed, 'doc-uri')"/>
<xsl:with-param name="fragment" select="map:get($parsed, 'fragment')"/>
<xsl:with-param name="query-params" select="map:get($parsed, 'query-params')"/>
</xsl:call-template>
</xsl:if>
</xsl:template>

<!-- fetches the ?diff= comparison version when the context carries a diff request; passes the context through otherwise -->
<xsl:function name="ldh:load-diff-version" as="item()*" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>

<xsl:choose>
<xsl:when test="map:contains($context, 'diff-request')">
<xsl:sequence select="
ixsl:http-request($context('diff-request'))
=> ixsl:then(ldh:rethread-response($context, ?, 'diff-response'))
=> ixsl:then(ldh:handle-response(?, 'diff-response'))
"/>
</xsl:when>
<xsl:otherwise>
<xsl:sequence select="$context"/>
</xsl:otherwise>
</xsl:choose>
</xsl:function>

<!-- union of the two versions' descriptions for the diff view, merged via ldh:MergeRDF; a changed typed block keeps only its current rdf:value because its render factory cannot handle two -->
<xsl:function name="ldh:diff-union" as="document-node()">
<xsl:param name="to-doc" as="document-node()"/>
<xsl:param name="from-doc" as="document-node()"/>
<xsl:param name="removed-keys" as="xs:string*"/>

<xsl:variable name="merged" select="ldh:merge-metadata($to-doc, $from-doc)" as="document-node()"/>
<xsl:document>
<xsl:apply-templates select="$merged" mode="ldh:DiffPruneValues">
<xsl:with-param name="removed-keys" select="$removed-keys" tunnel="yes"/>
</xsl:apply-templates>
</xsl:document>
</xsl:function>

<!-- identity transform for ldh:DiffPruneValues mode -->
<xsl:template match="@* | node()" mode="ldh:DiffPruneValues">
<xsl:copy>
<xsl:apply-templates select="@* | node()" mode="#current"/>
</xsl:copy>
</xsl:template>

<!-- drop a typed block's removed rdf:value, but only when the block survives in the To version (has triples outside the removed set) -->
<xsl:template match="*[rdf:type/@rdf:resource = ('&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart', '&sp;Describe', '&sp;Construct', '&sp;Ask', '&sp;Select')]/rdf:value" mode="ldh:DiffPruneValues">
<xsl:param name="removed-keys" as="xs:string*" tunnel="yes"/>

<xsl:if test="not(ldh:triple-key(., false()) = $removed-keys and ../*[not(ldh:triple-key(., false()) = $removed-keys)])">
<xsl:next-match/>
</xsl:if>
</xsl:template>

</xsl:stylesheet>
21 changes: 21 additions & 0 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,27 @@ extension-element-prefixes="ixsl"
</div>
</xsl:if>

<!-- legend shown when a version diff is displayed (?diff= query parameter): removed content comes from the compared version, added content from the viewed one -->
<xsl:if test="map:contains(ldh:query-params(), 'diff')">
<div class="alert alert-info">
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'comparing-versions', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
<xsl:text>: </xsl:text>
<span class="text-error">
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'removed', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</span>
<xsl:text> / </xsl:text>
<span class="text-success">
<xsl:value-of>
<xsl:apply-templates select="key('resources', 'added', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $lapp:origin)))" mode="ac:label"/>
</xsl:value-of>
</span>
</div>
</xsl:if>

<!-- host for the RDFa editor toolbar (appended by rdfae:init-editing); empty until an editable region initializes -->
<div class="navbar-inner editor-bar">
<div class="container-fluid"></div>
Expand Down
Loading
Loading