From ee449f549306409b23e57ec5c9710cdd8dbd45e8 Mon Sep 17 00:00:00 2001
From: Martynas <martynas@atomgraph.com>
Date: Fri, 15 Nov 2024 23:20:30 +0100
Subject: [PATCH] Copy following siblings of the `$block` and re-insert them
 after the `$row-form`

---
 .../xsl/bootstrap/2.3.2/client/block/chart.xsl | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

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 45c62aa2b..62d014cff 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
@@ -544,15 +544,23 @@ exclude-result-prefixes="#all"
                 <xsl:with-param name="show-cancel-button" select="false()"/>
             </xsl:apply-templates>
         </xsl:variable>
-            
-<!--        <xsl:variable name="content-body" select="id('content-body', ixsl:page())" as="element()"/>
+
+        <!-- copy following block siblings -->
+        <xsl:variable name="following-siblings" select="$block/following-sibling::*" as="element()*"/>
+        <!-- remove following block siblings -->
+        <xsl:for-each select="$following-siblings">
+            <xsl:sequence select="ixsl:call(., 'remove', [])[current-date() lt xs:date('2000-01-01')]"/>
+        </xsl:for-each>
+
+        <xsl:variable name="content-body" select="id('content-body', ixsl:page())" as="element()"/>
+        <!-- TO-DO: replace with <xsl:result-document href="?." method="ixsl:insert-after"> when SaxonJS 3 is available https://saxonica.plan.io/issues/5543 -->
         <xsl:for-each select="$content-body">
             <xsl:result-document href="?." method="ixsl:append-content">
                 <xsl:sequence select="$row-form"/>
+                <!-- re-insert following siblings -->
+                <xsl:sequence select="$following-siblings"/>
             </xsl:result-document>
-        </xsl:for-each>-->
-        <!-- insert $row-form after the $block TO-DO: replace with <xsl:result-document href="?." method="ixsl:insert-after"> when SaxonJS 3 is available https://saxonica.plan.io/issues/5543 -->
-        <xsl:sequence select="ixsl:call($block, 'after', [ $row-form ])[current-date() lt xs:date('2000-01-01')]"/>
+        </xsl:for-each>
     </xsl:template>
     
     <!-- disable inline editing form (do nothing if the button is disabled) -->