feat(provider): ordering folders before bookmarks

Recursive function little trick fix #96
julienfroidefond · Apr 21, 2021 · 4650ec2 · 4650ec2
1 parent c1f5a5f
commit 4650ec2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/js/strapi/provider.js b/src/js/strapi/provider.js
@@ -7,20 +7,24 @@ import StrapiHttpClient from "./api";
  */
 const mapServerFolder = folder => {
   const { id, name, bookmarks, children } = folder;
-  let childrens = [];
-  childrens = bookmarks.map(bookmark => ({
+  let childrensBookmarks = [];
+  const childrensFolders = [];
+
+  const childrenMapped = children ? children.map(mapServerFolder) : [];
+  childrensFolders.push(...childrenMapped);
+
+  childrensBookmarks = bookmarks.map(bookmark => ({
     id: bookmark.id,
     title: bookmark.title,
     url: bookmark.url,
     type: "bookmark",
   }));
-  const childrenMapped = children ? children.map(mapServerFolder) : [];
-  childrens.push(...childrenMapped);
+
   return {
     id,
     type: "directory",
     title: name,
-    children: childrens,
+    children: [...childrensFolders, ...childrensBookmarks],
   };
 };
 

diff --git a/test/strapi/data.test.js b/test/strapi/data.test.js
@@ -168,22 +168,22 @@ export const classicalFoldersExpectedResult = [
     type: "directory",
     title: "A",
     children: [
-      { id: 1, title: "B1", url: "http://dzad.fr", type: "bookmark" },
       {
         id: 2,
         type: "directory",
         title: "B",
         children: [
-          { id: 2, title: "B2", url: "http://fezfzefz.fez", type: "bookmark" },
-          { id: 3, title: "B3", url: "http://dadazdaf.fre", type: "bookmark" },
           {
             id: 4,
             type: "directory",
             title: "D",
             children: [{ id: 2, title: "B2", url: "http://fezfzefz.fez", type: "bookmark" }],
           },
+          { id: 2, title: "B2", url: "http://fezfzefz.fez", type: "bookmark" },
+          { id: 3, title: "B3", url: "http://dadazdaf.fre", type: "bookmark" },
         ],
       },
+      { id: 1, title: "B1", url: "http://dzad.fr", type: "bookmark" },
     ],
   },
   {