From 346625bafc55853a6d7f36d6861d776ffca4307e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Thu, 4 Jun 2026 22:23:34 +0200 Subject: [PATCH 01/32] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 22c835849..abcad6aaa 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.atomgraph linkeddatahub - 5.4.0 + 5.4.1-SNAPSHOT ${packaging.type} AtomGraph LinkedDataHub @@ -46,7 +46,7 @@ https://github.com/AtomGraph/LinkedDataHub scm:git:git://github.com/AtomGraph/LinkedDataHub.git scm:git:git@github.com:AtomGraph/LinkedDataHub.git - linkeddatahub-5.4.0 + linkeddatahub-2.1.1 From d7e95217819971b593eb586e46621f606d32eebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 5 Jun 2026 11:38:10 +0200 Subject: [PATCH 02/32] Jena 6.1.0 (#309) * Core SNAPSHOT bump Jena version bump to 6.0.0 * POM update * Tomcat base image bump * JUnit bumped to v5 * Add mockito-junit-jupiter dependency Required by ProxyRequestFilterTest after the JUnit 4 -> 5 migration: @ExtendWith(MockitoExtension.class) lives in mockito-junit-jupiter, not mockito-core. * Bump docker-compose image versions - nginx 1.23.3 -> 1.31.1 - atomgraph/fuseki 4.7.0 -> 6.1.0 (matches Jena 6 upgrade) - varnish 7.3.0 -> 7.7.3 * CI: dump container logs on failure * DEBUG: trace entrypoint with set -x (revert before merge) * CI: dump Tomcat logs from linkeddatahub container on failure * Servlet API bump * Jena bump to 6.1.0 * CI: install Java 21 for Jena 6.1.0 CLI tools Jena 6.1.0 binaries are compiled for Java 21; the runner default is Java 17 which produced UnsupportedClassVersionError (class file 65.0 vs 61.0) on every turtle/riot/sparql invocation in the HTTP tests. * Dependency bumps --- .github/workflows/http-tests.yml | 13 ++- Dockerfile | 6 +- docker-compose.yml | 12 +-- platform/entrypoint.sh | 2 + pom.xml | 79 ++++++++++++------- .../client/SesameProtocolClient.java | 2 +- .../linkeddatahub/resource/Namespace.java | 13 +-- .../server/filter/request/OntologyFilter.java | 2 +- .../server/util/OntologyModelGetter.java | 2 +- .../atomgraph/core/io/BillionLaughsTest.java | 37 +++++---- .../filter/ClientUriRewriteFilterTest.java | 4 +- .../request/ProxyRequestFilterTest.java | 12 +-- .../server/util/URLValidatorTest.java | 23 +++--- 13 files changed, 120 insertions(+), 87 deletions(-) diff --git a/.github/workflows/http-tests.yml b/.github/workflows/http-tests.yml index 22e9740bd..adac05737 100644 --- a/.github/workflows/http-tests.yml +++ b/.github/workflows/http-tests.yml @@ -8,11 +8,16 @@ jobs: runs-on: ubuntu-latest env: ASF_ARCHIVE: https://archive.apache.org/dist/ - JENA_VERSION: 4.7.0 + JENA_VERSION: 6.1.0 BASE_URI: https://localhost:4443/ steps: - name: Install Linux packages run: sudo apt-get update && sudo apt-get install -qq raptor2-utils && sudo apt-get install curl + - name: Set up Java 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' - name: Download Jena run: curl -sS --fail "${{ env.ASF_ARCHIVE }}jena/binaries/apache-jena-${{ env.JENA_VERSION }}.tar.gz" -o "${{ runner.temp }}/jena.tar.gz" - name: Unpack Jena @@ -49,6 +54,12 @@ jobs: run: ./run.sh "$PWD/ssl/owner/cert.pem" "${{ secrets.HTTP_TEST_OWNER_CERT_PASSWORD }}" "$PWD/ssl/secretary/cert.pem" "${{ secrets.HTTP_TEST_SECRETARY_CERT_PASSWORD }}" shell: bash working-directory: http-tests + - name: Dump container logs on failure + if: failure() + run: docker compose --env-file ./http-tests/.env logs --no-color + - name: Dump Tomcat logs from linkeddatahub container on failure + if: failure() + run: docker compose --env-file ./http-tests/.env exec -T linkeddatahub sh -c 'for f in /usr/local/tomcat/logs/*; do echo "=== $f ==="; cat "$f"; done' || true - name: Stop Docker containers and remove volumes run: docker compose --env-file ./http-tests/.env down -v - name: Remove Docker containers diff --git a/Dockerfile b/Dockerfile index 3d8066e6e..a5fdd51e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM maven:3.8.4-openjdk-17 AS maven +FROM maven:3.9-eclipse-temurin-21 AS maven # download and extract Jena -ARG JENA_VERSION=4.7.0 +ARG JENA_VERSION=6.1.0 ARG JENA_TAR_URL="https://archive.apache.org/dist/jena/binaries/apache-jena-${JENA_VERSION}.tar.gz" @@ -22,7 +22,7 @@ RUN mvn -Pstandalone clean install # ============================== -FROM atomgraph/letsencrypt-tomcat:10.1.46 +FROM atomgraph/letsencrypt-tomcat:10.1.52 LABEL maintainer="martynas@atomgraph.com" diff --git a/docker-compose.yml b/docker-compose.yml index c95560dbd..02b5f5203 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ volumes: varnish_end_user_cache: services: nginx: - image: nginx:1.23.3 + image: nginx:1.31.1 mem_limit: 128m configs: - source: nginx_conf @@ -105,7 +105,7 @@ services: - ./config/dataspaces.trig:/var/linkeddatahub/datasets/dataspaces.trig - ./config/system.trig:/var/linkeddatahub/datasets/system.trig fuseki-admin: - image: atomgraph/fuseki:4.7.0 + image: atomgraph/fuseki:6.1.0 user: root # otherwise fuseki user does not have permissions to the mounted folder which is owner by root expose: - 3030 @@ -114,7 +114,7 @@ services: - ./fuseki/admin:/fuseki/databases command: [ "--config", "/fuseki/config.ttl" ] fuseki-end-user: - image: atomgraph/fuseki:4.7.0 + image: atomgraph/fuseki:6.1.0 user: root # otherwise the fuseki user does not have permissions to the mounted folder which is owner by root expose: - 3030 @@ -123,7 +123,7 @@ services: - ./fuseki/end-user:/fuseki/databases command: [ "--config", "/fuseki/config.ttl" ] varnish-frontend: - image: varnish:7.3.0 + image: varnish:7.7.3 user: root # otherwise varnish user does not have permissions to the mounted folder which is owner by root configs: - source: varnish-frontend_vcl @@ -136,7 +136,7 @@ services: entrypoint: varnishd command: [ "-F", "-f", "/etc/varnish/default.vcl", "-a", "http=:6060,HTTP", "-a", "proxy=:8443,PROXY", "-p", "feature=+http2", "-s", "file,/var/lib/varnish/storage.bin,3G", "-t", "86400" ] # -F: foreground, -f: config, -a: listeners, -p: http2, -s: storage, -t: TTL varnish-admin: - image: varnish:7.3.0 + image: varnish:7.7.3 user: root # otherwise the varnish user does not have permissions to the mounted folder which is owner by root configs: - source: varnish-admin_vcl @@ -147,7 +147,7 @@ services: entrypoint: varnishd command: [ "-F", "-f", "/etc/varnish/default.vcl", "-a", "http=:80,HTTP", "-a", "proxy=:8443,PROXY", "-p", "feature=+http2", "-s", "malloc,1G", "-t", "86400", "-p", "timeout_idle=60s" ] # -F: foreground, -f: config, -a: listeners, -p: http2 + idle timeout, -s: storage, -t: TTL varnish-end-user: - image: varnish:7.3.0 + image: varnish:7.7.3 user: root # otherwise varnish user does not have permissions to the mounted folder which is owner by root configs: - source: varnish-end-user_vcl diff --git a/platform/entrypoint.sh b/platform/entrypoint.sh index a737c3a6b..a67ef5383 100755 --- a/platform/entrypoint.sh +++ b/platform/entrypoint.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash set -e +set -x # DEBUG: trace every command (revert before merge) +exec 2>&1 # DEBUG: merge stderr into stdout so the trace lands in docker logs # set timezone diff --git a/pom.xml b/pom.xml index abcad6aaa..3294574f1 100644 --- a/pom.xml +++ b/pom.xml @@ -86,28 +86,28 @@ jakarta.servlet jakarta.servlet-api - 5.0.0 + 6.0.0 provided org.glassfish.jersey.connectors jersey-apache-connector - 3.1.0 + 3.1.11 org.glassfish.jersey.media jersey-media-multipart - 3.1.0 + 3.1.11 org.glassfish.jersey.media jersey-media-json-processing - 3.1.0 + 3.1.11 com.sun.mail jakarta.mail - 2.0.1 + 2.0.2 com.google.guava @@ -117,7 +117,7 @@ com.atomgraph.etl.csv csv2rdf - 2.1.11 + 2.2.0 @@ -129,57 +129,67 @@ org.apache.jena jena-shacl - 4.7.0 + 6.1.0 + + + org.apache.jena + jena-arq + 6.1.0 + + + com.github.jsonld-java + jsonld-java + 0.13.4 ${project.groupId} twirl - 1.0.33 + 1.1.0 ${project.groupId} client - 4.2.11 + 4.3.0 classes ${project.groupId} client - 4.2.11 + 4.3.0 war org.apache.httpcomponents httpclient-cache - 4.5.13 + 4.5.14 com.auth0 java-jwt - 3.19.3 + 3.19.4 net.jodah expiringmap - 0.5.10 + 0.5.11 org.jsoup jsoup - 1.15.3 + 1.22.1 org.apache.tomcat tomcat-coyote - 10.1.2 + 10.1.52 jar - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter + 5.11.4 test @@ -188,6 +198,12 @@ 5.12.0 test + + org.mockito + mockito-junit-jupiter + 5.12.0 + test + @@ -216,10 +232,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.2 + org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.3.1 release @@ -227,10 +248,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.14.1 - 17 - 17 + 21 + 21 -XDignore.symbol.file @@ -243,7 +264,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.9.0 + 0.10.0 true central-portal-snapshots @@ -254,7 +275,7 @@ org.codehaus.mojo exec-maven-plugin - 3.0.0 + 3.6.3 find-xsl-files @@ -287,7 +308,7 @@ org.honton.chas readfiles-maven-plugin - 0.0.1 + 0.1.0 read-comma-separated-xsl-file-list @@ -338,7 +359,7 @@ com.github.eirslett frontend-maven-plugin - 1.15.1 + 1.15.4 v22.16.0 11.4.2 @@ -366,7 +387,7 @@ org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.5.1 ${build.warName} ${project.build.directory}/${build.warName} @@ -432,7 +453,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.4.0 attach-sources @@ -445,7 +466,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.12.0 attach-javadocs diff --git a/src/main/java/com/atomgraph/linkeddatahub/client/SesameProtocolClient.java b/src/main/java/com/atomgraph/linkeddatahub/client/SesameProtocolClient.java index 0cb29e2c2..1adae7818 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/client/SesameProtocolClient.java +++ b/src/main/java/com/atomgraph/linkeddatahub/client/SesameProtocolClient.java @@ -123,7 +123,7 @@ public static MultivaluedMap solutionMapToMultivaluedMap(QuerySo { String varName = it.next(); RDFNode node = qsm.get(varName); - params.add("$" + varName, NodeFmtLib.str(node.asNode())); + params.add("$" + varName, NodeFmtLib.strNT(node.asNode())); } return params; diff --git a/src/main/java/com/atomgraph/linkeddatahub/resource/Namespace.java b/src/main/java/com/atomgraph/linkeddatahub/resource/Namespace.java index 095219cf3..4ccefa319 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/resource/Namespace.java +++ b/src/main/java/com/atomgraph/linkeddatahub/resource/Namespace.java @@ -46,15 +46,13 @@ import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.SecurityContext; import jakarta.ws.rs.core.UriInfo; -import org.apache.jena.iri.IRI; -import org.apache.jena.iri.IRIFactory; +import org.apache.jena.irix.IRIx; import org.apache.jena.ontology.Ontology; import org.apache.jena.query.DatasetFactory; import org.apache.jena.query.Query; import org.apache.jena.query.QueryFactory; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; -import org.apache.jena.riot.system.Checker; import org.apache.jena.update.UpdateRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -182,15 +180,12 @@ public Response post(UpdateRequest update, @QueryParam(USING_GRAPH_URI) List """; - @Test(expected = RiotException.class) + @Test public void testBillionLaughs() { - Model m = ModelFactory.createDefaultModel(); - - ByteArrayInputStream bais = new ByteArrayInputStream(MALICIOUS.getBytes(StandardCharsets.UTF_8)); - - RDFParser parser = RDFParser.create() - .lang(Lang.RDFXML) - .errorHandler(ErrorHandlerFactory.errorHandlerStrict) - .checking(true) - .base("http://example.org/") - .source(bais) - .build(); - - System.out.println("Starting parse..."); - parser.parse(StreamRDFLib.graph(m.getGraph())); - System.out.println("Model size: " + m.size()); + assertThrows(RiotException.class, () -> { + Model m = ModelFactory.createDefaultModel(); + + ByteArrayInputStream bais = new ByteArrayInputStream(MALICIOUS.getBytes(StandardCharsets.UTF_8)); + + RDFParser parser = RDFParser.create() + .lang(Lang.RDFXML) + .errorHandler(ErrorHandlerFactory.errorHandlerStrict) + .checking(true) + .base("http://example.org/") + .source(bais) + .build(); + + System.out.println("Starting parse..."); + parser.parse(StreamRDFLib.graph(m.getGraph())); + System.out.println("Model size: " + m.size()); + }); } } diff --git a/src/test/java/com/atomgraph/linkeddatahub/client/filter/ClientUriRewriteFilterTest.java b/src/test/java/com/atomgraph/linkeddatahub/client/filter/ClientUriRewriteFilterTest.java index 1c874c19b..ce3d6e89f 100644 --- a/src/test/java/com/atomgraph/linkeddatahub/client/filter/ClientUriRewriteFilterTest.java +++ b/src/test/java/com/atomgraph/linkeddatahub/client/filter/ClientUriRewriteFilterTest.java @@ -34,8 +34,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for {@link ClientUriRewriteFilter}. diff --git a/src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java b/src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java index 745ecd94d..2321ecf81 100644 --- a/src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java +++ b/src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java @@ -24,11 +24,11 @@ import java.io.IOException; import java.net.URI; import java.util.List; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.*; @@ -37,7 +37,7 @@ * * @author Martynas Jusevičius {@literal } */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ProxyRequestFilterTest { @@ -47,7 +47,7 @@ public class ProxyRequestFilterTest private ProxyRequestFilter filter; - @Before + @BeforeEach public void setUp() { filter = new ProxyRequestFilter(); diff --git a/src/test/java/com/atomgraph/linkeddatahub/server/util/URLValidatorTest.java b/src/test/java/com/atomgraph/linkeddatahub/server/util/URLValidatorTest.java index fd22dae18..b72bc4b65 100644 --- a/src/test/java/com/atomgraph/linkeddatahub/server/util/URLValidatorTest.java +++ b/src/test/java/com/atomgraph/linkeddatahub/server/util/URLValidatorTest.java @@ -16,9 +16,10 @@ package com.atomgraph.linkeddatahub.server.util; import com.atomgraph.linkeddatahub.server.exception.InternalURLException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URI; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Unit tests for URLValidator SSRF protection. @@ -32,34 +33,34 @@ public class URLValidatorTest { - @Test(expected = IllegalArgumentException.class) + @Test public void testNullURI() { - new URLValidator(false).validate(null); + assertThrows(IllegalArgumentException.class, () -> new URLValidator(false).validate(null)); } - @Test(expected = InternalURLException.class) + @Test public void testLinkLocalIPv4Blocked() { - new URLValidator(false).validate(URI.create("http://169.254.1.1:8080/test")); + assertThrows(InternalURLException.class, () -> new URLValidator(false).validate(URI.create("http://169.254.1.1:8080/test"))); } - @Test(expected = InternalURLException.class) + @Test public void testPrivateClass10Blocked() { - new URLValidator(false).validate(URI.create("http://10.0.0.1:8080/test")); + assertThrows(InternalURLException.class, () -> new URLValidator(false).validate(URI.create("http://10.0.0.1:8080/test"))); } - @Test(expected = InternalURLException.class) + @Test public void testPrivateClass172Blocked() { - new URLValidator(false).validate(URI.create("http://172.16.0.0:8080/test")); + assertThrows(InternalURLException.class, () -> new URLValidator(false).validate(URI.create("http://172.16.0.0:8080/test"))); } - @Test(expected = InternalURLException.class) + @Test public void testPrivateClass192Blocked() { - new URLValidator(false).validate(URI.create("http://192.168.1.1:8080/test")); + assertThrows(InternalURLException.class, () -> new URLValidator(false).validate(URI.create("http://192.168.1.1:8080/test"))); } @Test From e8de47343cc70e84c3444dd64fed36ff1c519622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 5 Jun 2026 12:25:42 +0200 Subject: [PATCH 03/32] Remove bash trace debug from entrypoint Drops set -x and the stderr-merge that were left in to debug the startup pipeline; they produced very noisy docker logs. Co-Authored-By: Claude Opus 4.7 (1M context) --- platform/entrypoint.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/platform/entrypoint.sh b/platform/entrypoint.sh index a67ef5383..a737c3a6b 100755 --- a/platform/entrypoint.sh +++ b/platform/entrypoint.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash set -e -set -x # DEBUG: trace every command (revert before merge) -exec 2>&1 # DEBUG: merge stderr into stdout so the trace lands in docker logs # set timezone From 1c47f09995a952e47fb7235ee395c111fcf640e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 5 Jun 2026 17:27:12 +0200 Subject: [PATCH 04/32] Move CSR-only helpers, lapp:Application form restrictions, bs2:FormControl booleans - Move ldh:load-constructed-doc / ldh:set-constructed-doc from the shared imports/default.xsl to client/functions.xsl; they use ixsl:updating and are only called from client-side promise chains, so Saxon-HE was warning about the unlicensed extension on every server start. - Add bs2:FormControl templates for xsd:boolean literals and for the constructor's blank-node boolean placeholder (rdf:type xsd:boolean). - Restrict the lapp:Application settings form to dct:title / dct:description; render the remaining app properties + rdf:type as hidden inputs so PATCH preserves them. Suppress the add-property selector for app settings. - Expose the active application URI as LinkedDataHub.application (set from the Link header) and read it back via lapp:application(), replacing the active-pane dataset lookup. - Dedupe constructor-template properties by predicate URI when merging into the resource form so multiple matching spin:constructors don't produce duplicate placeholders. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../xsl/bootstrap/2.3.2/imports/default.xsl | 125 ++++++++++++++---- 1 file changed, 99 insertions(+), 26 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl index b5adde1cb..ffa98ad49 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl @@ -269,31 +269,6 @@ exclude-result-prefixes="#all" - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1271,7 +1246,105 @@ exclude-result-prefixes="#all" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 78bef87081dd987263ab4b47260e4ae5b2bb39b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 5 Jun 2026 17:28:55 +0200 Subject: [PATCH 05/32] Move CSR-only helpers, lapp:Application form restrictions (cont.) Follow-up to 1c47f0999 which only captured the imports/default.xsl half of the change. - Add ldh:load-constructed-doc / ldh:set-constructed-doc to client/functions.xsl (the moved-to home for the CSR-only helpers previously living in imports/default.xsl). - Switch lapp:application() from the active-pane dataset lookup to LinkedDataHub.application on the window object, populated in client.xsl from the Link header on RDF document responses. - Restrict the lapp:Application settings form to dct:title / dct:description; render the remaining app properties + rdf:type as hidden inputs so PATCH preserves them; suppress the add-property selector for app settings. - Dedupe constructor-template properties by predicate URI when merging into the resource form so multiple matching spin:constructors don't produce duplicate placeholders. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../xsl/bootstrap/2.3.2/client/functions.xsl | 30 +++++++++++++++++-- .../xsl/bootstrap/2.3.2/client/modal.xsl | 26 +++++++++++++++- .../xsl/bootstrap/2.3.2/resource.xsl | 13 ++++++-- .../atomgraph/linkeddatahub/xsl/client.xsl | 3 ++ 4 files changed, 66 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl index c4158af6c..b6a10f23c 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl @@ -81,8 +81,7 @@ exclude-result-prefixes="#all" - - + @@ -564,7 +563,32 @@ exclude-result-prefixes="#all" => ixsl:then(ldh:rethread-response($context, ?, $response-key)) "/> - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl index 99d13acdc..dfcb94a8f 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl @@ -39,6 +39,7 @@ xmlns:srx="&srx;" xmlns:ldt="&ldt;" xmlns:sd="&sd;" xmlns:sioc="&sioc;" +xmlns:dct="&dct;" xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2" extension-element-prefixes="ixsl" exclude-result-prefixes="#all" @@ -1095,7 +1096,30 @@ LIMIT 10 - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl index de0145d55..53ba06be8 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl @@ -1347,8 +1347,17 @@ extension-element-prefixes="ixsl" - - + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl index f3517e36b..7f64aa183 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl @@ -477,6 +477,9 @@ WHERE + + + From 9adb046e7c2d5a26bea0bbea5e03690796c27178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 5 Jun 2026 18:46:45 +0200 Subject: [PATCH 06/32] Lift bs2:Form $required to a predicate at rdf:RDF level Modal flows build their $context map before the document is fetched, so they couldn't supply the existing per-resource $required xs:boolean. Promote the rdf:RDF bs2:Form template's $required to a function(element()) as xs:boolean predicate that gets evaluated per child and rebound as the resource-level boolean tunnel. Default is an always-false predicate so callers opt in to suppression. ldh:render-form reads $context('required') and tunnels it; btn-edit and btn-app-settings populate it (type-based and always-true respectively); ldh:render-add-modal-form and ldh:modal-form-submit-violation pass the dh:Container/dh:Item rule explicitly. Resource-level template stays xs:boolean. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl | 2 ++ .../linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl | 8 ++++++-- .../linkeddatahub/xsl/bootstrap/2.3.2/document.xsl | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index 8e419e0c7..300ab0355 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -571,6 +571,7 @@ WHERE + @@ -587,6 +588,7 @@ WHERE + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl index dfcb94a8f..13ff91b6f 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl @@ -772,6 +772,7 @@ LIMIT 10 + @@ -867,7 +868,8 @@ LIMIT 10 'request': $request, 'block': $block, 'about': $about, - 'method': $method + 'method': $method, + 'required': function($r as element()) as xs:boolean { $r/rdf:type/@rdf:resource = ('&dh;Container', '&dh;Item') } }"/> + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl index 1a4ba2476..a05bdb45b 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl @@ -1144,6 +1144,8 @@ extension-element-prefixes="ixsl" + + @@ -1208,7 +1210,7 @@ extension-element-prefixes="ixsl" - + From 197ab9cd32f82286d4d63e9bd2cfc1da57b6b33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 16:33:20 +0200 Subject: [PATCH 07/32] Convert modal-form metadata fetches to async load/set pairs (#310) * Convert modal-form metadata fetches to async load/set pairs The five modal/typeahead form rendering paths each fetched type-metadata, property-metadata, constraints, and object-metadata synchronously via document() inside their terminal render functions, blocking the UI thread on 3-4 sequential round-trips per render. Promote each fetch to an async load/set pair invoked as steps in the existing ixsl:promise chains: - ldh:load-type-metadata / ldh:set-type-metadata (set-type-metadata stripped of its sync work, now just extracts response body) - ldh:load-constraints / ldh:set-constraints (new pair) - Reuse the existing ldh:load-property-metadata and ldh:load-object-metadata in client/block.xsl, extended to accept pre-computed URIs from context (backward-compatible) Each of the five chains (btn-edit, btn-app-settings, add-constructor, typeahead-row-form, row-form-submit-violation) is extended with the new load/set steps before its terminal render function. The render functions are correspondingly stripped of sync work and now just read metadata from context. ldh:modal-form-submit-violation was sync; converted to start a promise chain and terminate in a new ldh:render-modal-form-violation. To uniformly identify the resource being edited across all three modal flows in the submit-violation re-render path, the Container/Item creation modal now also carries @about on its wrapper div (the new resource URL), matching btn-edit and btn-app-settings. The submit handlers read $block/@about directly without a fallback. Co-Authored-By: Claude Opus 4.7 (1M context) * Sync modal @about and slug UI across Container/Item violation re-render Two small follow-ups to the modal-form refactor so the Container/Item creation modal renders identically before and after a constraint-violation re-render: - subject-slug onkeyup handler now also keeps the modal-constructor div's @about attribute in sync with the new URI (alongside the existing 'su' input value and form @action sync), so the submit handler's $block/@about discriminator stays correct after the user edits the slug. - bs2:FormControl slug-style template (imports/default.xsl) now matches Container/Item resources by either @rdf:nodeID (initial SPIN construction: blank node) or @rdf:about (violation response: carries the submitted URI). The same body works for both because $action carries the resource URL in either case; without this the violation re-render fell through to the generic full-URI control. Co-Authored-By: Claude Opus 4.7 (1M context) * Run modal-form metadata load/set pairs in parallel via ixsl:all The async load/set pair conversion in 3ba3dc6e9 made each metadata fetch a self-contained step but left them threaded sequentially. Independent fetches (shapes, constructors, type-metadata, property-metadata, constraints, object-metadata) read disjoint context keys, so they can fan out via ixsl:all and converge through a single merge step. New helper ldh:fire-load-set-parallel#2 in functions.xsl encapsulates the pattern; new ldh:reset-cursor#0 + ixsl:finally replace duplicated end-of-chain cursor cleanup. Refactored sites: - form.xsl:1415 (typeahead-row-form): 21 hops -> 5, two parallel batches around set-typeahead-form-resource as SHACL+SPIN merge barrier - modal.xsl:820 (add-constructor): 18 hops -> 5 - modal.xsl:1103 (app-settings): 21 hops -> 6, type-metadata pair uses an identity load-fn to preserve the GET request already baked by load-edited-resource Wall-clock per flow: ~4-6 sequential round-trips -> ~2. Co-Authored-By: Claude Opus 4.7 (1M context) * Run row/edit metadata load/set pairs in parallel via ixsl:all Mirrors the modal-form refactor from 244366875 across the remaining form chains: btn-edit row-form, row-form constraint-violation re-render, and the two parallel modal chains (btn-edit + btn-app-settings, and modal-form violation re-render). The serial then-chain is replaced with ldh:fire-load-set-parallel over the load/request/response/set tuples; cursor reset moves into ixsl:finally so it runs on both success and failure paths. Adds ldh:fetch-and-load-edited-resource as the shared seed for chains whose first hop is the edited-resource GET; downstream parallel pairs pass an identity load-fn for type-metadata because the seed already baked the GET-style type-metadata-request into context. Co-Authored-By: Claude Opus 4.7 (1M context) * Drop FormPreSubmit @name strip on empty RDF/POST inputs The template removed @name='ol'/'ou'/'ob' from inputs whose value was empty at submit time, but it mutated the live DOM. When a submit failed constraint validation and the form was re-rendered, the @name attributes stayed stripped; a follow-up submit with newly filled values silently dropped those inputs because parse-rdf-post filters by @name. Net effect: after any first-submit validation error, the next submit produced an empty request, the server accepted it, and the row-form success handler crashed in $new-block (required exactly-one, got zero). ldh:parse-rdf-post already filters empty non-'su' values inline via $value-inputs[@name = 'su' or not(ixsl:get(., 'value') = '')], so this template was redundant on top of being destructive. Co-Authored-By: Claude Opus 4.7 (1M context) * Mark admin subdomain link as external The admin subdomain link in the user dropdown opens in a new tab; tag it with class="external" so it picks up the same affordance (icon, styling) as other external links. Co-Authored-By: Claude Opus 4.7 (1M context) --------- Co-authored-by: Claude Opus 4.7 (1M context) --- .../xsl/bootstrap/2.3.2/client/block.xsl | 22 +- .../xsl/bootstrap/2.3.2/client/form.xsl | 310 ++++++++---------- .../xsl/bootstrap/2.3.2/client/functions.xsl | 46 +++ .../xsl/bootstrap/2.3.2/client/modal.xsl | 234 ++++++------- .../xsl/bootstrap/2.3.2/document.xsl | 48 +-- .../xsl/bootstrap/2.3.2/imports/default.xsl | 4 +- .../xsl/bootstrap/2.3.2/layout.xsl | 2 +- 7 files changed, 356 insertions(+), 310 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl index 8bb025c9a..dd377cc65 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl @@ -653,12 +653,15 @@ exclude-result-prefixes="#all" - + + if (map:contains($context, 'object-uris')) then $context('object-uris') + else + let $response := $context($response-key) + return if ($response?status = 200 and $response?media-type = 'application/rdf+xml') + then distinct-values($response?body/rdf:RDF/rdf:Description/*/@rdf:resource[not(key('resources', .))]) + else ()"/> @@ -704,11 +707,14 @@ exclude-result-prefixes="#all" - + + if (map:contains($context, 'property-uris')) then $context('property-uris') + else + let $response := $context($response-key) + return if ($response?status = 200 and $response?media-type = 'application/rdf+xml') + then distinct-values($response?body/rdf:RDF/rdf:Description/*/concat(namespace-uri(), local-name())) + else ()"/> diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index 300ab0355..0e1eb5424 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -185,12 +185,7 @@ WHERE - - - - - - + @@ -262,26 +257,56 @@ WHERE 'block': $block, 'about': $about }"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -306,11 +331,16 @@ WHERE + + 'types': $types, + 'property-uris': distinct-values($resource/*/concat(namespace-uri(), local-name())), + 'object-uris': distinct-values($resource/*/@rdf:resource[not(key('resources', .))]), + 'document': ., + 'action': if (map:contains($context, 'action')) then $context('action') else ldh:href(ac:absolute-path(ldh:base-uri(.)), map{}) + }), map{ 'duplicates': 'use-last' })"/> @@ -331,34 +361,8 @@ WHERE - - - - - - - - - - - - - - - - - - + - @@ -366,23 +370,6 @@ WHERE - - - - - - - - - - - - - - @@ -522,7 +509,7 @@ WHERE - + @@ -555,43 +542,15 @@ WHERE - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -603,7 +562,53 @@ WHERE - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -679,10 +684,12 @@ WHERE + @@ -717,7 +724,7 @@ WHERE - + @@ -944,28 +951,31 @@ WHERE $context, map{ 'body': $body, - 'types': $types + 'types': $types, + 'endpoint': sd:endpoint(), + 'property-uris': distinct-values($body/rdf:RDF/*[not(@rdf:about = $doc-uri)]/*/concat(namespace-uri(), local-name())), + 'object-uris': distinct-values($body/rdf:RDF/*/*/@rdf:resource[not(key('resources', .))]) } ), map{ 'duplicates': 'use-last' })"/> + + ixsl:then(ldh:render-row-form-violation#1) => + ixsl:finally(ldh:reset-cursor#0)" on-failure="ldh:promise-failure#1"/> + All metadata is fetched async by the upstream chain steps; this function just reads from context. --> @@ -975,25 +985,10 @@ WHERE - - - - - - - - - - - - - - - - - - - + + + + @@ -1018,8 +1013,6 @@ WHERE - - @@ -1292,7 +1285,8 @@ WHERE 'constructed-doc': $merged-doc, 'shapes': $shapes, 'resource': $resource, - 'types': $types + 'types': $types, + 'property-uris': distinct-values($resource/*/concat(namespace-uri(), local-name())) }), map{ 'duplicates': 'use-last' })"/> @@ -1307,26 +1301,15 @@ WHERE + + + - - - - - - - - - - - - - - @@ -1354,8 +1337,6 @@ WHERE - - @@ -1403,20 +1384,19 @@ WHERE }"/> + ixsl:then(ldh:render-typeahead-row-form#1) => + ixsl:finally(ldh:reset-cursor#0)" on-failure="ldh:promise-failure#1"/> diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl index b6a10f23c..e55d06da5 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl @@ -589,6 +589,52 @@ exclude-result-prefixes="#all" + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl index 13ff91b6f..2efd4205a 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl @@ -732,6 +732,20 @@ LIMIT 10 Reads context('constructed-doc') as the async-fetched SPIN-construction; the remaining sync document() calls for type-metadata/property-metadata/constraints are scope for a follow-up refactor. --> + + + + + + + + + + @@ -739,26 +753,13 @@ LIMIT 10 + + + - - - - - - - - - - - - - - - - @@ -777,7 +778,7 @@ LIMIT 10 -
+
@@ -795,8 +796,6 @@ LIMIT 10 - - @@ -819,11 +818,17 @@ LIMIT 10 }"/> + ixsl:then(ldh:set-add-modal-form-resource#1) => + ixsl:then(ldh:fire-load-set-parallel(?, [ + [ ldh:load-type-metadata#1, 'type-metadata-request', 'type-metadata-response', ldh:set-type-metadata#1 ], + [ ldh:load-property-metadata#1, 'property-metadata-request', 'property-metadata-response', ldh:set-property-metadata#1 ], + [ ldh:load-constraints#1, 'constraints-request', 'constraints-response', ldh:set-constraints#1 ] + ])) => + ixsl:then(ldh:render-add-modal-form#1) => + ixsl:finally(ldh:reset-cursor#0)" on-failure="ldh:promise-failure#1"/> @@ -869,18 +874,21 @@ LIMIT 10 'block': $block, 'about': $about, 'method': $method, + 'endpoint': sd:endpoint(), 'required': function($r as element()) as xs:boolean { $r/rdf:type/@rdf:resource = ('&dh;Container', '&dh;Item') } }"/> + @@ -987,10 +995,12 @@ LIMIT 10 + + @@ -1320,6 +1333,7 @@ LIMIT 10 + @@ -1327,6 +1341,10 @@ LIMIT 10 + + + + @@ -1710,87 +1728,79 @@ LIMIT 10 + - - - - - ldh:modal-form-submit-violation - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + ldh:modal-form-submit-violation - - -
- + + + + + + + + + - - - -
+ + + + + + -
- -
- - + + + + + +
+ + + + + +
- - - - +
+ +
+ + - + + + - - - + \ No newline at end of file diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl index a05bdb45b..75086f514 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl @@ -1140,7 +1140,7 @@ extension-element-prefixes="ixsl" - + @@ -1164,27 +1164,8 @@ extension-element-prefixes="ixsl" - -
- - - - - - - - - - - - - - This form uses RDF/POST encoding: https://atomgraph.github.io/RDF-POST/ - - - - - + + @@ -1213,6 +1194,29 @@ extension-element-prefixes="ixsl" + + + + + + + + + + + + + + + + + This form uses RDF/POST encoding: https://atomgraph.github.io/RDF-POST/ + + + + + +
  • - + From bef607f2787c6769983f85f90a4c7202f6f2b422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 18:21:36 +0200 Subject: [PATCH 08/32] Scope lapp:Application form restrictions to the app-settings flow The bs2:FormControl/TypeControl/PropertyControl-mode templates that hid non-title/description properties of lapp:Application instances were firing whenever an Application was rendered as a form, including the generic Create-button constructor flow where the user needs every editable property exposed. Introduce ldh:AppSettingsForm mode (peer to ldh:DocumentForm) for the btn-app-settings render path; the mode itself is the discriminator, so the suppression / type-hidden / no-PropertyControl behaviour only applies when the form is entered through that flow. Refactor bs2:FormControl into a dual match+name template with $body / $type-hidden / $show-property-control params (mirroring bs2:Form's existing match+name shape) so ldh:AppSettingsForm can reuse the fieldset shell with the right overrides while letting the default body preserve the merged-properties iteration, constraint-aware sort, and violations/constructor/type-constraints/type-shapes with-params that per-property templates need. Thread render-fn through the modal-form-submit-violation chain so settings-flow PATCH violations re-render in ldh:AppSettingsForm mode too. Anchor the shell's @rdf:about / @rdf:nodeID dispatch and the AppSettingsForm suppression template's value-bearing children to bs2:FormControl mode explicitly rather than mode="#current", since those leaf renderers live only in bs2:FormControl and the named-template entry path means #current can now be a wrapper mode. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../xsl/bootstrap/2.3.2/client/form.xsl | 43 ++++++++++- .../xsl/bootstrap/2.3.2/client/modal.xsl | 71 ++++++++++++++----- .../xsl/bootstrap/2.3.2/resource.xsl | 69 ++++++++++-------- 3 files changed, 133 insertions(+), 50 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index 0e1eb5424..8c205da7a 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -580,8 +580,8 @@ WHERE - - + + @@ -609,6 +609,45 @@ WHERE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl index 2efd4205a..110e598e1 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl @@ -1090,7 +1090,7 @@ LIMIT 10 'endpoint': sd:endpoint(), 'required': function($r as element()) as xs:boolean { true() } }"/> - + @@ -1113,29 +1113,63 @@ LIMIT 10 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - + + + + + + + + + + + + - - - @@ -1618,9 +1652,9 @@ LIMIT 10 - + - + @@ -1764,7 +1798,7 @@ LIMIT 10 on-failure="ldh:promise-failure#1"/> - + @@ -1779,7 +1813,8 @@ LIMIT 10 'shapes': (), 'required': function($r as element()) as xs:boolean { $r/rdf:type/@rdf:resource = ('&dh;Container', '&dh;Item') } }), map{ 'duplicates': 'use-last' })"/> - + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl index 53ba06be8..366fe8417 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl @@ -1209,7 +1209,7 @@ extension-element-prefixes="ixsl" - + @@ -1247,6 +1247,31 @@ extension-element-prefixes="ixsl" + + + + + + + + + + + + + + + + + + + + + + + + +
    @@ -1333,12 +1358,14 @@ extension-element-prefixes="ixsl" - + + + @@ -1346,35 +1373,17 @@ extension-element-prefixes="ixsl"
    • - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + From cdd8567753df49498778e1a69a92db4065921272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 18:59:23 +0200 Subject: [PATCH 09/32] Allow editing rdf:type on ldh:View instance forms Removes the bs2:TypeControl override that hid the type select for ldh:View blocks, so the rdf:type control behaves the same way as for generic resources. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../xsl/bootstrap/2.3.2/client/block/view.xsl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl index 8d7dc1829..d12c7ef10 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl @@ -202,13 +202,6 @@ exclude-result-prefixes="#all" - - - - - - - From 5df94cefc12fe0e31f6f0c969f551291030a0d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 18:59:30 +0200 Subject: [PATCH 10/32] Drop just-added block on empty-graph submit When a new instance form is submitted with no triples (e.g. user removed rdf:type and left other fields blank), $resources/rdf:RDF/* is empty, so applying bs2:Row returns no element and the cardinality=1 assertion on $new-block throws. Guard the success handler so an empty submitted graph removes the block from the DOM instead. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../xsl/bootstrap/2.3.2/client/form.xsl | 68 +++++++++++-------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index 8c205da7a..f3aa1e5b9 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -922,40 +922,48 @@ WHERE - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + - - - - - From 2de023564b17bedbe84a32cfbac6f4f06359fa35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 19:59:16 +0200 Subject: [PATCH 11/32] Add migration plan for Jena ontapi refactor Captures phased path from deprecated org.apache.jena.ontology to org.apache.jena.ontapi across Core, Web-Client, and LDH, with a Phase 0 spike to de-risk import resolution and inference materialization before the cascade. Co-Authored-By: Claude Opus 4.7 (1M context) --- ONTAPI_MIGRATION.md | 121 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 ONTAPI_MIGRATION.md diff --git a/ONTAPI_MIGRATION.md b/ONTAPI_MIGRATION.md new file mode 100644 index 000000000..d1f6d4214 --- /dev/null +++ b/ONTAPI_MIGRATION.md @@ -0,0 +1,121 @@ +# Jena Ontology API Migration Plan + +Migrating off the deprecated `org.apache.jena.ontology` API onto the new `org.apache.jena.ontapi`. + +## Scope + +Three repos, in dependency order: **Core** → **Web-Client** → **LinkedDataHub**. + +The 90+ deprecation warnings collapse into three patterns: + +1. **Vocabulary classes** (~18 files in LDH, 2 in Core, several in Web-Client). Use `OntModel`-typed constants (`OntClass`, `ObjectProperty`, `DatatypeProperty`). Cannot be replaced with plain `Model` because consumers depend on the typed constants. Mechanical migration, wide cascade. +2. **Writer / Validator signatures** in Web-Client and LDH. Accept `OntModelSpec` / `OntModel` but don't exercise ontology features. Direct type rename. +3. **Ontology machinery** (the actual work): `OntDocumentManager` global wiring, per-request import resolution + inference materialization, direct `OntDocumentManager.getOntology()` calls. + +## Type / method rename table + +| Old (`org.apache.jena.ontology`) | New (`org.apache.jena.ontapi.model`) | +|---|---| +| `OntModel` | `OntModel` | +| `OntClass` | `OntClass` | +| `ObjectProperty` | `OntObjectProperty` | +| `DatatypeProperty` | `OntDataProperty` | +| `AnnotationProperty` | `OntAnnotationProperty` | +| `OntModelSpec.OWL_MEM` | `OntSpecification.OWL2_DL_MEM` (verify exact semantic match) | +| `OntModelSpec.OWL_MEM_RDFS_INF` | `OntSpecification.OWL2_DL_MEM_BUILTIN_RDFS_INF` | +| `OntModelSpec.RDFS_MEM` | `OntSpecification.RDFS_MEM` | +| `ModelFactory.createOntologyModel(spec, base)` | `OntModelFactory.createModel(base.getGraph(), spec)` | +| `model.createClass(uri)` | `model.createOntClass(uri)` | +| `model.createDatatypeProperty(uri)` | `model.createDataProperty(uri)` — **method renamed** | +| `model.createObjectProperty(uri)` | `model.createObjectProperty(uri)` | +| `model.createAnnotationProperty(uri)` | `model.createAnnotationProperty(uri)` | +| `model.getOntClass(uri)` | `model.getOntClass(uri)` | +| `OntDocumentManager.getInstance()` | `DocumentGraphRepository` (per-Application instance) | +| `OntDocumentManager.getOntology(uri, spec)` | repository lookup + `OntModelFactory.createModel(...)` | +| `model.listImportedOntologyURIs(true)` | `model.imports()` recursively (verify closure semantics) | + +## Phase 0 — Spike (must come first) + +Single throwaway branch. Validate the two unknowns before touching any production call sites: + +1. Does `OntModel#imports()` give the same recursive-closure semantics as the old `listImportedOntologyURIs(true)`? +2. Does `DocumentGraphRepository` support the **materialize-inferences-then-cache-as-non-inferencing-model** pattern from `OntologyFilter.java:155–161`? This is the load-bearing trick — `OWL_MEM_RDFS_INF` → materialize → cache as `OWL_MEM`. + +Spike target: rewrite `OntologyFilter.java` against ontapi in isolation. Compile-check only; production migration follows. + +**Exit criteria:** either both patterns translate cleanly, or we know we need a compatibility shim. + +## Phase 1 — Core + +Smallest blast radius. Two vocabulary classes: + +- `com.atomgraph.core.vocabulary.A` +- `com.atomgraph.core.vocabulary.SD` + +Apply rename table. Publish snapshot. Verify LDH compiles against the snapshot (it won't fully — but the Core-originated typed constants should resolve under their new types). + +## Phase 2 — Web-Client (gatekeeper) + +Public API surface changes here, so this must land before LDH can finish. + +**Public API:** +- `Application.getOntModelSpec()` → return `OntSpecification` (rename method to `getOntSpecification()` or keep name with new return type) +- `XSLTWriterBase`, `ModelXSLTWriter`, `ResultSetXSLTWriter` constructor signatures take `OntSpecification` + +**Direct ontapi calls:** +- `ConstructForClass.java:92` — replace `getOntDocumentManager().getOntology(ontology, OntModelSpec.OWL_MEM)` with repository lookup + +**Vocabulary classes:** apply rename table to all Web-Client vocabularies. + +This is where the typed-constant cascade lands — every `import org.apache.jena.ontology.ObjectProperty` becomes `import org.apache.jena.ontapi.model.OntObjectProperty`, etc. Mechanical but wide. + +## Phase 3 — LDH vocabularies (mechanical) + +Apply rename table to all LDH vocabulary classes. Watch the `createDatatypeProperty` → `createDataProperty` method rename — this is not a pure import change. + +Files: `LDH`, `LDHC`, `LDHT`, `LAPP`, `LACL`, `Admin`, `Default`, `ACL`, `Cert`, `DH`, `FOAF`, `Google`, `NFO`, `ORCID`, `PROV`, `SIOC`, `VoID`, plus `com.atomgraph.server.vocabulary.{HTTP,LDT}`. + +Update every consumer that imports a typed constant (`OntClass`, `ObjectProperty`, `DatatypeProperty`, `AnnotationProperty`) — find/replace the imports. + +## Phase 4 — LDH machinery (the actual work) + +Driven by Phase 0 spike findings. + +- **`Application.java:806`** — replace `OntDocumentManager.getInstance().setFileManager((FileManager) dataManager)` with a `DocumentGraphRepository` field configured via `addMapping()` for the URIs that `DataManagerImpl` resolves today. +- **`Application.java` lines 275, 284, 1781, 1792, 1796, 2018** — `OntModelSpec` field/parameter replacements. +- **`OntologyFilter.java:144–187`** — rewrite the per-request flow per spike outcome: inference materialization, import URI enumeration, caching. +- **`OntologyModelGetter.java`** — switch to `OntModelFactory.createModel()` + repository lookup. +- **`ClearOntology.java`** — same. +- **`Validator.java`** — type rename (weak coupling; signature only). +- **`XSLTWriterBase.java`, `ModelXSLTWriter.java`, `ResultSetXSLTWriter.java`** — type rename to match new Web-Client signatures. + +## Phase 5 — Validation + +Run the HTTP test suite via `./run.sh` from `http-tests/`. Pay particular attention to: + +- Authorization tests — exercise the `acl:` ontology imports closure; sensitive to any change in import-resolution semantics +- Anything that loads multiple ontologies (admin app boot, end-user app boot) +- Cache-hit behavior on repeated requests for the same ontology + +## Estimate + +- **Phase 0 spike:** 2–3 days +- **Phases 1–3** (mechanical rename across 3 repos): 3–4 days +- **Phase 4** (machinery): 3 days if spike says ontapi maps cleanly; up to 2 weeks if a compatibility shim is needed +- **Phase 5** (HTTP test fixes / regression fixing): 2–3 days + +**Total: ~2–3 weeks** if Phase 0 comes back clean; **4–6 weeks** if not. + +## Risks + +- `DocumentGraphRepository` is per-instance, not a process-wide singleton like `OntDocumentManager`. Multi-app/multi-dataspace wiring may need new threading discipline. +- Import-resolution semantics differ subtly between APIs. The HTTP authorization tests are the regression net but won't necessarily catch *performance* regressions (e.g., re-fetching cached imports). +- `OntSpecification.OWL2_DL_MEM` may have different default reasoner/personality settings than `OntModelSpec.OWL_MEM`. Verify before assuming it's a drop-in. +- Cross-repo coordination: Core and Web-Client need snapshots published before LDH can finish. Plan the merge order. + +## Open questions for Phase 0 spike + +1. Exact `OntSpecification` constant matching `OWL_MEM` semantics (no inference, full OWL vocabulary). +2. How to recreate the materialize-into-non-inferencing-model pattern in ontapi. +3. Does ontapi's import resolution respect a custom `FileManager`-equivalent for the `urn:` and `file:` URIs used by `DataManagerImpl`? +4. Is there a `cache="yes"`-equivalent gotcha (cf. SaxonJS) where ontapi memoises something we don't want memoised across requests? From 2ebf211f1f65de448e041ff1f071bd8a3d662984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 20:40:33 +0200 Subject: [PATCH 12/32] Remove outermost duplicate .block wrapper on btn-remove-resource Renderers may double-wrap a resource with two nested div.block elements sharing the same @about; remove the outer wrapper when present so no empty shell remains after deletion. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index f3aa1e5b9..4da3c8006 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -1470,10 +1470,12 @@ WHERE - + - - + + + + @@ -1483,7 +1485,7 @@ WHERE - + From c6de3f71446ee71bca9c6867a0c5128aa0014f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 20:42:28 +0200 Subject: [PATCH 13/32] Untrack ONTAPI_MIGRATION.md Plan doc kept locally only; not part of the repo. Co-Authored-By: Claude Opus 4.7 (1M context) --- ONTAPI_MIGRATION.md | 121 -------------------------------------------- 1 file changed, 121 deletions(-) delete mode 100644 ONTAPI_MIGRATION.md diff --git a/ONTAPI_MIGRATION.md b/ONTAPI_MIGRATION.md deleted file mode 100644 index d1f6d4214..000000000 --- a/ONTAPI_MIGRATION.md +++ /dev/null @@ -1,121 +0,0 @@ -# Jena Ontology API Migration Plan - -Migrating off the deprecated `org.apache.jena.ontology` API onto the new `org.apache.jena.ontapi`. - -## Scope - -Three repos, in dependency order: **Core** → **Web-Client** → **LinkedDataHub**. - -The 90+ deprecation warnings collapse into three patterns: - -1. **Vocabulary classes** (~18 files in LDH, 2 in Core, several in Web-Client). Use `OntModel`-typed constants (`OntClass`, `ObjectProperty`, `DatatypeProperty`). Cannot be replaced with plain `Model` because consumers depend on the typed constants. Mechanical migration, wide cascade. -2. **Writer / Validator signatures** in Web-Client and LDH. Accept `OntModelSpec` / `OntModel` but don't exercise ontology features. Direct type rename. -3. **Ontology machinery** (the actual work): `OntDocumentManager` global wiring, per-request import resolution + inference materialization, direct `OntDocumentManager.getOntology()` calls. - -## Type / method rename table - -| Old (`org.apache.jena.ontology`) | New (`org.apache.jena.ontapi.model`) | -|---|---| -| `OntModel` | `OntModel` | -| `OntClass` | `OntClass` | -| `ObjectProperty` | `OntObjectProperty` | -| `DatatypeProperty` | `OntDataProperty` | -| `AnnotationProperty` | `OntAnnotationProperty` | -| `OntModelSpec.OWL_MEM` | `OntSpecification.OWL2_DL_MEM` (verify exact semantic match) | -| `OntModelSpec.OWL_MEM_RDFS_INF` | `OntSpecification.OWL2_DL_MEM_BUILTIN_RDFS_INF` | -| `OntModelSpec.RDFS_MEM` | `OntSpecification.RDFS_MEM` | -| `ModelFactory.createOntologyModel(spec, base)` | `OntModelFactory.createModel(base.getGraph(), spec)` | -| `model.createClass(uri)` | `model.createOntClass(uri)` | -| `model.createDatatypeProperty(uri)` | `model.createDataProperty(uri)` — **method renamed** | -| `model.createObjectProperty(uri)` | `model.createObjectProperty(uri)` | -| `model.createAnnotationProperty(uri)` | `model.createAnnotationProperty(uri)` | -| `model.getOntClass(uri)` | `model.getOntClass(uri)` | -| `OntDocumentManager.getInstance()` | `DocumentGraphRepository` (per-Application instance) | -| `OntDocumentManager.getOntology(uri, spec)` | repository lookup + `OntModelFactory.createModel(...)` | -| `model.listImportedOntologyURIs(true)` | `model.imports()` recursively (verify closure semantics) | - -## Phase 0 — Spike (must come first) - -Single throwaway branch. Validate the two unknowns before touching any production call sites: - -1. Does `OntModel#imports()` give the same recursive-closure semantics as the old `listImportedOntologyURIs(true)`? -2. Does `DocumentGraphRepository` support the **materialize-inferences-then-cache-as-non-inferencing-model** pattern from `OntologyFilter.java:155–161`? This is the load-bearing trick — `OWL_MEM_RDFS_INF` → materialize → cache as `OWL_MEM`. - -Spike target: rewrite `OntologyFilter.java` against ontapi in isolation. Compile-check only; production migration follows. - -**Exit criteria:** either both patterns translate cleanly, or we know we need a compatibility shim. - -## Phase 1 — Core - -Smallest blast radius. Two vocabulary classes: - -- `com.atomgraph.core.vocabulary.A` -- `com.atomgraph.core.vocabulary.SD` - -Apply rename table. Publish snapshot. Verify LDH compiles against the snapshot (it won't fully — but the Core-originated typed constants should resolve under their new types). - -## Phase 2 — Web-Client (gatekeeper) - -Public API surface changes here, so this must land before LDH can finish. - -**Public API:** -- `Application.getOntModelSpec()` → return `OntSpecification` (rename method to `getOntSpecification()` or keep name with new return type) -- `XSLTWriterBase`, `ModelXSLTWriter`, `ResultSetXSLTWriter` constructor signatures take `OntSpecification` - -**Direct ontapi calls:** -- `ConstructForClass.java:92` — replace `getOntDocumentManager().getOntology(ontology, OntModelSpec.OWL_MEM)` with repository lookup - -**Vocabulary classes:** apply rename table to all Web-Client vocabularies. - -This is where the typed-constant cascade lands — every `import org.apache.jena.ontology.ObjectProperty` becomes `import org.apache.jena.ontapi.model.OntObjectProperty`, etc. Mechanical but wide. - -## Phase 3 — LDH vocabularies (mechanical) - -Apply rename table to all LDH vocabulary classes. Watch the `createDatatypeProperty` → `createDataProperty` method rename — this is not a pure import change. - -Files: `LDH`, `LDHC`, `LDHT`, `LAPP`, `LACL`, `Admin`, `Default`, `ACL`, `Cert`, `DH`, `FOAF`, `Google`, `NFO`, `ORCID`, `PROV`, `SIOC`, `VoID`, plus `com.atomgraph.server.vocabulary.{HTTP,LDT}`. - -Update every consumer that imports a typed constant (`OntClass`, `ObjectProperty`, `DatatypeProperty`, `AnnotationProperty`) — find/replace the imports. - -## Phase 4 — LDH machinery (the actual work) - -Driven by Phase 0 spike findings. - -- **`Application.java:806`** — replace `OntDocumentManager.getInstance().setFileManager((FileManager) dataManager)` with a `DocumentGraphRepository` field configured via `addMapping()` for the URIs that `DataManagerImpl` resolves today. -- **`Application.java` lines 275, 284, 1781, 1792, 1796, 2018** — `OntModelSpec` field/parameter replacements. -- **`OntologyFilter.java:144–187`** — rewrite the per-request flow per spike outcome: inference materialization, import URI enumeration, caching. -- **`OntologyModelGetter.java`** — switch to `OntModelFactory.createModel()` + repository lookup. -- **`ClearOntology.java`** — same. -- **`Validator.java`** — type rename (weak coupling; signature only). -- **`XSLTWriterBase.java`, `ModelXSLTWriter.java`, `ResultSetXSLTWriter.java`** — type rename to match new Web-Client signatures. - -## Phase 5 — Validation - -Run the HTTP test suite via `./run.sh` from `http-tests/`. Pay particular attention to: - -- Authorization tests — exercise the `acl:` ontology imports closure; sensitive to any change in import-resolution semantics -- Anything that loads multiple ontologies (admin app boot, end-user app boot) -- Cache-hit behavior on repeated requests for the same ontology - -## Estimate - -- **Phase 0 spike:** 2–3 days -- **Phases 1–3** (mechanical rename across 3 repos): 3–4 days -- **Phase 4** (machinery): 3 days if spike says ontapi maps cleanly; up to 2 weeks if a compatibility shim is needed -- **Phase 5** (HTTP test fixes / regression fixing): 2–3 days - -**Total: ~2–3 weeks** if Phase 0 comes back clean; **4–6 weeks** if not. - -## Risks - -- `DocumentGraphRepository` is per-instance, not a process-wide singleton like `OntDocumentManager`. Multi-app/multi-dataspace wiring may need new threading discipline. -- Import-resolution semantics differ subtly between APIs. The HTTP authorization tests are the regression net but won't necessarily catch *performance* regressions (e.g., re-fetching cached imports). -- `OntSpecification.OWL2_DL_MEM` may have different default reasoner/personality settings than `OntModelSpec.OWL_MEM`. Verify before assuming it's a drop-in. -- Cross-repo coordination: Core and Web-Client need snapshots published before LDH can finish. Plan the merge order. - -## Open questions for Phase 0 spike - -1. Exact `OntSpecification` constant matching `OWL_MEM` semantics (no inference, full OWL vocabulary). -2. How to recreate the materialize-into-non-inferencing-model pattern in ontapi. -3. Does ontapi's import resolution respect a custom `FileManager`-equivalent for the `urn:` and `file:` URIs used by `DataManagerImpl`? -4. Is there a `cache="yes"`-equivalent gotcha (cf. SaxonJS) where ontapi memoises something we don't want memoised across requests? From 74f91fe1193e68a645cccd988c50cc6c23830763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 20:48:01 +0200 Subject: [PATCH 14/32] Add 5.5.0 changelog entry Co-Authored-By: Claude Opus 4.7 (1M context) --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a829e1c8e..8e38cf946 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +## [5.5.0] - 2026-06-06 +### Changed +- Jena upgraded to 6.1.0 (#309) +- Modal-form metadata fetches converted to async load/set pairs (#310) +- `bs2:Form` `$required` lifted to a predicate at `rdf:RDF` level +- CSR-only helpers moved out of `layout.xsl`; `bs2:FormControl` boolean overrides relocated +- `lapp:Application` form restrictions scoped to the app-settings flow +- `rdf:type` editable on `ldh:View` instance forms +- Removed bash trace debug from entrypoint + +### Fixed +- Drop just-added block on empty-graph submit +- `btn-remove-resource` removes the outermost duplicate `.block` wrapper when renderers double-wrap + ## [5.4.0] - 2026-06-04 ### Added - Multi-tab document navigation (`Document tabs`) with per-pane modal scoping and cached tab switching (#294, #302) From 75516dc35a9cf19a51821d26f4ae121cf056424b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 20:48:23 +0200 Subject: [PATCH 15/32] Bump version to 5.5.0-SNAPSHOT Co-Authored-By: Claude Opus 4.7 (1M context) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3294574f1..285a709a8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.atomgraph linkeddatahub - 5.4.1-SNAPSHOT + 5.5.0-SNAPSHOT ${packaging.type} AtomGraph LinkedDataHub From 1a15e1f99d855ac7feff2b1fd76699b3dd3bbdce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 22:41:38 +0200 Subject: [PATCH 16/32] Add property-metadata, constraints, and object-metadata to row-form load-set Co-Authored-By: Claude Opus 4.7 (1M context) --- .../linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index 4da3c8006..a5e2ab1c8 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -262,9 +262,12 @@ WHERE ixsl:resolve($context) => ixsl:then(ldh:fetch-and-load-edited-resource#1) => ixsl:then(ldh:fire-load-set-parallel(?, [ - [ function($ctx as map(*)) as map(*) { $ctx }, 'type-metadata-request', 'type-metadata-response', ldh:set-type-metadata#1 ], - [ ldh:load-constructors#1, 'constructors-request', 'constructors-response', ldh:set-constructors#1 ], - [ ldh:load-shapes#1, 'shapes-request', 'shapes-response', ldh:set-shapes#1 ] + [ function($ctx as map(*)) as map(*) { $ctx }, 'type-metadata-request', 'type-metadata-response', ldh:set-type-metadata#1 ], + [ ldh:load-constructors#1, 'constructors-request', 'constructors-response', ldh:set-constructors#1 ], + [ ldh:load-shapes#1, 'shapes-request', 'shapes-response', ldh:set-shapes#1 ], + [ ldh:load-property-metadata#1, 'property-metadata-request', 'property-metadata-response', ldh:set-property-metadata#1 ], + [ ldh:load-constraints#1, 'constraints-request', 'constraints-response', ldh:set-constraints#1 ], + [ ldh:load-object-metadata#1, 'metadata-request', 'metadata-response', ldh:set-object-metadata#1 ] ])) => ixsl:then(ldh:render-row-form#1) => ixsl:finally(ldh:reset-cursor#0) From 92a072476d89377973fac4be41d23235540eb10d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sat, 6 Jun 2026 22:45:41 +0200 Subject: [PATCH 17/32] Carry sd:endpoint() in row-form context map Co-Authored-By: Claude Opus 4.7 (1M context) --- .../linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index a5e2ab1c8..490d6413c 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -255,7 +255,8 @@ WHERE map{ 'request': $request, 'block': $block, - 'about': $about + 'about': $about, + 'endpoint': sd:endpoint() }"/>
    - diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/nfo.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/nfo.xsl index b2230ada7..349b4adfb 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/nfo.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/nfo.xsl @@ -2,6 +2,7 @@ + @@ -14,6 +15,7 @@ xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ac="∾" xmlns:ldh="&ldh;" +xmlns:lapp="&lapp;" xmlns:rdf="&rdf;" xmlns:ldt="&ldt;" xmlns:nfo="&nfo;" @@ -23,7 +25,7 @@ exclude-result-prefixes="#all"> - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/sioc.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/sioc.xsl index b585b7470..e47cf16c0 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/sioc.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/sioc.xsl @@ -2,6 +2,7 @@ + @@ -17,6 +18,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:ac="∾" xmlns:ldh="&ldh;" +xmlns:lapp="&lapp;" xmlns:rdf="&rdf;" xmlns:rdfs="&rdfs;" xmlns:owl="&owl;" @@ -27,7 +29,7 @@ xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2" exclude-result-prefixes="#all"> - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/sp.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/sp.xsl index 481fa22f8..edd9a9b61 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/sp.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/sp.xsl @@ -1,6 +1,7 @@ + @@ -14,6 +15,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:ldh="&ldh;" +xmlns:lapp="&lapp;" xmlns:ac="∾" xmlns:rdf="&rdf;" xmlns:ldt="&ldt;" @@ -22,19 +24,19 @@ xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2" exclude-result-prefixes="#all"> - + - + - + - + From ac69536df7ed5379a9bdcebde87ca1e0889a285b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 00:59:43 +0200 Subject: [PATCH 20/32] Persist GraphMode canvas across re-renders; render dangling and anonymous bnodes - block/view.xsl: introduce a persistent {container-id}-graph-host that holds the 3d-force-graph canvas for the lifetime of the view block. ViewModeChoice replace-content is skipped in GraphMode so the WebGL context and simulation state survive search/filter re-runs; visibility toggles between graph-host and container-results. Result count is rendered post-RenderViewMode and short-circuits the COUNT request when the full result set fits one page. - 3d-force-graph.xsl: emit stub nodes for distinct unresolved @rdf:nodeID targets; emit synthetic bnodes (via generate-id) for anonymous nested rdf:Description; respect show-stubs on @rdf:nodeID links; skip node click + right-click handlers on bnodes (no dereferenceable URI). - navigation.xsl: preserve the user's chosen view mode across re-runs of the same search container instead of defaulting to ListMode. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../bootstrap/2.3.2/client/3d-force-graph.xsl | 86 ++++++++++++-- .../xsl/bootstrap/2.3.2/client/block/view.xsl | 109 +++++++++++++----- .../xsl/bootstrap/2.3.2/client/navigation.xsl | 6 +- 3 files changed, 156 insertions(+), 45 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/3d-force-graph.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/3d-force-graph.xsl index a3c337d6a..a0a1e19eb 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/3d-force-graph.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/3d-force-graph.xsl @@ -157,6 +157,7 @@ + @@ -399,6 +402,19 @@ + + + + + + + + + + + + + @@ -409,6 +425,8 @@ + + @@ -417,6 +435,10 @@ + + + + @@ -435,7 +457,7 @@ - + @@ -481,6 +503,21 @@ + + + + + + + + + + + + + + + @@ -528,19 +565,22 @@ - - + + - - - - - - - - - + + + + + + + + + + + + @@ -578,6 +618,28 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl index d12c7ef10..1bb77ca1c 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl @@ -539,18 +539,36 @@ exclude-result-prefixes="#all" - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -608,22 +626,27 @@ exclude-result-prefixes="#all" - + - + - - ldh:RenderViewMode GraphMode: initial-load= rdf:Description count= rdf:RDF= + + + + + +
    + + - - + - + @@ -643,7 +666,6 @@ exclude-result-prefixes="#all" - @@ -655,8 +677,10 @@ exclude-result-prefixes="#all" - + + + @@ -835,20 +859,12 @@ exclude-result-prefixes="#all"

    + +

    - - - - - - - - - - @@ -874,7 +890,36 @@ exclude-result-prefixes="#all" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl index a979e12c4..ce39a77ed 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl @@ -1420,10 +1420,14 @@ ORDER BY DESC(?created) + + + + - + From 4e76528cc172dbb20d0f4ec81e0fd02924ed76bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 01:00:08 +0200 Subject: [PATCH 21/32] CHANGELOG update Co-Authored-By: Claude Opus 4.7 (1M context) --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e0436f94..e0d4e8be0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,16 @@ - CSR-only helpers moved out of `layout.xsl`; `bs2:FormControl` boolean overrides relocated - `lapp:Application` form restrictions scoped to the app-settings flow - `rdf:type` editable on `ldh:View` instance forms +- GraphMode canvas persisted across view re-renders via a `{container-id}-graph-host` host; WebGL context and force-simulation state survive search/filter re-runs +- GraphMode renders dangling `@rdf:nodeID` targets as stub bnodes and anonymous nested `rdf:Description` as synthetic bnodes (via `generate-id`); node click/right-click handlers skip bnodes +- View mode preserved across re-runs of the same search container instead of defaulting to `ListMode` +- Container result count short-circuits the COUNT request when the full result set fits one page - Removed bash trace debug from entrypoint ### Fixed - Drop just-added block on empty-graph submit - `btn-remove-resource` removes the outermost duplicate `.block` wrapper when renderers double-wrap +- Relative `document('../translations.rdf')` and `document('translations.rdf')` calls in `imports/{nfo,sioc,sp}.xsl`, `admin/layout.xsl`, and `document.xsl` resolved against the SEF root under SaxonJS 3, producing 404s; switched to the absolute `resolve-uri(..., lapp:origin())` pattern ## [5.4.0] - 2026-06-04 ### Added From edea1138196a672eb1b0f27f5666677a28baba68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 01:19:12 +0200 Subject: [PATCH 22/32] Add fullscreen toggle and Esc handler to 3D force graph canvas Bottom-right "Fullscreen" button toggles a .graph-3d-maximized class on the canvas (position: fixed, viewport-sized) so the browser address bar stays visible. Esc exits maximize when any maximized canvas is present; the body keydown template is guarded by a descendant predicate so it doesn't swallow Esc anywhere else. Both paths resync the ForceGraph3D renderer width/height to the new container size. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../atomgraph/linkeddatahub/css/bootstrap.css | 2 ++ .../xsl/bootstrap/2.3.2/client/graph3d.xsl | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css index 0199823ea..510dbd09f 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css @@ -201,6 +201,8 @@ object { display: block; margin: auto; max-height: 400px; overflow: hidden; widt .graph-3d-show-panel label { display: block; cursor: pointer; } .graph-3d-show-panel label.sub-option { margin-left: 16px; } .graph-3d-zoom { position: absolute; top: 10px; left: 10px; z-index: 10; } +.graph-3d-fullscreen { position: absolute; bottom: 10px; right: 10px; z-index: 10; } +.graph-3d-canvas.graph-3d-maximized { position: fixed; top: 0; left: 0; width: 100vw; height: 100vh; z-index: 1000; } .table { display: table; } .row { display: table-row ; } .cell { display: table-cell ; } diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/graph3d.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/graph3d.xsl index 9e85b2da4..bbfff9e59 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/graph3d.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/graph3d.xsl @@ -232,6 +232,37 @@ WHERE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -438,6 +469,7 @@ WHERE
    +     From 5e0f64def63424d60121e3a40069519eaaef11e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 01:31:33 +0200 Subject: [PATCH 23/32] Close topmost modal on Esc key press MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Body-level keydown handler guarded by descendant::div[…modal] so Esc is a no-op when no modal is open and stays available to other widgets. priority="1" wins over the graph3d.xsl body keydown if both predicates ever hold simultaneously — modal dismissal takes precedence. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl index 110e598e1..8c53dc0b1 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl @@ -719,6 +719,14 @@ LIMIT 10     + + + + + + + + From 88fca91ad037384310267d0fc682e5b29f46550b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 01:32:24 +0200 Subject: [PATCH 24/32] CHANGELOG update Co-Authored-By: Claude Opus 4.7 (1M context) --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0d4e8be0..49d3baf3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ ## [5.5.0] - 2026-06-06 +### Added +- GraphMode 3D canvas: bottom-right "Fullscreen" button toggles a CSS-based maximize (viewport-sized, browser address bar stays visible); Esc exits maximize +- Esc key closes the topmost open modal + ### Changed - Jena upgraded to 6.1.0 (#309) - Modal-form metadata fetches converted to async load/set pairs (#310) From b321da8793486874aae468e6367cd5abd18a8964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 02:20:25 +0200 Subject: [PATCH 25/32] Move admin XSLT overrides into shared CSR+SSR chain Admin templates lived in admin/layout.xsl, admin/acl/layout.xsl, and admin/acl/imports/* (SSR-only). After CSR navigation the base end-user templates fired instead, so the admin create dropdown showed end-user classes and admin form/navbar behavior was lost. Moved overrides into the shared modules, gated by the admin-subdomain predicate (lapp:origin()) where they apply to all rdf:RDF/rdf:Description patterns; vocab-typed templates need no guard since their match patterns are namespace-specific: document.xsl bs2:Row (admin class list), bs2:Create (no NamedIndividual) resource.xsl bs2:FormControl (show-subject default) layout.xsl bs2:NavBarNavList (notifications + agent menu) imports/acl.xsl acl:Authorization label, acl:mode FormControl, lacl:AuthorizationRequest form imports/cert.xsl cert:PublicKey label Wired imports/{acl,cert}.xsl into both client.xsl and layout.xsl import lists. Updated static/xsl/admin/layout.xsl to import the base layout directly. Deleted the now-empty admin SSR sidecars. foaf is a slash-vocab so ac:document-uri leaves the term URI intact; the admin bs2:Row override fetches the foaf namespace doc explicitly to hit the SaxonJS documentPool cache instead of XHR-ing the term URI (which the browser blocks as cross-origin). Co-Authored-By: Claude Opus 4.7 (1M context) --- .../xsl/bootstrap/2.3.2/admin/acl/layout.xsl | 114 ------------------ .../xsl/bootstrap/2.3.2/admin/layout.xsl | 112 ----------------- .../xsl/bootstrap/2.3.2/document.xsl | 56 ++++++++- .../2.3.2/{admin/acl => }/imports/acl.xsl | 25 ++-- .../2.3.2/{admin/acl => }/imports/cert.xsl | 12 +- .../xsl/bootstrap/2.3.2/layout.xsl | 86 +++++++++++++ .../xsl/bootstrap/2.3.2/resource.xsl | 15 ++- .../atomgraph/linkeddatahub/xsl/client.xsl | 2 + src/main/webapp/static/xsl/admin/layout.xsl | 2 +- 9 files changed, 173 insertions(+), 251 deletions(-) delete mode 100644 src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/layout.xsl delete mode 100644 src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl rename src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/{admin/acl => }/imports/acl.xsl (96%) rename src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/{admin/acl => }/imports/cert.xsl (75%) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/layout.xsl deleted file mode 100644 index f04f30793..000000000 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/layout.xsl +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - -
      - - -PREFIX dct: -PREFIX prov: -PREFIX foaf: -PREFIX sioc: - -CONSTRUCT -{ - ?authRequest a $type . - ?authRequest rdfs:label ?label . - ?authRequest dct:created ?created . -} -WHERE -{ GRAPH ?authRequestGraph - { ?authRequest a $type ; - rdfs:label ?label . - ?authRequestItem - foaf:primaryTopic ?authRequest ; - sioc:has_container $container - FILTER NOT EXISTS { GRAPH ?authGraph - { ?auth prov:wasDerivedFrom ?authRequest } - } - OPTIONAL - { ?authRequest dct:created ?created } - } -} - ]]> - - - - - - - - -
    • -
      - -
        - - - - - -
      -
      -
      • -       -       - -
    • -
      - -
        -
      • - - - -
        • -
      -
      -
      • -
    -     - - -     - -     \ No newline at end of file diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl deleted file mode 100644 index 398a55e2e..000000000 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - -
    - - -
      - - - - - -
    -
    -     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -     diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl index c8b28ec1c..a6f6942ee 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl @@ -15,6 +15,7 @@ + @@ -698,7 +699,32 @@ extension-element-prefixes="ixsl"
    - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1285,6 +1311,34 @@ extension-element-prefixes="ixsl" + + + + + + +
    + + +
      + + + + + +
    +
    +     + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/imports/acl.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/acl.xsl similarity index 96% rename from src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/imports/acl.xsl rename to src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/acl.xsl index 3652804ba..8dcc854fa 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/imports/acl.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/acl.xsl @@ -1,19 +1,16 @@ + - - - ]> - + - + @@ -72,7 +67,7 @@ exclude-result-prefixes="#all"> - +

    @@ -80,7 +75,7 @@ exclude-result-prefixes="#all">

    - + @@ -95,13 +90,13 @@ exclude-result-prefixes="#all"> - + This form uses RDF/POST encoding: https://atomgraph.github.io/RDF-POST/ - + @@ -229,5 +224,5 @@ exclude-result-prefixes="#all">
    - - \ No newline at end of file + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/imports/cert.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/cert.xsl similarity index 75% rename from src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/imports/cert.xsl rename to src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/cert.xsl index 33abcfb36..f30887e21 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/acl/imports/cert.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/cert.xsl @@ -1,9 +1,8 @@ - - ]> - + - - \ No newline at end of file + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl index 581c1aa25..287c62335 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl @@ -84,6 +84,8 @@ exclude-result-prefixes="#all"> + + @@ -582,6 +584,90 @@ exclude-result-prefixes="#all"> + + + +
      + + +PREFIX dct: +PREFIX prov: +PREFIX foaf: +PREFIX sioc: + +CONSTRUCT +{ + ?authRequest a $type . + ?authRequest rdfs:label ?label . + ?authRequest dct:created ?created . +} +WHERE +{ GRAPH ?authRequestGraph + { ?authRequest a $type ; + rdfs:label ?label . + ?authRequestItem + foaf:primaryTopic ?authRequest ; + sioc:has_container $container + FILTER NOT EXISTS { GRAPH ?authGraph + { ?auth prov:wasDerivedFrom ?authRequest } + } + OPTIONAL + { ?authRequest dct:created ?created } + } +} + ]]> + + + + + + + + +
    • +
      + +
        + + + + + +
      +
      +
      • +       +       + +
    • +
      + +
        +
      • + + + +
        • +
      +
      +
      • +
    +     + + +     + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl index 366fe8417..d9ebc5a57 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl @@ -1386,7 +1386,20 @@ extension-element-prefixes="ixsl" - + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl index 7f64aa183..105e06edd 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl @@ -83,6 +83,8 @@ extension-element-prefixes="ixsl" + + diff --git a/src/main/webapp/static/xsl/admin/layout.xsl b/src/main/webapp/static/xsl/admin/layout.xsl index 2527026ad..8673fc777 100644 --- a/src/main/webapp/static/xsl/admin/layout.xsl +++ b/src/main/webapp/static/xsl/admin/layout.xsl @@ -5,7 +5,7 @@ exclude-result-prefixes="xs"> - + From 0ebde6539b617af1590a7a1e61788f0681b82e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 02:21:17 +0200 Subject: [PATCH 26/32] CHANGELOG update Co-Authored-By: Claude Opus 4.7 (1M context) --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49d3baf3d..fb22a88f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Row-form metadata loading extended with property-metadata, constraints, and object-metadata; `sd:endpoint()` propagated via context map - `bs2:Form` `$required` lifted to a predicate at `rdf:RDF` level - CSR-only helpers moved out of `layout.xsl`; `bs2:FormControl` boolean overrides relocated +- Admin XSLT overrides (`bs2:Row`, `bs2:Create`, `bs2:FormControl`, `bs2:NavBarNavList`) and ACL/cert vocab templates moved out of the SSR-only `admin/` chain into shared `document.xsl`/`resource.xsl`/`layout.xsl` and new `imports/{acl,cert}.xsl`; admin variants gated by an `admin.`-subdomain predicate on `lapp:origin()`. `admin/layout.xsl`, `admin/acl/layout.xsl`, and `admin/acl/imports/*` deleted; `static/xsl/admin/layout.xsl` imports the base layout directly - `lapp:Application` form restrictions scoped to the app-settings flow - `rdf:type` editable on `ldh:View` instance forms - GraphMode canvas persisted across view re-renders via a `{container-id}-graph-host` host; WebGL context and force-simulation state survive search/filter re-runs @@ -21,6 +22,8 @@ - Drop just-added block on empty-graph submit - `btn-remove-resource` removes the outermost duplicate `.block` wrapper when renderers double-wrap - Relative `document('../translations.rdf')` and `document('translations.rdf')` calls in `imports/{nfo,sioc,sp}.xsl`, `admin/layout.xsl`, and `document.xsl` resolved against the SEF root under SaxonJS 3, producing 404s; switched to the absolute `resolve-uri(..., lapp:origin())` pattern +- Admin app dropdowns, form-control defaults, and navbar reverted to end-user variants after CSR navigation because admin overrides only lived in the SSR-only `admin/` chain +- Admin `bs2:Row` `foaf:Person`/`foaf:Group` lookup failed under SaxonJS XHR ("Get failure http://xmlns.com/foaf/0.1/Person") because `ac:document-uri` leaves slash-vocab term URIs intact; override now fetches the `foaf:` namespace doc, hitting the `documentPool` cache ## [5.4.0] - 2026-06-04 ### Added From aa3171608930449bd4bd17f3fd30b4342fa7ef5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 12:18:06 +0200 Subject: [PATCH 27/32] Harden CSR fallout from shared admin override chain Follow-ups to b321da879 (Move admin XSLT overrides into shared CSR+SSR chain). Moving the overrides into client.xsl's import chain exposed three issues that the SSR-only sidecars never hit. imports/acl.xsl lacl:AuthorizationRequest form @action used $ldt:base (the global stylesheet param), which is supplied by the Java pipeline in SSR but declared optional and never passed in CSR. resolve-uri() then failed with a cardinality error on /acl/authorization-requests/{uuid}/. Switched to the ldt:base() function, which reads the active pane's data-base on SaxonJS and the global param on SAXON. document.xsl, resource.xsl, imports/default.xsl Several bs2:Constructor*, bs2:Violation, bs2:RowContentHeader, and bs2:FormControlTypeLabel paths called doc-available() / document() on ac:document-uri() of slash-vocab term URIs (foaf, etc.). On SAXON the Jena catalog resolves these locally; on SaxonJS the browser issues a cross-origin XHR that mixed-content blocks. Split the resolution with use-when: SAXON keeps the raw URI; SaxonJS routes through ldh:href() so the same-origin proxy serves the doc, and uses ixsl:doc-fetched() in place of doc-available() to inspect the documentPool without an extra network probe. css/bootstrap.css Dropped the .brand.admin rule; the admin chevron is now handled by the shared NavBar override and no longer needs a separate brand variant. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../atomgraph/linkeddatahub/css/bootstrap.css | 1 - .../xsl/bootstrap/2.3.2/document.xsl | 5 ++-- .../xsl/bootstrap/2.3.2/imports/acl.xsl | 2 +- .../xsl/bootstrap/2.3.2/imports/default.xsl | 12 ++++++--- .../xsl/bootstrap/2.3.2/resource.xsl | 25 +++++++++++++------ 5 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css index 510dbd09f..67575805b 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css @@ -17,7 +17,6 @@ ul.dropdown-menu { max-height: 26em; overflow-x: hidden; overflow-y: auto; } ul.dropdown-menu ul { margin: 0; } .label { min-width: unset; min-height: unset; } .brand.context { background-image: url('../icons/baseline_arrow_upward_white_18dp.png'); background-repeat: no-repeat; background-position: center center; height: 20px; width: 20px; background-size: 20px 20px; } -.brand.admin { background-image: url('../icons/ic_settings_white_24px.svg'); background-repeat: no-repeat; background-position: right center; padding-right: 30px; } .btn.dropdown-toggle.btn-context { background-image: url('../icons/ic_apps_white_24px.svg'); background-position: center center; background-repeat: no-repeat; width: 34px; height: 34px; } .btn.dropdown-toggle.btn-notifications { background-image: url('../icons/notifications-white-24dp.svg'); background-position: center center; background-repeat: no-repeat; width: 34px; height: 34px; } .btn.dropdown-toggle.btn-apps { background-image: url('../icons/ic_apps_white_24px.svg'); background-position: center center; background-repeat: no-repeat; width: 34px; height: 34px; } diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl index a6f6942ee..2d86b36b1 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl @@ -711,8 +711,9 @@ extension-element-prefixes="ixsl" - - + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/acl.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/acl.xsl index 8dcc854fa..0a3b05cfd 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/acl.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/acl.xsl @@ -60,7 +60,7 @@ exclude-result-prefixes="#all"> - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl index f416cebaa..d1a650266 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl @@ -909,14 +909,17 @@ exclude-result-prefixes="#all" + + + - + - + @@ -1132,8 +1135,11 @@ exclude-result-prefixes="#all" + + + - + Resource diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl index d9ebc5a57..747b5dff0 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl @@ -925,7 +925,9 @@ extension-element-prefixes="ixsl" - + + + @@ -982,14 +984,17 @@ extension-element-prefixes="ixsl" + + + - - +
  • +
    • @@ -1000,8 +1005,10 @@ extension-element-prefixes="ixsl" + + - + @@ -1025,7 +1032,7 @@ extension-element-prefixes="ixsl"
      - + @@ -1508,13 +1515,15 @@ extension-element-prefixes="ixsl" + +
      - + @@ -1526,13 +1535,15 @@ extension-element-prefixes="ixsl" + +
      - + From c75808c31b1089897e7041b44861cc0c773c45e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 13:19:58 +0200 Subject: [PATCH 28/32] Skolemize bnode objects; per-flow render-fn for modal form violations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Skolemizer now covers blank nodes in object position — orphan bnode references (e.g. rdf:_1 [] with no triples about the bnode) were surviving into the graph store as bnode labels because subject-only iteration missed them. Modal-form violation re-render uses a per-flow render-fn stamped by named updating wrappers (ldh:constructor-form-response, ldh:edit-form-response, existing ldh:settings-form-response). The constructor flow now routes through the new ldh:render-constructor-form dispatcher (mode="bs2:Form") so co-shipped peer Descriptions (content blocks) stay visible across the 422 re-render; the edit flow keeps the narrow mode="ldh:DocumentForm" filter. Co-Authored-By: Claude Opus 4.7 (1M context) --- CHANGELOG.md | 7 +- .../PUT-orphan-bnode-object-skolemized.sh | 64 +++++++++++++++++++ .../linkeddatahub/server/util/Skolemizer.java | 21 +++--- .../xsl/bootstrap/2.3.2/client/form.xsl | 19 ++++++ .../xsl/bootstrap/2.3.2/client/modal.xsl | 25 ++++++-- 5 files changed, 119 insertions(+), 17 deletions(-) create mode 100755 http-tests/document-hierarchy/PUT-orphan-bnode-object-skolemized.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index fb22a88f3..24d2f21ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ -## [5.5.0] - 2026-06-06 +## [5.5.0] - 2026-06-07 ### Added - GraphMode 3D canvas: bottom-right "Fullscreen" button toggles a CSS-based maximize (viewport-sized, browser address bar stays visible); Esc exits maximize - Esc key closes the topmost open modal +- HTTP test for orphan bnode object skolemization (`PUT-orphan-bnode-object-skolemized.sh`) ### Changed - Jena upgraded to 6.1.0 (#309) @@ -17,6 +18,8 @@ - View mode preserved across re-runs of the same search container instead of defaulting to `ListMode` - Container result count short-circuits the COUNT request when the full result set fits one page - Removed bash trace debug from entrypoint +- Modal-form per-flow `render-fn` stamping unified via named updating wrappers `ldh:constructor-form-response` and `ldh:edit-form-response` (parallel to existing `ldh:settings-form-response`); fallback removed from `ldh:render-modal-form-violation` +- New `ldh:render-constructor-form#2` dispatcher routes the Container/Item creation violation re-render through `mode="bs2:Form"`; `mode="ldh:DocumentForm"` reserved for the edit flow's narrow `@rdf:about=$about` filter ### Fixed - Drop just-added block on empty-graph submit @@ -24,6 +27,8 @@ - Relative `document('../translations.rdf')` and `document('translations.rdf')` calls in `imports/{nfo,sioc,sp}.xsl`, `admin/layout.xsl`, and `document.xsl` resolved against the SEF root under SaxonJS 3, producing 404s; switched to the absolute `resolve-uri(..., lapp:origin())` pattern - Admin app dropdowns, form-control defaults, and navbar reverted to end-user variants after CSR navigation because admin overrides only lived in the SSR-only `admin/` chain - Admin `bs2:Row` `foaf:Person`/`foaf:Group` lookup failed under SaxonJS XHR ("Get failure http://xmlns.com/foaf/0.1/Person") because `ac:document-uri` leaves slash-vocab term URIs intact; override now fetches the `foaf:` namespace doc, hitting the `documentPool` cache +- `Skolemizer` now covers blank nodes in object position; orphan bnode references (e.g. ` rdf:_1 [ ]` with no further triples) are rewritten to skolem URIs instead of surviving into the graph store as bnode labels +- Container/Item creation modal violation re-render preserves co-shipped peer Descriptions (content blocks); previously the SPIN-violation form lost the default `ldh:ChildrenView` content block referenced by `rdf:_1` ## [5.4.0] - 2026-06-04 ### Added diff --git a/http-tests/document-hierarchy/PUT-orphan-bnode-object-skolemized.sh b/http-tests/document-hierarchy/PUT-orphan-bnode-object-skolemized.sh new file mode 100755 index 000000000..a8c58ee43 --- /dev/null +++ b/http-tests/document-hierarchy/PUT-orphan-bnode-object-skolemized.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env bash +set -euo pipefail + +initialize_dataset "$END_USER_BASE_URL" "$TMP_END_USER_DATASET" "$END_USER_ENDPOINT_URL" +initialize_dataset "$ADMIN_BASE_URL" "$TMP_ADMIN_DATASET" "$ADMIN_ENDPOINT_URL" +purge_cache "$END_USER_VARNISH_SERVICE" +purge_cache "$ADMIN_VARNISH_SERVICE" +purge_cache "$FRONTEND_VARNISH_SERVICE" + +# add agent to the writers group + +add-agent-to-group.sh \ + -f "$OWNER_CERT_FILE" \ + -p "$OWNER_CERT_PWD" \ + --agent "$AGENT_URI" \ + "${ADMIN_BASE_URL}acl/groups/writers/" + +# create a container under root; it becomes the PUT target + +slug=$(uuidgen | tr '[:upper:]' '[:lower:]') + +container=$(create-container.sh \ + -f "$AGENT_CERT_FILE" \ + -p "$AGENT_CERT_PWD" \ + -b "$END_USER_BASE_URL" \ + --title "Test container" \ + --slug "$slug" \ + --parent "$END_USER_BASE_URL") + +# PUT a body where rdf:_1 references a bnode that has NO further triples +# (an orphan blank node in object position). The body is otherwise valid +# (title is present, parent is present), so SPIN constraints pass. +# Expected: 200 OK. + +curl -k -w "%{http_code}\n" -o /dev/null -f -s \ + -E "$AGENT_CERT_FILE":"$AGENT_CERT_PWD" \ + -X PUT \ + -H "Accept: application/n-triples" \ + -H "Content-Type: application/n-triples" \ + --data-binary @- \ + "$container" < . +<${container}> "Test container" . +<${container}> <${END_USER_BASE_URL}> . +<${container}> _:orphan . +EOF + +# fetch the persisted representation and assert: the object of rdf:_1 is a URI, +# never a blank node label. The Skolemizer must have rewritten _:orphan to a +# skolem URI before the graph reached the store. + +response=$(curl -k -f -s -G \ + -E "$AGENT_CERT_FILE":"$AGENT_CERT_PWD" \ + -H "Accept: application/n-triples" \ + "$container") + +rdf_1_line=$(echo "$response" | grep -E "^<${container}> " || true) + +[ -n "$rdf_1_line" ] || exit 1 + +# object of rdf:_1 must be a URI (<...>), not a blank node label (_:...) +! echo "$rdf_1_line" | grep -qE '_:[A-Za-z0-9]+ \.$' +echo "$rdf_1_line" | grep -qE '<\S+> \.$' diff --git a/src/main/java/com/atomgraph/linkeddatahub/server/util/Skolemizer.java b/src/main/java/com/atomgraph/linkeddatahub/server/util/Skolemizer.java index f04ba85e4..c2ed07b09 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/server/util/Skolemizer.java +++ b/src/main/java/com/atomgraph/linkeddatahub/server/util/Skolemizer.java @@ -23,8 +23,9 @@ import jakarta.ws.rs.core.UriBuilder; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.Resource; +import org.apache.jena.rdf.model.Statement; +import org.apache.jena.rdf.model.StmtIterator; import org.apache.jena.util.ResourceUtils; -import org.apache.jena.util.iterator.ExtendedIterator; /** * Skolemizes blank node resources into URI resources. @@ -57,22 +58,22 @@ public Model apply(Model model) { Map bnodes = new HashMap<>(); - ExtendedIterator it = model.listSubjects(). - filterKeep((Resource res) -> (res.isAnon())); + // Cover bnodes in both subject and object position. Subject-only iteration leaks + // orphan bnode object references (e.g. ` rdf:_1 [] .` with no triples + // about the bnode) into the graph store, since their bnode label survives PUT. + StmtIterator stmts = model.listStatements(); try { - while (it.hasNext()) + while (stmts.hasNext()) { - Resource bnode = it.next(); - - final String fragment = "id" + UUID.randomUUID().toString(); // UUID can start with a number which is not legal for a fragment ID - - bnodes.put(bnode, fragment); + Statement stmt = stmts.next(); + if (stmt.getSubject().isAnon()) bnodes.computeIfAbsent(stmt.getSubject(), b -> "id" + UUID.randomUUID()); + if (stmt.getObject().isAnon()) bnodes.computeIfAbsent(stmt.getObject().asResource(), b -> "id" + UUID.randomUUID()); } } finally { - it.close(); + stmts.close(); } bnodes.entrySet().forEach(entry -> diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index 490d6413c..e79f3ac9d 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -613,6 +613,25 @@ WHERE + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl index 8c53dc0b1..95cb21bdd 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl @@ -729,10 +729,11 @@ LIMIT 10 - + - + + @@ -905,7 +906,8 @@ LIMIT 10 - + + @@ -1390,7 +1392,18 @@ LIMIT 10 - + + + + + + + + + + + + @@ -1806,7 +1819,7 @@ LIMIT 10 on-failure="ldh:promise-failure#1"/> - + @@ -1821,7 +1834,7 @@ LIMIT 10 'shapes': (), 'required': function($r as element()) as xs:boolean { $r/rdf:type/@rdf:resource = ('&dh;Container', '&dh;Item') } }), map{ 'duplicates': 'use-last' })"/> - + From 6b4aa7badc951161891e28d51dc91d161c0532b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 18:53:05 +0200 Subject: [PATCH 29/32] Share pure constructor build across CREATE/EDIT/violation flows EDIT and violation re-render fetched SHACL shapes but skipped the SPIN constructor merge, so bs2:FormControl's SHACL branch silently dropped SPIN-defined property templates for classes with both (e.g. skos:Concept). Extract ldh:instantiate-constructor, ldh:merge-constructors, and ldh:build-merged-constructor into imports/default.xsl, wire ldh:load-constructed-doc into the EDIT and violation promise chains, and pass the merged constructor via the 'constructor' tunnel. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../xsl/bootstrap/2.3.2/client/form.xsl | 88 +++++--------- .../xsl/bootstrap/2.3.2/client/functions.xsl | 4 +- .../xsl/bootstrap/2.3.2/imports/default.xsl | 109 ++++++++++++++++++ 3 files changed, 140 insertions(+), 61 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl index e79f3ac9d..70324486f 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/form.xsl @@ -258,12 +258,13 @@ WHERE 'about': $about, 'endpoint': sd:endpoint() }"/> - + - + - - - - - - - - + - + @@ -512,18 +504,24 @@ WHERE + + - + + + + + @@ -1022,15 +1020,17 @@ WHERE map{ 'body': $body, 'types': $types, + 'forClass': $types, 'endpoint': sd:endpoint(), 'property-uris': distinct-values($body/rdf:RDF/*[not(@rdf:about = $doc-uri)]/*/concat(namespace-uri(), local-name())), 'object-uris': distinct-values($body/rdf:RDF/*/*/@rdf:resource[not(key('resources', .))]) } ), map{ 'duplicates': 'use-last' })"/> - + - + @@ -1055,17 +1053,21 @@ WHERE + + + + @@ -1299,10 +1301,7 @@ WHERE - + @@ -1314,45 +1313,16 @@ WHERE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl index d1a650266..2590641c5 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl @@ -269,6 +269,115 @@ exclude-result-prefixes="#all" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3a1f7d5be06646c7cc45f73174e2b13652e5b9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 19:05:09 +0200 Subject: [PATCH 30/32] CHANGELOG update Co-Authored-By: Claude Opus 4.7 (1M context) --- CHANGELOG.md | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24d2f21ef..f15876cfe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,34 +1,32 @@ ## [5.5.0] - 2026-06-07 ### Added -- GraphMode 3D canvas: bottom-right "Fullscreen" button toggles a CSS-based maximize (viewport-sized, browser address bar stays visible); Esc exits maximize -- Esc key closes the topmost open modal -- HTTP test for orphan bnode object skolemization (`PUT-orphan-bnode-object-skolemized.sh`) +- GraphMode 3D canvas Fullscreen toggle (CSS maximize, Esc exits) +- Esc closes topmost modal +- HTTP test for orphan bnode object skolemization ### Changed - Jena upgraded to 6.1.0 (#309) -- Modal-form metadata fetches converted to async load/set pairs (#310) -- Row-form metadata loading extended with property-metadata, constraints, and object-metadata; `sd:endpoint()` propagated via context map +- Modal- and row-form metadata fetches converted to async load/set pairs; row-form chain extended with property-metadata, constraints, object-metadata; `sd:endpoint()` carried in context (#310) - `bs2:Form` `$required` lifted to a predicate at `rdf:RDF` level - CSR-only helpers moved out of `layout.xsl`; `bs2:FormControl` boolean overrides relocated -- Admin XSLT overrides (`bs2:Row`, `bs2:Create`, `bs2:FormControl`, `bs2:NavBarNavList`) and ACL/cert vocab templates moved out of the SSR-only `admin/` chain into shared `document.xsl`/`resource.xsl`/`layout.xsl` and new `imports/{acl,cert}.xsl`; admin variants gated by an `admin.`-subdomain predicate on `lapp:origin()`. `admin/layout.xsl`, `admin/acl/layout.xsl`, and `admin/acl/imports/*` deleted; `static/xsl/admin/layout.xsl` imports the base layout directly +- Admin XSLT overrides (`bs2:Row`, `bs2:Create`, `bs2:FormControl`, `bs2:NavBarNavList`) and ACL/cert vocab templates moved from the SSR-only `admin/` chain into shared `document.xsl`/`resource.xsl`/`layout.xsl` and new `imports/{acl,cert}.xsl`; gated by `admin.`-subdomain on `lapp:origin()` - `lapp:Application` form restrictions scoped to the app-settings flow - `rdf:type` editable on `ldh:View` instance forms -- GraphMode canvas persisted across view re-renders via a `{container-id}-graph-host` host; WebGL context and force-simulation state survive search/filter re-runs -- GraphMode renders dangling `@rdf:nodeID` targets as stub bnodes and anonymous nested `rdf:Description` as synthetic bnodes (via `generate-id`); node click/right-click handlers skip bnodes -- View mode preserved across re-runs of the same search container instead of defaulting to `ListMode` -- Container result count short-circuits the COUNT request when the full result set fits one page +- GraphMode canvas persisted across view re-renders via a `{container-id}-graph-host`; WebGL context and force-simulation state survive search/filter re-runs; dangling `@rdf:nodeID` and anonymous nested `rdf:Description` rendered as bnodes; click handlers skip bnodes +- View mode preserved across re-runs of the same search container +- Container result count short-circuits COUNT when the result set fits one page - Removed bash trace debug from entrypoint -- Modal-form per-flow `render-fn` stamping unified via named updating wrappers `ldh:constructor-form-response` and `ldh:edit-form-response` (parallel to existing `ldh:settings-form-response`); fallback removed from `ldh:render-modal-form-violation` -- New `ldh:render-constructor-form#2` dispatcher routes the Container/Item creation violation re-render through `mode="bs2:Form"`; `mode="ldh:DocumentForm"` reserved for the edit flow's narrow `@rdf:about=$about` filter +- Modal-form per-flow `render-fn` stamping unified via `ldh:constructor-form-response` / `ldh:edit-form-response` (parallel to `ldh:settings-form-response`); new `ldh:render-constructor-form#2` routes Container/Item creation violation re-render through `mode="bs2:Form"`, leaving `mode="ldh:DocumentForm"` for the edit flow ### Fixed - Drop just-added block on empty-graph submit -- `btn-remove-resource` removes the outermost duplicate `.block` wrapper when renderers double-wrap -- Relative `document('../translations.rdf')` and `document('translations.rdf')` calls in `imports/{nfo,sioc,sp}.xsl`, `admin/layout.xsl`, and `document.xsl` resolved against the SEF root under SaxonJS 3, producing 404s; switched to the absolute `resolve-uri(..., lapp:origin())` pattern -- Admin app dropdowns, form-control defaults, and navbar reverted to end-user variants after CSR navigation because admin overrides only lived in the SSR-only `admin/` chain -- Admin `bs2:Row` `foaf:Person`/`foaf:Group` lookup failed under SaxonJS XHR ("Get failure http://xmlns.com/foaf/0.1/Person") because `ac:document-uri` leaves slash-vocab term URIs intact; override now fetches the `foaf:` namespace doc, hitting the `documentPool` cache -- `Skolemizer` now covers blank nodes in object position; orphan bnode references (e.g. ` rdf:_1 [ ]` with no further triples) are rewritten to skolem URIs instead of surviving into the graph store as bnode labels -- Container/Item creation modal violation re-render preserves co-shipped peer Descriptions (content blocks); previously the SPIN-violation form lost the default `ldh:ChildrenView` content block referenced by `rdf:_1` +- `btn-remove-resource` removes outermost duplicate `.block` wrapper +- Relative `document('translations.rdf')` calls in `imports/{nfo,sioc,sp}.xsl`, `admin/layout.xsl`, `document.xsl` 404'd against the SEF root under SaxonJS 3; switched to absolute `resolve-uri(..., lapp:origin())` +- Admin dropdowns, form-control defaults, and navbar reverted to end-user variants after CSR navigation (overrides only lived in the SSR `admin/` chain) +- Admin `bs2:Row` `foaf:Person`/`foaf:Group` lookup failed under SaxonJS XHR because `ac:document-uri` leaves slash-vocab term URIs intact; override now fetches the namespace doc +- `Skolemizer` covers blank nodes in object position; orphan bnode references (e.g. ` rdf:_1 [ ]`) rewritten to skolem URIs +- Container/Item modal violation re-render preserves co-shipped peer Descriptions (default `ldh:ChildrenView` content block was lost) +- EDIT and violation re-render were missing the SPIN-constructor merge that CREATE performs; `bs2:FormControl`'s SHACL branch silently dropped SPIN-defined property templates for classes with both (e.g. `skos:Concept`); merge extracted into shared `ldh:build-merged-constructor` and wired into both flows via the `constructor` tunnel ## [5.4.0] - 2026-06-04 ### Added From 9d22737a43936975af26028191ddbe171a208513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 19:11:40 +0200 Subject: [PATCH 31/32] Fix javadoc error: unresolved JsonLDReadContext link JsonLDReadContext doesn't exist anywhere in the codebase; switch to {@code} so javadoc doesn't try to resolve it. Unblocks release builds. Co-Authored-By: Claude Opus 4.7 (1M context) --- src/main/java/com/atomgraph/linkeddatahub/io/JsonLDReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/atomgraph/linkeddatahub/io/JsonLDReader.java b/src/main/java/com/atomgraph/linkeddatahub/io/JsonLDReader.java index bdaa92e37..2fccd75f3 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/io/JsonLDReader.java +++ b/src/main/java/com/atomgraph/linkeddatahub/io/JsonLDReader.java @@ -65,7 +65,7 @@ * It is also possible to define the different options supported * by JSONLD-java using the {@link #JSONLD_OPTIONS} Symbol * - * The {@link JsonLDReadContext} is a convenience class that extends Context and + * The {@code JsonLDReadContext} is a convenience class that extends Context and * provides methods to set the values of these different Symbols that are used in controlling the writing of JSON-LD. * Note: it is possible to override jsonld's "@context" value by providing one, * using a {@link org.apache.jena.sparql.util.Context}, and setting the {@link JsonLDReader#JSONLD_CONTEXT} Symbol's value From 8245442702c8d1b6d46a3e0e5229a49c49ed2c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 7 Jun 2026 23:25:01 +0200 Subject: [PATCH 32/32] HTML+JSON-LD reader (#312) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Extract JSON-LD from HTML on the proxy path HtmlJsonLDReader replaces the old JsonLDReader: a thin Jsoup-based wrapper that finds every +EOF +) \ +| grep -q "$STATUS_NO_CONTENT" + +# check that the triple from the embedded JSON-LD is queryable + +curl -k -f -s -G \ + -E "$AGENT_CERT_FILE":"$AGENT_CERT_PWD" \ + -H "Accept: application/n-triples" \ +"$END_USER_BASE_URL" \ +| tr -d '\n' \ +| grep '"named object HTML/JSON-LD POST"' > /dev/null diff --git a/http-tests/proxy/GET-proxied-html-jsonld.sh b/http-tests/proxy/GET-proxied-html-jsonld.sh new file mode 100755 index 000000000..28e4fd972 --- /dev/null +++ b/http-tests/proxy/GET-proxied-html-jsonld.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash +set -euo pipefail + +initialize_dataset "$END_USER_BASE_URL" "$TMP_END_USER_DATASET" "$END_USER_ENDPOINT_URL" +initialize_dataset "$ADMIN_BASE_URL" "$TMP_ADMIN_DATASET" "$ADMIN_ENDPOINT_URL" +purge_cache "$END_USER_VARNISH_SERVICE" +purge_cache "$ADMIN_VARNISH_SERVICE" +purge_cache "$FRONTEND_VARNISH_SERVICE" + +# add agent to the readers group to be able to read documents + +add-agent-to-group.sh \ + -f "$OWNER_CERT_FILE" \ + -p "$OWNER_CERT_PWD" \ + --agent "$AGENT_URI" \ + "${ADMIN_BASE_URL}acl/groups/readers/" + +# Regression: when an upstream proxied URI returns text/html (e.g. a schema.org term page) +# but embeds JSON-LD via + + """.formatted(EX); + + Model model = parse(html); + + assertTrue(model.contains( + ResourceFactory.createResource(EX + "alice"), + ResourceFactory.createProperty(EX, "name"), + "Alice")); + assertTrue(model.contains( + ResourceFactory.createResource(EX + "alice"), + org.apache.jena.vocabulary.RDF.type, + ResourceFactory.createResource(EX + "Person"))); + } + + @Test + public void testMultipleScriptsAreMerged() + { + String html = """ + + + + + """.formatted(EX, EX); + + Model model = parse(html); + + assertTrue(model.contains( + ResourceFactory.createResource(EX + "alice"), + ResourceFactory.createProperty(EX, "name"), + "Alice")); + assertTrue(model.contains( + ResourceFactory.createResource(EX + "bob"), + ResourceFactory.createProperty(EX, "name"), + "Bob")); + } + + @Test + public void testMissingScriptThrows() + { + String html = "no jsonld

      nothing

      "; + + assertThrows(RiotParseException.class, () -> parse(html)); + } + + @Test + public void testOtherScriptTypesIgnored() + { + // a non-ld+json + + + """.formatted(EX); + + Model model = parse(html); + + assertTrue(model.contains( + ResourceFactory.createResource(EX + "alice"), + ResourceFactory.createProperty(EX, "name"), + "Alice")); + assertFalse(model.contains( + ResourceFactory.createResource(EX + "js"), + ResourceFactory.createProperty(EX, "name"), + "JS")); + } + + @Test + public void testSameOutputAsDirectJsonLdParse() + { + // the HTML reader must be a transparent wrapper around Jena's JSON-LD11 reader: + // wrapping the same payload in HTML must yield exactly the same model as parsing the payload directly + String jsonLd = """ + { + "@context": {"ex": "%s", "name": {"@id": "ex:name"}}, + "@id": "ex:alice", + "@type": "ex:Person", + "name": "Alice" + } + """.formatted(EX); + String html = ""; + + Model direct = ModelFactory.createDefaultModel(); + RDFParser.create(). + source(new ByteArrayInputStream(jsonLd.getBytes(StandardCharsets.UTF_8))). + lang(Lang.JSONLD11). + base(BASE_URI). + parse(StreamRDFLib.graph(direct.getGraph())); + + Model viaHtml = parse(html); + + assertEquals(direct.size(), viaHtml.size()); + assertTrue(direct.isIsomorphicWith(viaHtml)); + } + +}