Skip to content

Commit

Permalink
UI Components, fix validate issue, see #43609
Browse files Browse the repository at this point in the history 
* ILIAS-eLearning#8937
  • Loading branch information
@Amstutz
Amstutz authored Jan 30, 2025
1 parent 479671b commit fcbb78f
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
7 changes: 6 additions & 1 deletion components/ILIAS/UI/src/Implementation/Component/Tree/Node/Renderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ public function render(Component\Component $component, RendererInterface $defaul
}

$id = $this->bindJavaScript($component);
$tpl->setVariable("ID", $id);
if ($id) {
$tpl->setCurrentBlock("li_id");
$tpl->setVariable("ID", $id);
$tpl->parseCurrentBlock();
}


$subnodes = $component->getSubnodes();

Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/UI/src/templates/default/Tree/tpl.node.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<li id="{ID}"
<li <!-- BEGIN li_id -->id="{ID}"<!-- END li_id -->
class="c-tree__node c-tree__node--simple<!-- BEGIN expandable --> expandable<!-- END expandable --><!-- BEGIN highlighted --> highlighted<!-- END highlighted -->"
<!-- BEGIN role_item --> role="treeitem"<!-- END role_item -->
<!-- BEGIN role_none --> role="none"<!-- END role_none -->
Expand Down
10 changes: 5 additions & 5 deletions components/ILIAS/UI/tests/Component/Tree/ExpandableTreeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,25 +127,25 @@ public function testRenderingAsSubTree(): void

protected function getInnerTreePart(): string
{
return '<li id="" class="c-tree__node c-tree__node--simple expandable" role="treeitem" aria-expanded="false">
return '<li class="c-tree__node c-tree__node--simple expandable" role="treeitem" aria-expanded="false">
<span class="c-tree__node__line"><span class="c-tree__node__label">1</span></span>
<ul role="group">
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line"><span class="c-tree__node__label">1.1</span></span>
</li>
<li id="" class="c-tree__node c-tree__node--simple expandable" role="treeitem" aria-expanded="false">
<li class="c-tree__node c-tree__node--simple expandable" role="treeitem" aria-expanded="false">
<span class="c-tree__node__line"><span class="c-tree__node__label">1.2</span></span>
<ul role="group">
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line"><span class="c-tree__node__label">1.2.1</span></span>
</li>
</ul>
</li>
</ul>
</li>
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line"><span class="c-tree__node__label">2</span></span>
</li>';
}
Expand Down
10 changes: 4 additions & 6 deletions components/ILIAS/UI/tests/Component/Tree/Node/BylineNodeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function testRendering(): void
$html = $r->render($node);

$expected = <<<EOT
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line">
<span class="c-tree__node__label">My Label</span>
<span class="c-tree__node__byline">This is my byline</span>
Expand All @@ -77,7 +77,7 @@ public function testRenderingWithIcon(): void
$html = $r->render($node);

$expected = <<<EOT
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line">
<span class="c-tree__node__label">
<img class="icon small" src="./assets/images/standard/icon_default.svg" alt=""/>
Expand All @@ -103,8 +103,7 @@ public function testRenderingWithAsync(): void
$html = $r->render($node);

$expected = <<<EOT
<li id=""
class="c-tree__node c-tree__node--simple expandable"
<li class="c-tree__node c-tree__node--simple expandable"
role="treeitem" aria-expanded="false"
data-async_url="something.de" data-async_loaded="false">
<span class="c-tree__node__line">
Expand All @@ -130,8 +129,7 @@ public function testRenderingExpanded(): void
$html = $r->render($node);

$expected = <<<EOT
<li id=""
class="c-tree__node c-tree__node--simple expandable"
<li class="c-tree__node c-tree__node--simple expandable"
role="treeitem" aria-expanded="true"
data-async_url="something.de" data-async_loaded="false">
<span class="c-tree__node__line">
Expand Down
10 changes: 4 additions & 6 deletions components/ILIAS/UI/tests/Component/Tree/Node/KeyValueNodeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function testRendering(): void
$html = $r->render($node);

$expected = <<<EOT
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line">
<span class="c-tree__node__label">Label</span>
<span class="c-tree__node__value">Value</span>
Expand All @@ -77,7 +77,7 @@ public function testRenderingWithIcon(): void
$html = $r->render($node);

$expected = <<<EOT
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line">
<span class="c-tree__node__label">
<img class="icon small" src="./assets/images/standard/icon_default.svg" alt=""/>
Expand All @@ -103,8 +103,7 @@ public function testRenderingWithAsync(): void
$html = $r->render($node);

$expected = <<<EOT
<li id=""
class="c-tree__node c-tree__node--simple expandable"
<li class="c-tree__node c-tree__node--simple expandable"
role="treeitem" aria-expanded="false"
data-async_url="something.de" data-async_loaded="false">
<span class="c-tree__node__line">
Expand All @@ -130,8 +129,7 @@ public function testRenderingExpanded(): void
$html = $r->render($node);

$expected = <<<EOT
<li id=""
class="c-tree__node c-tree__node--simple expandable"
<li class="c-tree__node c-tree__node--simple expandable"
role="treeitem" aria-expanded="true"
data-async_url="something.de" data-async_loaded="false">
<span class="c-tree__node__line">
Expand Down
9 changes: 4 additions & 5 deletions components/ILIAS/UI/tests/Component/Tree/Node/SimpleNodeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public function testRendering(C\Tree\Node\Simple $node): void
$html = $r->render($node);

$expected = <<<EOT
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line">
<span class="c-tree__node__label">simple</span>
</span>
Expand All @@ -158,8 +158,7 @@ public function testRenderingWithAsync(C\Tree\Node\Simple $node): void
$html = $r->render($node);

$expected = <<<EOT
<li id=""
class="c-tree__node c-tree__node--simple expandable"
<li class="c-tree__node c-tree__node--simple expandable"
role="treeitem" aria-expanded="false"
data-async_url="something.de" data-async_loaded="false">
<span class="c-tree__node__line">
Expand All @@ -184,7 +183,7 @@ public function testRenderingWithIcon(C\Tree\Node\Simple $node): void
$html = $r->render($node);

$expected = <<<EOT
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line">
<span class="c-tree__node__label">
<img class="icon small" src="./assets/images/standard/icon_default.svg" alt=""/>
Expand Down Expand Up @@ -212,7 +211,7 @@ public function testRenderingWithIconAndAltAttribute(C\Tree\Node\Simple $node):
$html = $r->render($node);

$expected = <<<EOT
<li id="" class="c-tree__node c-tree__node--simple" role="treeitem">
<li class="c-tree__node c-tree__node--simple" role="treeitem">
<span class="c-tree__node__line">
<span class="c-tree__node__label">
<img class="icon small" src="./assets/images/standard/icon_default.svg" alt="Different Icon Label"/>
Expand Down

0 comments on commit fcbb78f

Please sign in to comment.