From e2f3e9eb7c3635e7ac3ddf751c6bb3ff5351062e Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Mon, 15 Jan 2024 15:27:26 +0200 Subject: [PATCH] storage: Fix border calculations for page tables Whether or not a page is the last one was wrong. The test needs to use the sorted array, of course. --- pkg/storaged/pages.jsx | 5 +++-- test/reference | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/storaged/pages.jsx b/pkg/storaged/pages.jsx index 276557eedb74..aa3944f1d875 100644 --- a/pkg/storaged/pages.jsx +++ b/pkg/storaged/pages.jsx @@ -641,8 +641,9 @@ export const PageTable = ({ emptyCaption, aria_label, pages, crossrefs, sorted, } function make_page_rows(pages, level, last_has_border, key, sorted) { - for (const p of sort(pages, p => p, sorted)) { - const is_last = (level == 0 || p == pages[pages.length - 1]); + const sorted_pages = sort(pages, p => p, sorted); + for (const p of sorted_pages) { + const is_last = (level == 0 || p == sorted_pages[pages.length - 1]); const p_key = key + ":" + (p.key || p.name); make_row(p, null, level, is_last && p.children.length == 0 && last_has_border, p_key); make_page_rows(p.children, level + 1, is_last && last_has_border, p_key, p.options.sorted); diff --git a/test/reference b/test/reference index de57c628b9dd..8e6419232bac 160000 --- a/test/reference +++ b/test/reference @@ -1 +1 @@ -Subproject commit de57c628b9dd1aef3fe5857c80a286319b7422c6 +Subproject commit 8e6419232bacd4385977717ef489136ed155b3d8