wordpress-mobile
diff --git a/‎WordPress/src/main/java/org/wordpress/android/ui/pagesrs/PageRsListTab.kt‎
Lines changed: 14 additions & 3 deletions b/‎WordPress/src/main/java/org/wordpress/android/ui/pagesrs/PageRsListTab.kt‎
Lines changed: 14 additions & 3 deletions
diff --git a/‎WordPress/src/main/java/org/wordpress/android/ui/pagesrs/PageRsListUiState.kt‎
Lines changed: 25 additions & 1 deletion b/‎WordPress/src/main/java/org/wordpress/android/ui/pagesrs/PageRsListUiState.kt‎
Lines changed: 25 additions & 1 deletion
diff --git a/‎WordPress/src/main/java/org/wordpress/android/ui/pagesrs/PageRsTreeBuilder.kt‎
Lines changed: 62 additions & 0 deletions b/‎WordPress/src/main/java/org/wordpress/android/ui/pagesrs/PageRsTreeBuilder.kt‎
Lines changed: 62 additions & 0 deletions
@@ -3,35 +3,46 @@ package org.wordpress.android.ui.pagesrs
 import org.wordpress.android.R
 import uniffi.wp_api.PostStatus
 import uniffi.wp_api.WpApiParamOrder
+import uniffi.wp_api.WpApiParamPostsOrderBy
 
 internal enum class PageRsListTab(
     val labelResId: Int,
     val emptyMessageResId: Int,
     val statuses: List<PostStatus>,
+    val orderBy: WpApiParamPostsOrderBy,
     val order: WpApiParamOrder
 ) {
+    // PUBLISHED / DRAFTS / TRASHED are alphabetical to match the legacy pages list
+    // (see PR #22896). Sibling order within the published hierarchy comes from this sort.
     PUBLISHED(
         labelResId = R.string.pages_published,
         emptyMessageResId = R.string.pages_empty_published,
         statuses = listOf(PostStatus.Publish, PostStatus.Private),
-        order = WpApiParamOrder.DESC
+        orderBy = WpApiParamPostsOrderBy.TITLE,
+        order = WpApiParamOrder.ASC
     ),
     DRAFTS(
         labelResId = R.string.pages_drafts,
         emptyMessageResId = R.string.pages_empty_drafts,
         statuses = listOf(PostStatus.Draft, PostStatus.Pending),
-        order = WpApiParamOrder.DESC
+        orderBy = WpApiParamPostsOrderBy.TITLE,
+        order = WpApiParamOrder.ASC
     ),
+    // SCHEDULED stays chronological so "next to publish" is at the top; legacy groups by
+    // date with dividers, but until those land an alphabetical sort here would be useless.
+    // Follow-up: add date-divider grouping (e.g. Today / Tomorrow / Next week) to match legacy.
     SCHEDULED(
         labelResId = R.string.pages_scheduled,
         emptyMessageResId = R.string.pages_empty_scheduled,
         statuses = listOf(PostStatus.Future),
+        orderBy = WpApiParamPostsOrderBy.DATE,
         order = WpApiParamOrder.ASC
     ),
     TRASHED(
         labelResId = R.string.pages_trashed,
         emptyMessageResId = R.string.pages_empty_trashed,
         statuses = listOf(PostStatus.Trash),
-        order = WpApiParamOrder.DESC
+        orderBy = WpApiParamPostsOrderBy.TITLE,
+        order = WpApiParamOrder.ASC
     );
 }
