From 0f2a85355923a4c9b1c71c6f8cf1413453d0d3c2 Mon Sep 17 00:00:00 2001
From: Akash-Ramjyothi <akash.ramjyothi@gmail.com>
Date: Thu, 14 Apr 2022 15:06:33 +0530
Subject: [PATCH] Added Sorting

---
 src/client/containers/AppSidebar.tsx | 2 ++
 src/client/containers/NoteList.tsx   | 2 ++
 src/client/types/index.ts            | 5 +++++
 3 files changed, 9 insertions(+)

diff --git a/src/client/containers/AppSidebar.tsx b/src/client/containers/AppSidebar.tsx
index d0996fa5..40e98f20 100644
--- a/src/client/containers/AppSidebar.tsx
+++ b/src/client/containers/AppSidebar.tsx
@@ -8,6 +8,7 @@ import { ActionButton } from '@/components/AppSidebar/ActionButton'
 import { FolderOption } from '@/components/AppSidebar/FolderOption'
 import { ScratchpadOption } from '@/components/AppSidebar/ScratchpadOption'
 import { Folder, NotesSortKey } from '@/utils/enums'
+import { newNote, sortByName } from 'helpers'
 import { CategoryList } from '@/containers/CategoryList'
 import {
   addNote,
@@ -69,6 +70,7 @@ export const AppSidebar: React.FC = () => {
     )
   const swapFolderHandler = _swapFolder(notesSortKey)
 
+  {categories.sort(sortByName).map(category => {
   return (
     <aside className="app-sidebar">
       <ActionButton
diff --git a/src/client/containers/NoteList.tsx b/src/client/containers/NoteList.tsx
index c8aac1ce..35803280 100644
--- a/src/client/containers/NoteList.tsx
+++ b/src/client/containers/NoteList.tsx
@@ -8,6 +8,7 @@ import { NoteListButton } from '@/components/NoteList/NoteListButton'
 import { SearchBar } from '@/components/NoteList/SearchBar'
 import { ContextMenu } from '@/containers/ContextMenu'
 import { getNoteTitle, shouldOpenContextMenu, debounceEvent, isDraftNote } from '@/utils/helpers'
+import { getNoteTitle, sortByLastUpdated, sortByName } from 'helpers'
 import { useKey } from '@/utils/hooks'
 import {
   permanentlyEmptyTrash,
@@ -75,6 +76,7 @@ export const NoteList: React.FC = () => {
   const filteredNotes: NoteItem[] = notes
     .filter(filter[activeFolder])
     .filter(isMatch)
+    .sort(sortByName)
     .sort(getNotesSorter(notesSortKey))
 
   // ===========================================================================
diff --git a/src/client/types/index.ts b/src/client/types/index.ts
index ee3434bf..497fe06c 100644
--- a/src/client/types/index.ts
+++ b/src/client/types/index.ts
@@ -52,6 +52,11 @@ export interface CategoryState {
   }
 }
 
+export function sortByName(a: CategoryItem, b: CategoryItem) {
+  return a.name.localeCompare(b.name)
+}
+
+
 export interface NoteState {
   notes: NoteItem[]
   activeFolder: Folder