From 8d566c8c787ef9cb5a1f36b33062aeb2aaa66490 Mon Sep 17 00:00:00 2001
From: Nikita Melnikov <nikmel2803@gmail.com>
Date: Mon, 3 Oct 2022 18:32:19 +0800
Subject: [PATCH] fix next/prev buttons

---
 src/backend/models/pagesFlatArray.ts      | 9 +++++----
 src/backend/views/components/sidebar.twig | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/backend/models/pagesFlatArray.ts b/src/backend/models/pagesFlatArray.ts
index 95069b0..bfe45f2 100644
--- a/src/backend/models/pagesFlatArray.ts
+++ b/src/backend/models/pagesFlatArray.ts
@@ -2,6 +2,7 @@ import Page from './page.js';
 import PageOrder from './pageOrder.js';
 import NodeCache from 'node-cache';
 import { EntityId } from '../database/types.js';
+import { isEqualIds } from '../database/index.js';
 
 // Create cache for flat array
 const cache = new NodeCache({ stdTTL: 120 });
@@ -109,7 +110,7 @@ class PagesFlatArray {
   public static async getPageBefore(pageId: EntityId): Promise<PagesFlatArrayData | undefined> {
     const arr = await this.get();
 
-    const pageIndex = arr.findIndex( (item) => item.id == pageId);
+    const pageIndex = arr.findIndex((item) => isEqualIds(item.id, pageId));
 
     // Check if index is not the first
     if (pageIndex && pageIndex > 0) {
@@ -129,7 +130,7 @@ class PagesFlatArray {
   public static async getPageAfter(pageId: EntityId): Promise<PagesFlatArrayData | undefined> {
     const arr = await this.get();
 
-    const pageIndex = arr.findIndex( (item) => item.id == pageId );
+    const pageIndex = arr.findIndex( (item) => isEqualIds(item.id, pageId));
 
     // Check if index is not the last
     if (pageIndex < arr.length -1) {
@@ -153,7 +154,7 @@ class PagesFlatArray {
     pages: Array<Page>, orders: Array<PageOrder>): Array<PagesFlatArrayData> {
     let arr: Array<PagesFlatArrayData> = new Array<PagesFlatArrayData>();
 
-    const page = pages.find( item => item._id == pageId );
+    const page = pages.find(item => isEqualIds(item._id, pageId));
 
     // Add element to child array
     if (page) {
@@ -167,7 +168,7 @@ class PagesFlatArray {
       } );
     }
 
-    const order = orders.find(item => item.page == pageId);
+    const order = orders.find(item => isEqualIds(item.page, pageId));
 
     if (order) {
       for (const childPageId of order.order) {
diff --git a/src/backend/views/components/sidebar.twig b/src/backend/views/components/sidebar.twig
index 28d6131..c534695 100644
--- a/src/backend/views/components/sidebar.twig
+++ b/src/backend/views/components/sidebar.twig
@@ -29,7 +29,7 @@
                 <a
                   class="docs-sidebar__section-list-item-wrapper"
                   href="{{ child.uri ? '/' ~ child.uri : '/page/' ~ child._id }}">
-                    <div class="docs-sidebar__section-list-item {{page is defined and page._id == child._id ? 'docs-sidebar__section-list-item--active' : ''}}">
+                    <div class="docs-sidebar__section-list-item {{page is defined and toString(page._id) == toString(child._id) ? 'docs-sidebar__section-list-item--active' : ''}}">
                       <span>{{ child.title | striptags }}</span>
                     </div>
                 </a>