From 6e926f0ba60658349b6ca21956816e46dfc9db94 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Sun, 2 Oct 2022 03:49:04 +0530
Subject: [PATCH] feat: sort requests and folders, resolves #9

---
 .../Collection/CollectionItem/index.js           | 14 +++++++++++++-
 .../Sidebar/Collections/Collection/index.js      | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/renderer/components/Sidebar/Collections/Collection/CollectionItem/index.js b/renderer/components/Sidebar/Collections/Collection/CollectionItem/index.js
index 676d0109b..d6ecc57a9 100644
--- a/renderer/components/Sidebar/Collections/Collection/CollectionItem/index.js
+++ b/renderer/components/Sidebar/Collections/Collection/CollectionItem/index.js
@@ -1,5 +1,6 @@
 import React, { useState, useRef, forwardRef, useEffect } from 'react';
 import range from 'lodash/range';
+import filter from 'lodash/filter';
 import classnames from 'classnames';
 import { IconChevronRight, IconDots } from '@tabler/icons';
 import { useSelector, useDispatch } from 'react-redux';
@@ -95,6 +96,9 @@ const CollectionItem = ({item, collection, searchText}) => {
     }
   }
 
+  const requestItems = filter(item.items, (i) => isItemARequest(i));
+  const folderItems = filter(item.items, (i) => isItemAFolder(i));
+
   return (
     <StyledWrapper className={className}>
       {renameItemModalOpen && <RenameCollectionItem item={item} collection={collection} onClose={() => setRenameItemModalOpen(false)}/>}
@@ -183,7 +187,15 @@ const CollectionItem = ({item, collection, searchText}) => {
 
       {!itemIsCollapsed ? (
         <div>
-          {item.items && item.items.length ? item.items.map((i) => {
+          {requestItems && requestItems.length ? requestItems.map((i) => {
+            return <CollectionItem
+              key={i.uid}
+              item={i}
+              collection={collection}
+              searchText={searchText}
+            />
+          }) : null}
+          {folderItems && folderItems.length ? folderItems.map((i) => {
             return <CollectionItem
               key={i.uid}
               item={i}
diff --git a/renderer/components/Sidebar/Collections/Collection/index.js b/renderer/components/Sidebar/Collections/Collection/index.js
index fa010efa6..b549b086e 100644
--- a/renderer/components/Sidebar/Collections/Collection/index.js
+++ b/renderer/components/Sidebar/Collections/Collection/index.js
@@ -1,5 +1,6 @@
 import React, { useState, forwardRef, useRef, useEffect } from 'react';
 import classnames from 'classnames';
+import filter from 'lodash/filter';
 import { IconChevronRight, IconDots } from '@tabler/icons';
 import Dropdown from 'components/Dropdown';
 import { collectionClicked, removeCollection } from 'providers/ReduxStore/slices/collections';
@@ -8,6 +9,7 @@ import NewRequest from 'components/Sidebar/NewRequest';
 import NewFolder from 'components/Sidebar/NewFolder';
 import CollectionItem from './CollectionItem';
 import { doesCollectionHaveItemsMatchingSearchText } from 'utils/collections/search';
+import { isItemAFolder, isItemARequest } from 'utils/collections';
 
 import StyledWrapper from './StyledWrapper';
 
@@ -49,6 +51,9 @@ const Collection = ({collection, searchText}) => {
     }
   }
 
+  const requestItems = filter(collection.items, (i) => isItemARequest(i));
+  const folderItems = filter(collection.items, (i) => isItemAFolder(i));
+
   return (
     <StyledWrapper className="flex flex-col">
       {showNewRequestModal && <NewRequest collection={collection} onClose={() => setShowNewRequestModal(false)}/>}
@@ -89,7 +94,16 @@ const Collection = ({collection, searchText}) => {
       <div>
         {!collectionIsCollapsed ? (
           <div>
-            {collection.items && collection.items.length ? collection.items.map((i) => {
+            {requestItems && requestItems.length ? requestItems.map((i) => {
+              return <CollectionItem
+                key={i.uid}
+                item={i}
+                collection={collection}
+                searchText={searchText}
+              />
+            }) : null}
+
+            {folderItems && folderItems.length ? folderItems.map((i) => {
               return <CollectionItem
                 key={i.uid}
                 item={i}