From 15e8379302c76620abfc106cd164eacdc86879e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Wed, 15 Apr 2026 23:45:50 +0200 Subject: [PATCH 01/10] Add external document tabs and fix related CSS/XPath regressions (#293) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Render proxied external documents in tab panes (bs2:TabBody/ldh:CreateTab/ldh:ActivateTab/ldh:RenderTabPane) - Convert breadcrumb-nav from id to CSS class to support per-pane breadcrumbs; populate breadcrumbs in external tab panes; extract ldh:PopulateBreadcrumbNav named template to DRY up local/external breadcrumb logic - Fix CSS block border selectors: #content-body → .content-body, add intermediate container-fluid level - Narrow btn-edit and btn-create-chart match patterns to require .block ancestor, preventing false matches on action-bar - Fix drag handler match patterns: update stale direct-child path to match new two-level content-body/container-fluid/block structure - Fix modal content-body lookup: use ancestor:: for action-bar buttons, active tab-pane for global buttons, so modals append to the visible pane for proxied documents - Remove dead document-mode-tabs template and broken progress bar update targeting hidden #content-body - Remove unused getModes() override from XSLTWriterBase Co-Authored-By: Claude Sonnet 4.6 --- .../linkeddatahub/writer/XSLTWriterBase.java | 17 - .../atomgraph/linkeddatahub/css/bootstrap.css | 26 +- .../xsl/bootstrap/2.3.2/admin/acl/layout.xsl | 12 - .../xsl/bootstrap/2.3.2/client/block.xsl | 235 ++++---- .../bootstrap/2.3.2/client/block/chart.xsl | 2 +- .../bootstrap/2.3.2/client/block/query.xsl | 2 +- .../xsl/bootstrap/2.3.2/client/form.xsl | 28 +- .../xsl/bootstrap/2.3.2/client/functions.xsl | 45 +- .../bootstrap/2.3.2/client/merge-rdfxml.xsl | 2 +- .../xsl/bootstrap/2.3.2/client/modal.xsl | 10 +- .../xsl/bootstrap/2.3.2/document.xsl | 160 +++++- .../xsl/bootstrap/2.3.2/imports/default.xsl | 33 +- .../xsl/bootstrap/2.3.2/layout.xsl | 183 ++----- .../xsl/bootstrap/2.3.2/resource.xsl | 4 +- .../atomgraph/linkeddatahub/xsl/client.xsl | 511 +++++++++++++----- 15 files changed, 770 insertions(+), 500 deletions(-) diff --git a/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java b/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java index 00818c9de..31d319233 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java +++ b/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java @@ -90,7 +90,6 @@ public abstract class XSLTWriterBase extends com.atomgraph.client.writer.XSLTWri @Inject jakarta.inject.Provider> application; @Inject jakarta.inject.Provider dataManager; @Inject jakarta.inject.Provider xsltExecSupplier; - @Inject jakarta.inject.Provider> modes; @Inject jakarta.inject.Provider crc; @Inject jakarta.inject.Provider> authorizationContext; @@ -314,22 +313,6 @@ public XsltExecutable getXsltExecutable() return xsltExecSupplier.get().get(); } - @Override - public List getModes(Set namespaces) - { - return getModes().stream().map(Mode::get).collect(Collectors.toList()); - } - - /** - * Returns a list of enabled layout modes. - * - * @return list of modes - */ - public List getModes() - { - return modes.get(); - } - @Override public Set getSupportedNamespaces() { 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 c4e40f8f1..963a7a93d 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css @@ -1,5 +1,16 @@ html { height: 100%; } -body { height: calc(100% - 120px); padding-top: 120px; padding-bottom: 0; } +/* only the main navbar is fixed-top now; tab bar + action bar are sticky inside #tab-body */ +body { height: calc(100% - 55px); padding-top: 55px; padding-bottom: 0; } +#tab-bar { position: sticky; top: 55px; z-index: 1000; margin-bottom: 0; } +/* Override Bootstrap's overflow:auto which would make action-bar sticky relative to #tab-content instead of the viewport */ +#tab-content { overflow: visible; } +#tab-bar .navbar-inner { min-height: 36px; padding: 4px 0; background: #ccc; box-shadow: none; } +#tab-bar .nav-tabs { border-bottom: none; } +#tab-bar .nav-tabs > li > a { padding: 4px 10px; max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: #555; display: inline-block; } +#tab-bar .nav-tabs > li > a:hover { color: #222; } +#tab-bar .nav-tabs > li.active > a, #tab-bar .nav-tabs > li.active > a:hover { color: #333; background-color: #fff; border-color: #aaa #aaa transparent; } +#tab-bar .tab-close { margin-left: 4px; font-size: 10px; color: #888; cursor: pointer; vertical-align: middle; } +#tab-bar .tab-close:hover { color: #333; } body.embed { padding-top: 0; } ul.dropdown-menu { max-height: 26em; overflow-x: hidden; overflow-y: auto; } ul.dropdown-menu ul { margin: 0; } @@ -17,16 +28,17 @@ ul.dropdown-menu ul { margin: 0; } .navbar-form .input-append { margin-top: 10px; } .navbar-form .input-append select { margin-top: 0; height: 34px; } .navbar-form .btn-search { background-image: url('../icons/ic_search_white_24px.svg'); background-position: center center; background-repeat: no-repeat; width: 34px; height: 34px; } -.action-bar { background-color: #dfdfdf; } +.action-bar { position: sticky; top: var(--action-bar-top, 55px); z-index: 999; background: #dfdfdf; padding: 0; box-shadow: none; } .action-bar form { margin-bottom: 0; } .action-bar .span7 .row-fluid > * { margin-top: 10px; } +.action-bar .row-fluid > .span2, .action-bar .row-fluid > .span3 { margin-top: 10px; } .action-bar .add-constructor, .dropdown-menu .add-constructor { background-color: inherit; display: block; text-align: left; width: 100%; } .action-bar .add-constructor:hover { color: #ffffff; background-color: #007af5; } .action-bar .breadcrumb { background-color: inherit; margin-bottom: 0; padding-left: 0; padding-top: 5px; } .action-bar .breadcrumb .container-logo { background-image: url('../icons/folder.svg'); background-position: left center; background-repeat: no-repeat; padding-left: 28px; } .action-bar .breadcrumb .item-logo { background-image: url('../icons/file.svg'); background-position: left center; background-repeat: no-repeat; padding-left: 28px; } .action-bar .breadcrumb .btn-group { margin-top: -4px; } -.action-bar #breadcrumb-nav > .label-info { padding: 8px 15px; margin-right: 8px; font-size: inherit; background-color: #9954bb; } +.action-bar .breadcrumb-nav > .label-info { padding: 8px 15px; margin-right: 8px; font-size: inherit; background-color: #9954bb; } .action-bar #doc-controls { text-align: right; padding-top: 5px; } .action-bar #doc-controls .btn-edit { margin-top: -5px; margin-left: 10px; } .action-bar p.alert { margin-bottom: 0; } @@ -107,10 +119,10 @@ li button.btn-edit-constructors, li button.btn-add-data, li button.btn-add-ontol .caret.caret-reversed { border-bottom: 4px solid #000000; border-top-width: 0; } .faceted-nav input[type=checkbox]:checked + span { font-weight: bold; } .parallax-nav a { cursor: pointer; } -#content-body { min-height: calc(100% - 14em); } -#content-body > [about].row-fluid { overflow-x: auto; margin-bottom: 20px; } -#content-body > [about].row-fluid, .constructor-triple.row-fluid { border-bottom: 2px solid rgb(223, 223, 223); } -#content-body > [about].row-fluid.drag-over { border-bottom: 4px dotted #0f82f5; } +.content-body { min-height: calc(100% - 14em); } +.content-body > [about] > [about].row-fluid { overflow-x: auto; margin-bottom: 20px; } +.content-body > [about] > [about].row-fluid, .constructor-triple.row-fluid { border-bottom: 2px solid rgb(223, 223, 223); } +.content-body > [about] > [about].row-fluid.drag-over { border-bottom: 4px dotted #0f82f5; } .row-fluid.block { max-height: 80em; } .row-fluid.block .drag-handle { display: none; width: 30px; background-color: #149bdf; background-image: radial-gradient(circle at 3px 3px, #0480be 1px, transparent 1.5px); background-size: 6px 6px; border-radius: 2px; cursor: move; } .list-mode.active { background-image: url('../icons/ic_navigate_before_black_24px.svg'); } 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 index 0c4a69c4f..08664947c 100644 --- 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 @@ -32,18 +32,6 @@ exclude-result-prefixes="#all">
    - - 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 49a4833e4..ca2ecde5c 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 @@ -181,53 +181,59 @@ exclude-result-prefixes="#all" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -325,7 +331,7 @@ exclude-result-prefixes="#all" - + @@ -348,75 +354,100 @@ exclude-result-prefixes="#all" - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - - - - + - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl index 0f17e1fdb..33398d72a 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl @@ -584,7 +584,7 @@ exclude-result-prefixes="#all" - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl index d1aef2a84..5865b494a 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl @@ -449,7 +449,7 @@ exclude-result-prefixes="#all" - + 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 ef590b72d..8ed6f80d9 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 @@ -233,36 +233,11 @@ WHERE - - - + @@ -907,7 +882,6 @@ WHERE - 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 d121bd30e..7868627af 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 @@ -41,8 +41,8 @@ exclude-result-prefixes="#all" - - + + @@ -54,7 +54,7 @@ exclude-result-prefixes="#all" - + @@ -67,7 +67,7 @@ exclude-result-prefixes="#all" - + @@ -79,27 +79,24 @@ exclude-result-prefixes="#all" )"/> - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/merge-rdfxml.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/merge-rdfxml.xsl index b9219fecd..9e0e05698 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/merge-rdfxml.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/merge-rdfxml.xsl @@ -21,7 +21,7 @@ - + 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 091c3a4af..765ee622a 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 @@ -154,14 +154,14 @@ LIMIT 10
    • -
    • - + +
        +
      • + +
        • +
      + + + + @@ -179,7 +203,7 @@ extension-element-prefixes="ixsl"
      - + @@ -242,19 +266,76 @@ extension-element-prefixes="ixsl" + + + + + + + + + + + + + + + +
      + +
      + + +
      + +
      +       + +
      + +
      + + +       +       + - + - +
      -
      + + + + + + + + +
      + + + + + + + + + + + + + + + + + + + + + +
      +       + @@ -394,13 +508,41 @@ extension-element-prefixes="ixsl"
      + + + + + + +
      + + + + + + + +
      +
      + + + + + + + +
      +
      +
      +       + - +

      @@ -429,7 +571,7 @@ extension-element-prefixes="ixsl" - +

      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 42b0bf1d8..e15ede21a 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 @@ -74,11 +74,10 @@ exclude-result-prefixes="#all" - - + + - @@ -108,6 +107,10 @@ exclude-result-prefixes="#all" + + + + @@ -145,13 +148,13 @@ exclude-result-prefixes="#all" - + - + - + @@ -167,6 +170,24 @@ exclude-result-prefixes="#all" + + + + + + + + + + + + + + + + + + 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 55993ef4f..7cd5e714d 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 @@ -102,7 +102,7 @@ exclude-result-prefixes="#all"> - + @@ -117,10 +117,6 @@ exclude-result-prefixes="#all"> - - - - @@ -142,6 +138,9 @@ exclude-result-prefixes="#all"> + + + @@ -362,14 +361,14 @@ exclude-result-prefixes="#all"> - - - - - - - - + + + + + + + + @@ -552,7 +551,7 @@ exclude-result-prefixes="#all"> - +
      - - - -
      @@ -778,28 +773,44 @@ exclude-result-prefixes="#all">
      - - - - -
      -
      -
      -
      +
      + + + + +
      + + + + +
      +
      +
      +
      +
      +
      +
      +       + + + + + +       +
      +
      - + @@ -937,32 +948,6 @@ exclude-result-prefixes="#all">
      - - - - -
      - - -
        -
      • - -
        • -
      -
      -       - - @@ -1018,83 +1003,7 @@ exclude-result-prefixes="#all"> - - - - - - - -
      - - - - - - - -
      -
      - - - - - - - -
      -
      -
      -       - - - - - - - -
      - -
      - - -
      - -
      -       - -
      - -
      - - - - -       -       + 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 f810b7f68..bbe5c6241 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 @@ -62,8 +62,6 @@ exclude-result-prefixes="#all" extension-element-prefixes="ixsl" > - - @@ -403,7 +401,7 @@ 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 eddd638c5..538aeacf3 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl @@ -115,11 +115,12 @@ extension-element-prefixes="ixsl" - + + @@ -288,6 +289,9 @@ WHERE + + + @@ -302,7 +306,7 @@ WHERE - + @@ -483,7 +487,25 @@ WHERE - + + + + + + + + +
        + + + + + @@ -491,42 +513,14 @@ WHERE - - - - - - - - - - - - - - - - - - - - - - - -
          - -
        - - - - + + + + + + + + @@ -568,35 +562,85 @@ WHERE - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + @@ -616,9 +660,9 @@ WHERE - - - + + + @@ -687,6 +731,137 @@ WHERE + + + + + + + + + + + + +
      • + + + +
        • +         +         + + + + + + + + + + + + + + + +
      • + + + + × +
        • +         + + + + +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -843,7 +1018,7 @@ WHERE - + @@ -886,7 +1061,8 @@ WHERE - + + @@ -960,7 +1136,7 @@ WHERE - + @@ -1015,9 +1191,6 @@ WHERE - - - @@ -1294,89 +1467,131 @@ WHERE - - - + + - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + - - Aborting HTTP request that has already been sent - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - Importing RDF file. Name: '' Media type: '' - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Importing RDF file. Name: '' Media type: '' + + + + + + + + + + + + + + + + @@ -1397,7 +1612,7 @@ WHERE - +
        -         -
        - -
        +
        + +
        - +
        + +
        +         From 18dd437389e38195c03715a84b79223dbb05eadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Thu, 16 Apr 2026 13:25:11 +0200 Subject: [PATCH 03/10] Ignore clicks on disabled edit button in modal click handler Add [not(contains-token(@class, 'disabled'))] predicate to the btn-edit match template so that clicking a disabled edit button does not open the edit modal. Co-Authored-By: Claude Sonnet 4.6 --- .../linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 765ee622a..3ee050e24 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 @@ -802,7 +802,7 @@ LIMIT 10 - + From e34db78de72c5b38b3e5779a81992b12d54ec39c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 19 Apr 2026 13:47:51 +0200 Subject: [PATCH 04/10] Refactor external doc tabs: per-URI panes, data-* state, tab-pane-id param MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace LinkedDataHub.tabs/tab-counter JS registry with data-uri/data-endpoint attributes directly on tab
      • elements; sd:endpoint() now reads from dataset - Give each external document its own tab pane (one per URI) instead of a shared external pane; tab pane visibility toggled via display:none/block - Rename ldh:CreateTab → ldh:AddTabNavBarListItem (no longer handles rendering); ldh:RenderTab now accepts $tab-pane-id (xs:string) instead of $tab-pane element, since the element is detached after ixsl:replace-element - ProxyRequestFilter: inject MediaTypes, throw NotAcceptableException on no variant match instead of silently returning; remove manual HTML Accept-header inspection - Remove $ac:uri XSLT param and related proxy-target plumbing from XSLTWriterBase and layout.xsl; remove LDH.access_to vocabulary property - Switch service document fetches from ac:build-uri() to ldh:href() throughout - Move srx:sparql bs2:ContentBody template from layout.xsl to document.xsl Co-Authored-By: Claude Sonnet 4.6 --- .../filter/request/ProxyRequestFilter.java | 36 +- .../linkeddatahub/vocabulary/LDH.java | 3 - .../linkeddatahub/writer/XSLTWriterBase.java | 14 +- .../atomgraph/linkeddatahub/css/bootstrap.css | 19 +- .../xsl/bootstrap/2.3.2/admin/signup.xsl | 2 +- .../bootstrap/2.3.2/client/block/chart.xsl | 2 +- .../bootstrap/2.3.2/client/block/query.xsl | 8 +- .../xsl/bootstrap/2.3.2/client/block/view.xsl | 2 +- .../xsl/bootstrap/2.3.2/client/functions.xsl | 9 +- .../xsl/bootstrap/2.3.2/client/navigation.xsl | 2 +- .../xsl/bootstrap/2.3.2/document.xsl | 54 ++- .../xsl/bootstrap/2.3.2/layout.xsl | 58 +-- .../atomgraph/linkeddatahub/xsl/client.xsl | 393 ++++++++---------- .../request/ProxyRequestFilterTest.java | 161 ------- 14 files changed, 262 insertions(+), 501 deletions(-) delete mode 100644 src/test/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilterTest.java diff --git a/src/main/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilter.java b/src/main/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilter.java index 23f635a00..3db4bfbbe 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilter.java +++ b/src/main/java/com/atomgraph/linkeddatahub/server/filter/request/ProxyRequestFilter.java @@ -16,7 +16,7 @@ */ package com.atomgraph.linkeddatahub.server.filter.request; -import com.atomgraph.core.MediaTypes; +import com.atomgraph.client.MediaTypes; import com.atomgraph.client.util.HTMLMediaTypePredicate; import com.atomgraph.client.vocabulary.AC; import com.atomgraph.core.exception.BadGatewayException; @@ -102,11 +102,11 @@ public class ProxyRequestFilter implements ContainerRequestFilter { private static final Logger log = LoggerFactory.getLogger(ProxyRequestFilter.class); - private static final MediaTypes MEDIA_TYPES = new MediaTypes(); private static final Pattern LINK_SPLITTER = Pattern.compile(",(?=\\s*<)"); @Inject com.atomgraph.linkeddatahub.Application system; @Inject jakarta.inject.Provider> ontology; + @Inject MediaTypes mediaTypes; @Context Request request; @Override @@ -117,26 +117,24 @@ public void filter(ContainerRequestContext requestContext) throws IOException URI targetURI = targetOpt.get(); - // do not proxy requests from clients that explicitly accept (X)HTML — they expect the app shell, - // which the downstream handler serves. Browsers list text/html as a non-wildcard type; pure API - // clients (curl etc.) send only */* and must reach the proxy. - // Defending against resource exhaustion: proxying + full server-side XSLT rendering for arbitrary - // external URIs on every browser request would amplify CPU and connection-pool load unboundedly. - boolean clientAcceptsHtml = requestContext.getAcceptableMediaTypes().stream() - .anyMatch(mt -> !mt.isWildcardType() && !mt.isWildcardSubtype() && - (mt.isCompatible(MediaType.TEXT_HTML_TYPE) || - mt.isCompatible(MediaType.APPLICATION_XHTML_XML_TYPE))); - if (clientAcceptsHtml) return; - // negotiate the response format from RDF/SPARQL writable types + // skip filter if (X)HTML is the selected variant - we don't offer it for proxied responses List writableTypes = new ArrayList<>(getMediaTypes().getWritable(Model.class)); writableTypes.addAll(getMediaTypes().getWritable(ResultSet.class)); List variants = com.atomgraph.core.model.impl.Response.getVariants( writableTypes, getSystem().getSupportedLanguages(), new ArrayList<>()); - Variant selectedVariant = getRequest().selectVariant(variants); - if (selectedVariant == null) return; // client accepts no RDF/SPARQL type + + Variant variant = getRequest().selectVariant(variants); + if (variant == null) + { + if (log.isTraceEnabled()) log.trace("Requested Variant {} is not on the list of acceptable Response Variants: {}", variant, variants); + throw new NotAcceptableException(); + } + + if (variant.getMediaType().isCompatible(MediaType.TEXT_HTML_TYPE) || + variant.getMediaType().isCompatible(MediaType.APPLICATION_XHTML_XML_TYPE)) return; // strip #fragment (servers do not receive fragment identifiers) if (targetURI.getFragment() != null) @@ -156,7 +154,7 @@ public void filter(ContainerRequestContext requestContext) throws IOException { if (log.isDebugEnabled()) log.debug("Serving mapped URI from DataManager cache: {}", targetURI); Model model = getSystem().getDataManager().loadModel(targetURI.toString()); - requestContext.abortWith(getResponse(model, Response.Status.OK, selectedVariant)); + requestContext.abortWith(getResponse(model, Response.Status.OK, variant)); return; } @@ -174,7 +172,7 @@ public void filter(ContainerRequestContext requestContext) throws IOException if (!description.isEmpty()) { if (log.isDebugEnabled()) log.debug("Serving URI from namespace ontology: {}", targetURI); - requestContext.abortWith(getResponse(description, Response.Status.OK, selectedVariant)); + requestContext.abortWith(getResponse(description, Response.Status.OK, variant)); return; } } @@ -221,7 +219,7 @@ else if (agentContext instanceof IDTokenSecurityContext idTokenSecurityContext) { // provide the target URI as a base URI hint so ModelProvider / HtmlJsonLDReader can resolve relative references clientResponse.getHeaders().putSingle(com.atomgraph.core.io.ModelProvider.REQUEST_URI_HEADER, targetURI.toString()); - requestContext.abortWith(getResponse(clientResponse, selectedVariant)); + requestContext.abortWith(getResponse(clientResponse, variant)); } } catch (MessageBodyProviderNotFoundException ex) @@ -388,7 +386,7 @@ public Optional getOntology() */ public MediaTypes getMediaTypes() { - return MEDIA_TYPES; + return mediaTypes; } /** diff --git a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java index 17414f681..e8dcaebfe 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java +++ b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java @@ -92,9 +92,6 @@ public static String getURI() /** Violation value property */ public static final DatatypeProperty violationValue = m_model.createDatatypeProperty( NS + "violationValue" ); - /** Access to property */ - public static final ObjectProperty access_to = m_model.createObjectProperty(NS + "access-to"); // TO-DO: move to client-side? - /** Request URI property */ public static final ObjectProperty requestUri = m_model.createObjectProperty(NS + "requestUri"); diff --git a/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java b/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java index 31d319233..e51e8aae9 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java +++ b/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java @@ -133,9 +133,6 @@ public Map getParameters(MultivaluedMap Map getParameters(MultivaluedMap li > a { padding: 4px 10px; max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: #555; display: inline-block; } -#tab-bar .nav-tabs > li > a:hover { color: #222; } -#tab-bar .nav-tabs > li.active > a, #tab-bar .nav-tabs > li.active > a:hover { color: #333; background-color: #fff; border-color: #aaa #aaa transparent; } -#tab-bar .tab-close { margin-left: 4px; font-size: 10px; color: #888; cursor: pointer; vertical-align: middle; } -#tab-bar .tab-close:hover { color: #333; } +#tab-bar.navbar-inner { min-height: 36px; padding: 4px 0; background: #ccc; box-shadow: none; } +#tab-bar-list.nav-tabs { margin-bottom: 0; border-bottom: none; } +#tab-bar-list.nav-tabs > li > a { color: #007fff; padding: 8px 12px; text-shadow: none; border-color: #aaa #aaa transparent; } +#tab-bar-list.nav-tabs > li.active > a, #tab-bar .nav-tabs > li.active > a:hover { color: #555555; background: rgb(223, 223, 223); border-color: #aaa #aaa transparent; } +#tab-bar-list .tab-close { margin-left: 4px; font-size: 10px; color: #888; cursor: pointer; vertical-align: middle; } +#tab-bar-list .tab-close:hover { color: #333; } body.embed { padding-top: 0; } ul.dropdown-menu { max-height: 26em; overflow-x: hidden; overflow-y: auto; } ul.dropdown-menu ul { margin: 0; } @@ -120,9 +119,9 @@ li button.btn-edit-constructors, li button.btn-add-data, li button.btn-add-ontol .faceted-nav input[type=checkbox]:checked + span { font-weight: bold; } .parallax-nav a { cursor: pointer; } .content-body { min-height: calc(100% - 14em); } -.content-body > [about] > [about].row-fluid { overflow-x: auto; margin-bottom: 20px; } -.content-body > [about] > [about].row-fluid, .constructor-triple.row-fluid { border-bottom: 2px solid rgb(223, 223, 223); } -.content-body > [about] > [about].row-fluid.drag-over { border-bottom: 4px dotted #0f82f5; } +.content-body > [about].row-fluid.block { overflow-x: auto; margin-bottom: 20px; } +.content-body > [about].row-fluid.block, .constructor-triple.row-fluid { border-bottom: 2px solid rgb(223, 223, 223); } +.content-body > [about].row-fluid.block.drag-over { border-bottom: 4px dotted #0f82f5; } .row-fluid.block { max-height: 80em; } .row-fluid.block .drag-handle { display: none; width: 30px; background-color: #149bdf; background-image: radial-gradient(circle at 3px 3px, #0480be 1px, transparent 1.5px); background-size: 6px 6px; border-radius: 2px; cursor: move; } .list-mode.active { background-image: url('../icons/ic_navigate_before_black_24px.svg'); } diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl index 196a41081..8af4a9f6c 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/signup.xsl @@ -47,7 +47,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/client/block/chart.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl index 33398d72a..7c3c0bd54 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl @@ -774,7 +774,7 @@ exclude-result-prefixes="#all" - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl index 5865b494a..5ab2a3ae1 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl @@ -189,7 +189,7 @@ exclude-result-prefixes="#all" - + @@ -267,7 +267,7 @@ exclude-result-prefixes="#all" - + @@ -380,7 +380,7 @@ exclude-result-prefixes="#all" - + @@ -495,7 +495,7 @@ exclude-result-prefixes="#all" - + 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 4d99429e4..0d1998b51 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 @@ -1741,7 +1741,7 @@ exclude-result-prefixes="#all" - + 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 7868627af..aaeed6ad9 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 @@ -80,14 +80,11 @@ exclude-result-prefixes="#all" - + - - + 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 13b858f63..5df6fc8ed 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 @@ -410,41 +410,31 @@ extension-element-prefixes="ixsl" - - - + + -
        +
        - - - - - + + - - - - - - - +
        - - + +
        @@ -461,12 +451,32 @@ extension-element-prefixes="ixsl"
        + + + + + +
        + + + + + + + + + + + +
        +         + - - + + - - + +
        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 7cd5e714d..23fabef27 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 @@ -102,7 +102,6 @@ exclude-result-prefixes="#all"> - @@ -594,11 +593,7 @@ exclude-result-prefixes="#all"> - - - - - +