Skip to content

Removed child thunks #211

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
namedgraph merged 3 commits into from
May 7, 2025
Merged

Removed child thunks #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6c8701
Removing child thunks
namedgraph May 6, 2025
f119610
View object-metadata refactoring
namedgraph May 7, 2025
8ca75ad
Promise error handling fixes
namedgraph May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ exclude-result-prefixes="#all"

<!-- render row -->

<xsl:template match="*" mode="ldh:RenderRow">
<xsl:template match="*" mode="ldh:RenderRow" as="(function(item()?) as map(*))?">
<xsl:apply-templates mode="#current"/>
</xsl:template>

<xsl:template match="text()" mode="ldh:RenderRow"/>
<xsl:template match="text()" mode="ldh:RenderRow" as="(function(item()?) as map(*))?"/>

<!-- hide type control -->
<xsl:template match="*[rdf:type/@rdf:resource = '&ldh;XHTML']" mode="bs2:TypeControl" priority="1">
Expand Down Expand Up @@ -321,35 +321,29 @@ exclude-result-prefixes="#all"
<!-- CALLBACKS -->

<xsl:function name="ldh:load-block" ixsl:updating="yes" as="map(*)">
<xsl:param name="context" as="map(*)"/>
<xsl:param name="self-thunk" as="function(map(*)) as item()*"/>
<xsl:param name="child-thunk" as="function(map(*)) as item()*?"/>
<xsl:param name="ignored" as="item()?"/>
<xsl:param name="context" as="map(*)"/>
<xsl:param name="thunk" as="function(map(*)) as item()*"/>
<xsl:param name="ignored" as="item()?"/>

<xsl:sequence select="
ixsl:all-settled(
array{
$self-thunk($context),
if ($child-thunk) then $child-thunk($context) else ()
}
)
=> ixsl:then(
ldh:hide-block-progress-bar(
$context,
?
)
)
"/>
<xsl:sequence select="
$thunk($context) =>
ixsl:then(
ldh:hide-block-progress-bar(
$context,
?
)
)
"/>
</xsl:function>

<xsl:function name="ldh:hide-block-progress-bar" as="map(*)" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>
<xsl:param name="results" as="array(*)"/>
<xsl:param name="ignored" as="item()?"/>

<xsl:variable name="container" select="$context('container')" as="element()"/>

<xsl:message>ldh:hide-block-progress-bar $container/@typeof: <xsl:value-of select="$container/@typeof"/></xsl:message>

<!-- hide the progress bar -->
<xsl:for-each select="$container/ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
Expand Down
45 changes: 29 additions & 16 deletions ...main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,6 @@ exclude-result-prefixes="#all"
<xsl:for-each select="$block//div[contains-token(@class, 'bar')]">
<ixsl:set-style name="width" select="'66%'" object="."/>
</xsl:for-each>

<xsl:variable name="child-thunk" as="function(map(*)) as item()*?">
<xsl:apply-templates mode="#current"/>
</xsl:variable>

<xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path($ldh:requestUri), map{}, $query-uri)" as="xs:anyURI"/>
<xsl:variable name="request" select="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
Expand Down Expand Up @@ -271,12 +267,11 @@ exclude-result-prefixes="#all"
}"/>

<xsl:sequence select="
ldh:load-block#4(
$context,
ldh:chart-self-thunk#1,
$child-thunk,
?
)
ldh:load-block#3(
$context,
ldh:chart-self-thunk#1,
?
)
"/>
</xsl:template>

Expand Down Expand Up @@ -315,7 +310,7 @@ exclude-result-prefixes="#all"
"/>
</xsl:function>

<xsl:function name="ldh:render-chart" ixsl:updating="yes">
<xsl:function name="ldh:render-chart" as="map(*)" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>
<xsl:variable name="container" select="$context('container')" as="element()"/>
<xsl:variable name="method" select="$context('method')" as="xs:string"/>
Expand Down Expand Up @@ -698,27 +693,34 @@ exclude-result-prefixes="#all"
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
</xsl:for-each>

<!-- error response - could not load query results -->
<!-- error response - could not load query -->
<xsl:for-each select="$container">
<xsl:result-document href="?." method="ixsl:replace-content">
<div class="alert alert-block">
<strong>Error during query execution:</strong>
<strong>Could not load query from <a href="{$query-uri}"><xsl:value-of select="$query-uri"/></a></strong>
<pre>
<xsl:value-of select="$response?message"/>
</pre>
</div>
</xsl:result-document>
</xsl:for-each>

<xsl:sequence select="$context"/>
<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="
error(
QName('&ldh;', 'ldh:HTTPError'),
concat('HTTP ', ?status, ' returned: ', ?message),
$response
)
"/>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:function>

<!-- SPARQL results response -->

<xsl:function name="ldh:chart-results-response" ixsl:updating="yes">
<xsl:function name="ldh:chart-results-response" as="map(*)" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>
<xsl:variable name="response" select="$context('response')" as="map(*)"/>
<xsl:variable name="block" select="$context('block')" as="element()"/>
Expand Down Expand Up @@ -766,6 +768,8 @@ exclude-result-prefixes="#all"
<xsl:with-param name="category" select="$category"/>
<xsl:with-param name="series" select="$series"/>
</xsl:call-template>

<xsl:sequence select="$context"/>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
Expand All @@ -780,9 +784,18 @@ exclude-result-prefixes="#all"
</div>
</xsl:result-document>
</xsl:for-each>

