Fix sidebars

facebook · Oct 9, 2018 · 48ff70e · 48ff70e
1 parent 52b014a
commit 48ff70e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 31 deletions.
diff --git a/v1/lib/server/__tests__/readMetadata.test.js b/v1/lib/server/__tests__/readMetadata.test.js
@@ -36,64 +36,64 @@ jest.mock(`${process.cwd()}/sidebar.json`, () => true, {virtual: true});
 
 describe('readMetadata', () => {
   describe('readSidebar', () => {
-    test('should verify sub category data and verify sort', () => {
-      const order = readSidebar(sidebarSubcategories);
+    test('should verify sub category data and verify order', () => {
+      const items = readSidebar(sidebarSubcategories);
 
-      // Put in this order to verify sort
-      const expectedOrder = [
+      // Put in this order to verify order
+      const expectedItems = [
         {
           id: 'doc1',
-          sort: 1,
+          order: 1,
           category: 'First Category',
           subcategory: null,
           sidebar: 'docs',
         },
         {
           id: 'doc2',
-          sort: 2,
+          order: 2,
           category: 'First Category',
           subcategory: null,
           sidebar: 'docs',
         },
         {
           id: 'doc3',
-          sort: 3,
+          order: 3,
           category: 'Second Category',
           subcategory: null,
           sidebar: 'docs',
         },
         {
           id: 'doc4',
-          sort: 4,
+          order: 4,
           category: 'Second Category',
           subcategory: 'First Subcategory',
           sidebar: 'docs',
         },
         {
           id: 'doc5',
-          sort: 5,
+          order: 5,
           category: 'Second Category',
           subcategory: null,
           sidebar: 'docs',
         },
         {
           id: 'doc6',
-          sort: 6,
+          order: 6,
           category: 'Third Category',
           subcategory: 'Second Subcategory',
           sidebar: 'docs',
         },
         {
           id: 'doc7',
-          sort: 7,
+          order: 7,
           category: 'Third Category',
           subcategory: 'Third Subcategory',
           sidebar: 'docs',
         },
       ];
-      expectedOrder.forEach((expectedItem, index) => {
-        const item = order[expectedItem.id];
-        expect(item.sort).toBe(expectedItem.sort);
+      expectedItems.forEach((expectedItem, index) => {
+        const item = items[expectedItem.id];
+        expect(item.order).toBe(expectedItem.order);
         expect(item.category).toBe(expectedItem.category);
         expect(item.subcategory).toBe(expectedItem.subcategory);
         expect(item.sidebar).toBe(expectedItem.sidebar);

diff --git a/v1/lib/server/readCategories.js b/v1/lib/server/readCategories.js
@@ -32,7 +32,7 @@ function readCategories(sidebar, allMetadata, languages) {
     });
 
     // Sort the metadata
-    metadatas.sort((a, b) => a.sort - b.sort);
+    metadatas.sort((a, b) => a.order - b.order);
 
     // Store the correct sort of categories and sub categories for later
     const sortedCategories = [];

diff --git a/v1/lib/server/readMetadata.js b/v1/lib/server/readMetadata.js
@@ -71,17 +71,16 @@ function readSidebar(sidebars = {}) {
                 id: subcategoryItem,
                 category,
                 subcategory,
-                sort: sidebarItems.length + 1,
               });
             });
           });
           return;
         }
+
         sidebarItems.push({
           id: categoryItem,
           category,
           subcategory: null,
-          sort: sidebarItems.length + 1,
         });
       });
     });
@@ -99,15 +98,13 @@ function readSidebar(sidebars = {}) {
         next = sidebarItems[i + 1].id;
       }
 
-      order[item.id] = Object.assign(
-        {},
-        {
-          previous,
-          next,
-          sidebar,
-        },
-        item,
-      );
+      order[item.id] = {
+        previous,
+        next,
+        sidebar,
+        category: item.category,
+        subcategory: item.subcategory,
+      };
     }
   });
 

diff --git a/v1/website/sidebars.json b/v1/website/sidebars.json
@@ -10,15 +10,11 @@
     "Guides": [
       "adding-blog",
       "custom-pages",
+      "search",
       "navigation",
       "translation",
       "versioning"
     ],
-    "Hello": {
-      "Bye": [
-        "search"
-      ]
-    },
     "API": [
       "commands",
       "doc-markdown",