From f6280f32e627066486f5708a33c4591148fa64c2 Mon Sep 17 00:00:00 2001
From: slaveeks <chernyshev2001@icloud.com>
Date: Fri, 29 Jul 2022 13:39:44 +0300
Subject: [PATCH] Added ability to change nesting in flat array, fixed BEM

---
 src/backend/models/pagesFlatArray.ts          | 13 +++++++++----
 src/backend/views/components/navigator.twig   |  2 +-
 src/frontend/styles/components/navigator.pcss |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/backend/models/pagesFlatArray.ts b/src/backend/models/pagesFlatArray.ts
index 441b6db..ce6b006 100644
--- a/src/backend/models/pagesFlatArray.ts
+++ b/src/backend/models/pagesFlatArray.ts
@@ -24,12 +24,12 @@ export interface PagesFlatArrayData {
   /**
    * id of parent with parent id '0'
    */
-  rootId?: string;
+  rootId: string;
 
   /**
    * Page level in sidebar view
    */
-  level?: number;
+  level: number;
 
   /**
    * Page title
@@ -50,9 +50,10 @@ class PagesFlatArray {
   /**
    * Returns pages flat array
    *
+   * @param fullNesting - does flat array consist full nesting
    * @returns {Promise<Array<PagesFlatArrayData>>}
    */
-  public static async get(): Promise<Array<PagesFlatArrayData>> {
+  public static async get(fullNesting: boolean = false): Promise<Array<PagesFlatArrayData>> {
     // Get flat array from cache
     let arr = cache.get(cacheKey) as Array<PagesFlatArrayData>;
 
@@ -61,7 +62,11 @@ class PagesFlatArray {
       arr = await this.regenerate();
     }
 
-    return arr;
+    if (fullNesting) {
+      return arr
+    }
+
+    return arr.filter( (item) => item.level < 2 );
   }
 
   /**
diff --git a/src/backend/views/components/navigator.twig b/src/backend/views/components/navigator.twig
index b6eb48b..7fa17e5 100644
--- a/src/backend/views/components/navigator.twig
+++ b/src/backend/views/components/navigator.twig
@@ -19,7 +19,7 @@ Usage example:
   {% set tag = 'a' %}
 {% endif %}
 
-<div class="navigator__wrapper">
+<div class="navigator--wrapper">
   {% if label and url %}
     <{{ tag }}
       {{ name is not empty ? 'name="' ~ name ~ '"': '' }}
diff --git a/src/frontend/styles/components/navigator.pcss b/src/frontend/styles/components/navigator.pcss
index 9d352aa..1f0d892 100644
--- a/src/frontend/styles/components/navigator.pcss
+++ b/src/frontend/styles/components/navigator.pcss
@@ -33,7 +33,7 @@
   }
 }
 
-.navigator__wrapper {
+.navigator--wrapper {
   max-width: 100%;
   margin: 0;
   padding: 0;