<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="
error(
QName('&ldh;', 'ldh:HTTPError'),
concat('HTTP ', ?status, ' returned: ', ?message),
$response
)
"/>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:for-each>
</xsl:function>

</xsl:stylesheet>
78 changes: 38 additions & 40 deletions ...ain/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,6 @@ exclude-result-prefixes="#all"
>

<!-- TEMPLATES -->

<!-- <xsl:template match="div[@typeof = '&ldh;Object']/div/div[@about]" mode="ldh:RenderRow" priority="1">
<xsl:apply-templates mode="#current"/>

<xsl:message>HELLO? @about: <xsl:value-of select="@about"/></xsl:message>

hide the progress bar
<xsl:for-each select="ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
</xsl:for-each>
</xsl:template>-->

<!-- hide type control -->
<xsl:template match="*[rdf:type/@rdf:resource = '&ldh;Object']" mode="bs2:TypeControl" priority="1">
Expand All @@ -65,7 +52,7 @@ exclude-result-prefixes="#all"

<!-- object block (RDF resource) -->

<xsl:template match="*[@typeof = '&ldh;Object'][descendant::*[@property = '&rdf;value'][@resource]]" mode="ldh:RenderRow" as="item()" priority="2"> <!-- prioritize above block.xsl -->
<xsl:template match="*[@typeof = '&ldh;Object'][descendant::*[@property = '&rdf;value'][@resource]]" mode="ldh:RenderRow" as="function(item()?) as map(*)" priority="2"> <!-- prioritize above block.xsl -->
<xsl:param name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
<xsl:param name="about" select="$block/@about" as="xs:anyURI"/>
<xsl:param name="block-uri" select="$about" as="xs:anyURI"/>
Expand All @@ -80,10 +67,6 @@ exclude-result-prefixes="#all"
<!-- update progress bar -->
<ixsl:set-style name="width" select="'50%'" object="."/>
</xsl:for-each>

<xsl:variable name="child-thunk" as="function(map(*)) as item()*?">
<xsl:apply-templates mode="#current"/>
</xsl:variable>

<!-- don't use ldh:base-uri(.) because its value comes from the last HTML document load -->
<xsl:variable name="request-uri" select="ldh:href($ldt:base, if (starts-with($graph, $ldt:base)) then $graph else ac:absolute-path(xs:anyURI(ixsl:location())), map{}, ac:document-uri($resource-uri), $graph, ())" as="xs:anyURI"/>
Expand All @@ -100,12 +83,11 @@ exclude-result-prefixes="#all"
}"/>

<xsl:sequence select="
ldh:load-block#4(
$context,
ldh:object-self-thunk#1,
$child-thunk,
?
)
ldh:load-block#3(
$context,
ldh:object-self-thunk#1,
?
)
"/>
</xsl:template>

Expand Down Expand Up @@ -199,6 +181,15 @@ exclude-result-prefixes="#all"
</div>
</xsl:result-document>
</xsl:for-each>

<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="
error(
QName('&ldh;', 'ldh:HTTPError'),
concat('HTTP ', ?status, ' returned: ', ?message),
$response
)
"/>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
Expand All @@ -210,13 +201,6 @@ exclude-result-prefixes="#all"
<object data="{$resource-uri}"/>
</div>
</xsl:result-document>

<!-- hide the progress bar -->
<!-- <xsl:for-each select="ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
</xsl:for-each>-->
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
Expand All @@ -226,15 +210,17 @@ exclude-result-prefixes="#all"
<strong>Could not load resource: <a href="{$resource-uri}"><xsl:value-of select="$resource-uri"/></a></strong>
</div>
</xsl:result-document>

<!-- hide the progress bar -->
<!-- <xsl:for-each select="ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
</xsl:for-each> -->
</xsl:for-each>

<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
<xsl:sequence select="
error(
QName('&ldh;', 'ldh:HTTPError'),
concat('HTTP ', ?status, ' returned: ', ?message),
$response
)
"/>

<xsl:sequence select="$context"/>
</xsl:otherwise>
</xsl:choose>
Expand Down Expand Up @@ -303,9 +289,21 @@ exclude-result-prefixes="#all"
<xsl:param name="context" as="map(*)"/>
<xsl:variable name="obj-value-id" select="$context('obj-value-id')" as="xs:string"/>

<xsl:message>ldh:block-object-apply $obj-value-id: <xsl:value-of select="$obj-value-id"/></xsl:message>
<xsl:message>ldh:block-object-apply $obj-value-id: <xsl:value-of select="$obj-value-id"/> exists(id($obj-value-id, ixsl:page())): <xsl:value-of select="exists(id($obj-value-id, ixsl:page()))"/></xsl:message>

<!-- get the optional promise of the object value resource -->
<xsl:variable name="rendered" as="(function(item()?) as map(*))?">
<xsl:apply-templates select="id($obj-value-id, ixsl:page())" mode="ldh:RenderRow"/>
</xsl:variable>

<xsl:apply-templates select="id($obj-value-id, ixsl:page())" mode="ldh:RenderRow"/>
<xsl:sequence select="if (exists($rendered)) then $rendered else ldh:object-noop#2($context, ?)"/>
</xsl:function>

<xsl:function name="ldh:object-noop" as="map(*)" ixsl:updating="yes">
<xsl:param name="context" as="map(*)"/>
<xsl:param name="ignored" as="item()?" />
<!-- just return the context, doing nothing else -->
<xsl:sequence select="$context"/>
</xsl:function>

</xsl:stylesheet>
Loading