@@ -12,7 +12,7 @@ import uniffi.wp_mobile.FullEntityAnyPostWithEditContext
 import uniffi.wp_mobile.PostItemState
 
 internal data class PageTabUiState(
-    val pages: List<PageRsUiModel> = emptyList(),
+    val pages: List<PageRsListItem> = emptyList(),
     val isLoading: Boolean = false,
     val isRefreshing: Boolean = false,
     val isLoadingMore: Boolean = false,
@@ -21,6 +21,28 @@ internal data class PageTabUiState(
     val isAuthError: Boolean = false
 )
 
+internal sealed interface PageRsListItem {
+    val page: PageRsUiModel
+    val stableKey: String
+    val remotePageId: Long get() = page.remotePageId
+
+    data class Real(
+        override val page: PageRsUiModel,
+        val indentLevel: Int = 0
+    ) : PageRsListItem {
+        override val stableKey: String get() = "real:${page.remotePageId}"
+    }
+
+    data class Virtual(
+        val kind: Kind,
+        override val page: PageRsUiModel
+    ) : PageRsListItem {
+        override val stableKey: String get() = "virtual:$kind"
+
+        enum class Kind { HOMEPAGE, POSTS_PAGE }
+    }
+}
+
 internal enum class PageRsDisplayState {
     NORMAL,
     FETCHING_WITH_DATA,
@@ -31,6 +53,7 @@ internal enum class PageRsDisplayState {
 
 internal data class PageRsUiModel(
     val remotePageId: Long,
+    val parentId: Long = 0L,
     val title: String,
     val excerpt: String,
     val date: String,
@@ -77,6 +100,7 @@ private fun FullEntityAnyPostWithEditContext.toPageUiModel(
     val page: AnyPostWithEditContext = data
     return PageRsUiModel(
         remotePageId = page.id,
+        parentId = page.parent ?: 0L,
         title = page.title?.raw?.takeIf { it.isNotBlank() }
             ?: page.title?.rendered
             ?: "",
 
@@ -0,0 +1,62 @@
+package org.wordpress.android.ui.pagesrs
+
+internal const val MAX_INDENT_LEVEL = 3
+
+/**
+ * Assembles the final row list for a pages tab:
+ *  - When [applyHierarchy] is true, [pages] are DFS-ordered as parent → children with
+ *    [PageRsListItem.Real.indentLevel] capped at [MAX_INDENT_LEVEL]; children whose
+ *    parent isn't visible in the set are promoted to roots so they still render.
+ *  - When hierarchy is on, the pages identified by [pageOnFront] and [pageForPosts]
+ *    (when set and present in [pages]) are prepended as Virtual rows and hidden from
+ *    their normal sorted position.
+ *  - When [applyHierarchy] is false, [pages] are wrapped as flat Real rows with
+ *    indentLevel = 0 and no virtuals.
+ */
+internal fun buildRows(
+    pages: List<PageRsUiModel>,
+    applyHierarchy: Boolean,
+    pageOnFront: Long,
+    pageForPosts: Long
+): List<PageRsListItem> {
+    if (!applyHierarchy) {
+        return pages.map { PageRsListItem.Real(it) }
+    }
+    val byId = pages.associateBy { it.remotePageId }
+    val homepage = pageOnFront.takeIf { it != 0L }?.let { byId[it] }
+    val postsPage = pageForPosts.takeIf { it != 0L }?.let { byId[it] }
+    val hiddenIds = setOfNotNull(homepage?.remotePageId, postsPage?.remotePageId)
+    val visible = pages.filterNot { it.remotePageId in hiddenIds }
+    val tree = flattenToTree(visible)
+    return buildList {
+        homepage?.let { add(PageRsListItem.Virtual(PageRsListItem.Virtual.Kind.HOMEPAGE, it)) }
+        postsPage?.let { add(PageRsListItem.Virtual(PageRsListItem.Virtual.Kind.POSTS_PAGE, it)) }
+        addAll(tree)
+    }
+}
+
+internal fun flattenToTree(pages: List<PageRsUiModel>): List<PageRsListItem.Real> {
+    val byId = pages.associateBy { it.remotePageId }
+    val childrenByParent = pages
+        .filter { it.parentId != 0L && it.parentId in byId }
+        .groupBy { it.parentId }
+    val roots = pages.filter { it.parentId == 0L || it.parentId !in byId }
+
+    val result = ArrayList<PageRsListItem.Real>(pages.size)
+    val visited = HashSet<Long>(pages.size)
+    val stack = ArrayDeque<Pair<PageRsUiModel, Int>>()
+    roots.asReversed().forEach { stack.addLast(it to 0) }
+    while (stack.isNotEmpty()) {
+        val (page, depth) = stack.removeLast()
+        if (!visited.add(page.remotePageId)) continue
+        result.add(PageRsListItem.Real(page, minOf(depth, MAX_INDENT_LEVEL)))
+        childrenByParent[page.remotePageId]?.asReversed()?.forEach { child ->
+            stack.addLast(child to depth + 1)
+        }
+    }
+    // Pages caught in a parent cycle (self-parented, or in a loop of parent references) are
+    // unreachable from any root; append them as flat rows so corrupt data can't drop pages.
+    pages.filterNot { it.remotePageId in visited }
+        .mapTo(result) { PageRsListItem.Real(it) }
+    return result
+}