From 20611179eb4282a7c886873484d3eca623f0b684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Siiri=20Yl=C3=B6nen?= <siiri.ylonen@helsinki.fi>
Date: Tue, 21 Jan 2025 11:47:39 +0200
Subject: [PATCH 1/5] Add boolean to depict whether is a collection level item.

---
 themes/bootstrap3/templates/hierarchy/tree.phtml | 6 ++++--
 themes/bootstrap5/templates/hierarchy/tree.phtml | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/themes/bootstrap3/templates/hierarchy/tree.phtml b/themes/bootstrap3/templates/hierarchy/tree.phtml
index 73da3ace684..3fd1e77bd9c 100644
--- a/themes/bootstrap3/templates/hierarchy/tree.phtml
+++ b/themes/bootstrap3/templates/hierarchy/tree.phtml
@@ -32,11 +32,13 @@
     foreach ($nodes as $node) {
       $hasChildren = !empty($node->children);
       $liClasses = [];
+      $isCollectionLevel = false;
       if ($hasChildren) {
         $liClasses[] = 'hierarchy-tree__parent';
       }
       if ('collection' === $node->type) {
         $liClasses[] = 'hierarchy-tree__collection';
+        $isCollectionLevel = true;
         $icon = 'hierarchy-collection';
       } else {
         $liClasses[] = 'hierarchy-tree__record';
@@ -63,13 +65,13 @@
         ++$nodeId;
         $childUlIdEsc = $escapeAttr('hierarchy_' . $context . '_' . $parentNodeId . '_' . $nodeId);
         echo '<button class="hierarchy-tree__toggle-expanded js-toggle-expanded"'
-          . ' aria-expanded="' . ($node->hasSelectedChild ? 'true' : 'false') . '"'
+          . ' aria-expanded="' . ($node->hasSelectedChild || $isCollectionLevel ? 'true' : 'false') . '"'
           . ' aria-controls="' . $childUlIdEsc . '"'
           // Use node title as button label so that a screen reader can read it as
           // "Expanded <text>" or "Collapsed <text>":
           . ' aria-label="' . $escapeAttr($node->title) . '"'
           . ' data-toggle-aria-expanded'
-          . ' data-default-expanded="' . ($node->hasSelectedChild ? 'true' : 'false') . '"'
+          . ' data-default-expanded="' . ($node->hasSelectedChild || $isCollectionLevel ? 'true' : 'false') . '"'
           . '>'
           . $icons['hierarchy-expand']
           . $icons['hierarchy-collapse']
diff --git a/themes/bootstrap5/templates/hierarchy/tree.phtml b/themes/bootstrap5/templates/hierarchy/tree.phtml
index 73da3ace684..3fd1e77bd9c 100644
--- a/themes/bootstrap5/templates/hierarchy/tree.phtml
+++ b/themes/bootstrap5/templates/hierarchy/tree.phtml
@@ -32,11 +32,13 @@
     foreach ($nodes as $node) {
       $hasChildren = !empty($node->children);
       $liClasses = [];
+      $isCollectionLevel = false;
       if ($hasChildren) {
         $liClasses[] = 'hierarchy-tree__parent';
       }
       if ('collection' === $node->type) {
         $liClasses[] = 'hierarchy-tree__collection';
+        $isCollectionLevel = true;
         $icon = 'hierarchy-collection';
       } else {
         $liClasses[] = 'hierarchy-tree__record';
@@ -63,13 +65,13 @@
         ++$nodeId;
         $childUlIdEsc = $escapeAttr('hierarchy_' . $context . '_' . $parentNodeId . '_' . $nodeId);
         echo '<button class="hierarchy-tree__toggle-expanded js-toggle-expanded"'
-          . ' aria-expanded="' . ($node->hasSelectedChild ? 'true' : 'false') . '"'
+          . ' aria-expanded="' . ($node->hasSelectedChild || $isCollectionLevel ? 'true' : 'false') . '"'
           . ' aria-controls="' . $childUlIdEsc . '"'
           // Use node title as button label so that a screen reader can read it as
           // "Expanded <text>" or "Collapsed <text>":
           . ' aria-label="' . $escapeAttr($node->title) . '"'
           . ' data-toggle-aria-expanded'
-          . ' data-default-expanded="' . ($node->hasSelectedChild ? 'true' : 'false') . '"'
+          . ' data-default-expanded="' . ($node->hasSelectedChild || $isCollectionLevel ? 'true' : 'false') . '"'
           . '>'
           . $icons['hierarchy-expand']
           . $icons['hierarchy-collapse']

From 02a593b7b55c6bb26f3b6c0d2bd1165f5cb9531a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Siiri=20Yl=C3=B6nen?= <siiri.ylonen@helsinki.fi>
Date: Fri, 31 Jan 2025 16:20:53 +0200
Subject: [PATCH 2/5] Check if top level node and check if there is only one
 node on level.

---
 themes/bootstrap5/templates/hierarchy/tree.phtml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/themes/bootstrap5/templates/hierarchy/tree.phtml b/themes/bootstrap5/templates/hierarchy/tree.phtml
index 3fd1e77bd9c..c09103ad454 100644
--- a/themes/bootstrap5/templates/hierarchy/tree.phtml
+++ b/themes/bootstrap5/templates/hierarchy/tree.phtml
@@ -29,17 +29,20 @@
     // Use escapeHtml for performance (this data shouldn't contain anything that escapeHtmlAttr would be useful with)
     $escapeAttr = $escape;
     $truncate = $this->plugin('truncate');
+    $isOneNode = count($nodes) === 1;
     foreach ($nodes as $node) {
       $hasChildren = !empty($node->children);
       $liClasses = [];
-      $isCollectionLevel = false;
+      $openTopLevel = false;
       if ($hasChildren) {
         $liClasses[] = 'hierarchy-tree__parent';
       }
       if ('collection' === $node->type) {
         $liClasses[] = 'hierarchy-tree__collection';
-        $isCollectionLevel = true;
         $icon = 'hierarchy-collection';
+        if ($nodeId === 0) {
+          $openTopLevel = $isOneNode;
+        }
       } else {
         $liClasses[] = 'hierarchy-tree__record';
         $icon = 'hierarchy-record';
@@ -65,13 +68,13 @@
         ++$nodeId;
         $childUlIdEsc = $escapeAttr('hierarchy_' . $context . '_' . $parentNodeId . '_' . $nodeId);
         echo '<button class="hierarchy-tree__toggle-expanded js-toggle-expanded"'
-          . ' aria-expanded="' . ($node->hasSelectedChild || $isCollectionLevel ? 'true' : 'false') . '"'
+          . ' aria-expanded="' . ($node->hasSelectedChild || $openTopLevel ? 'true' : 'false') . '"'
           . ' aria-controls="' . $childUlIdEsc . '"'
           // Use node title as button label so that a screen reader can read it as
           // "Expanded <text>" or "Collapsed <text>":
           . ' aria-label="' . $escapeAttr($node->title) . '"'
           . ' data-toggle-aria-expanded'
-          . ' data-default-expanded="' . ($node->hasSelectedChild || $isCollectionLevel ? 'true' : 'false') . '"'
+          . ' data-default-expanded="' . ($node->hasSelectedChild || $openTopLevel ? 'true' : 'false') . '"'
           . '>'
           . $icons['hierarchy-expand']
           . $icons['hierarchy-collapse']

From f06a594bbcf8deb91a067b23afab51bad3a9b678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Siiri=20Yl=C3=B6nen?= <siiri.ylonen@helsinki.fi>
Date: Tue, 4 Feb 2025 08:31:03 +0200
Subject: [PATCH 3/5] Remove unnecessary variable and check if parentNodeId
 exists.

---
 themes/bootstrap5/templates/hierarchy/tree.phtml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/themes/bootstrap5/templates/hierarchy/tree.phtml b/themes/bootstrap5/templates/hierarchy/tree.phtml
index c09103ad454..27319a24ced 100644
--- a/themes/bootstrap5/templates/hierarchy/tree.phtml
+++ b/themes/bootstrap5/templates/hierarchy/tree.phtml
@@ -29,7 +29,6 @@
     // Use escapeHtml for performance (this data shouldn't contain anything that escapeHtmlAttr would be useful with)
     $escapeAttr = $escape;
     $truncate = $this->plugin('truncate');
-    $isOneNode = count($nodes) === 1;
     foreach ($nodes as $node) {
       $hasChildren = !empty($node->children);
       $liClasses = [];
@@ -40,8 +39,8 @@
       if ('collection' === $node->type) {
         $liClasses[] = 'hierarchy-tree__collection';
         $icon = 'hierarchy-collection';
-        if ($nodeId === 0) {
-          $openTopLevel = $isOneNode;
+        if ($nodeId === 0 && $parentNodeId && count($nodes) === 1) {
+          $openTopLevel = true;
         }
       } else {
         $liClasses[] = 'hierarchy-tree__record';

From 6d484660c1483277098d68456998af0f945f751c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Siiri=20Yl=C3=B6nen?= <siiri.ylonen@helsinki.fi>
Date: Tue, 4 Feb 2025 08:36:27 +0200
Subject: [PATCH 4/5] Change to the intended check if parentNodeId doesnt
 exist.

---
 themes/bootstrap5/templates/hierarchy/tree.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap5/templates/hierarchy/tree.phtml b/themes/bootstrap5/templates/hierarchy/tree.phtml
index 27319a24ced..c8ca6897d77 100644
--- a/themes/bootstrap5/templates/hierarchy/tree.phtml
+++ b/themes/bootstrap5/templates/hierarchy/tree.phtml
@@ -39,7 +39,7 @@
       if ('collection' === $node->type) {
         $liClasses[] = 'hierarchy-tree__collection';
         $icon = 'hierarchy-collection';
-        if ($nodeId === 0 && $parentNodeId && count($nodes) === 1) {
+        if ($nodeId === 0 && !$parentNodeId && count($nodes) === 1) {
           $openTopLevel = true;
         }
       } else {

From 02ae8f392037f99ed4e384084f13bad008280bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Siiri=20Yl=C3=B6nen?= <siiri.ylonen@helsinki.fi>
Date: Thu, 6 Feb 2025 10:01:13 +0200
Subject: [PATCH 5/5] Amount of nodes as a variable.

---
 themes/bootstrap5/templates/hierarchy/tree.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/themes/bootstrap5/templates/hierarchy/tree.phtml b/themes/bootstrap5/templates/hierarchy/tree.phtml
index c8ca6897d77..4e06c05de2e 100644
--- a/themes/bootstrap5/templates/hierarchy/tree.phtml
+++ b/themes/bootstrap5/templates/hierarchy/tree.phtml
@@ -29,6 +29,7 @@
     // Use escapeHtml for performance (this data shouldn't contain anything that escapeHtmlAttr would be useful with)
     $escapeAttr = $escape;
     $truncate = $this->plugin('truncate');
+    $nodeCount = count($nodes);
     foreach ($nodes as $node) {
       $hasChildren = !empty($node->children);
       $liClasses = [];
@@ -39,7 +40,7 @@
       if ('collection' === $node->type) {
         $liClasses[] = 'hierarchy-tree__collection';
         $icon = 'hierarchy-collection';
-        if ($nodeId === 0 && !$parentNodeId && count($nodes) === 1) {
+        if ($nodeId === 0 && !$parentNodeId && $nodeCount === 1) {
           $openTopLevel = true;
         }
       } else {