feat: add sorting to mails folders

src/constants/index.ts

@@ -88,3 +88,18 @@ export const EMAIL_VALIDATION_REGEX =
 export const ROOT_NAME = 'USER_ROOT';
 
 export const DR_VALUES = ['auto', 'enabled', 'disabled'];
+
+export const FOLDER_VIEW = {
+	search_folder: 'search folder',
+	tag: 'tag',
+	conversation: 'conversation',
+	message: 'message',
+	contact: 'contact',
+	document: 'document',
+	appointment: 'appointment',
+	virtual_conversation: 'virtual conversation',
+	remote_folder: 'remote folder',
+	wiki: 'wiki',
+	task: 'task',
+	chat: 'chat'
+};

src/store/folder/hooks.ts

@@ -13,6 +13,7 @@ import {
 	AccordionFolder,
 	FolderView
 } from '../../../types';
+import { FOLDER_VIEW } from '../../constants';
 import { useFolderStore } from './store';
 import { filterNodes, folderViewFilter, isRoot, mapNodes, sortFolders } from './utils';
 
@@ -50,9 +51,14 @@ export const getSearchFolders = (): Searches => useFolderStore.getState().search
 
 export const useFoldersByView = (view: FolderView): Array<Folder> => {
 	const roots = useRoots();
+	const sortFunction = useMemo(
+		() => (view === FOLDER_VIEW.message ? sortFolders : undefined),
+		[view]
+	);
 	return useMemo(
-		() => (roots ? filterNodes<Folder>(Object.values(roots), folderViewFilter(view)) : []),
-		[roots, view]
+		() =>
+			roots ? filterNodes<Folder>(Object.values(roots), folderViewFilter(view), sortFunction) : [],
+		[roots, sortFunction, view]
 	);
 };
 

src/store/folder/utils.ts

@@ -34,11 +34,14 @@ export const folderViewFilter =
 export const filterNodes = <T>(
 	children: TreeNode<T>[],
 	f: (deep?: boolean) => (i: TreeNode<T>) => boolean,
+	sortFunction?: (i: TreeNode<T>) => number | string,
 	deep?: boolean
-): TreeNode<T>[] =>
-	children
+): TreeNode<T>[] => {
+	const childrenSorted = sortFunction ? sortBy(children, sortFunction) : children;
+	return childrenSorted
 		.filter(f(deep))
-		.map((i) => ({ ...i, children: filterNodes<TreeNode<T>>(i.children, f, true) }));
+		.map((i) => ({ ...i, children: filterNodes<TreeNode<T>>(i.children, f, sortFunction, true) }));
+};
 
 type MapNodesOptions<T, U> = {
 	mapFunction: (i: TreeNode<T>) => U;