Merge pull request #138 from marvinvr/develop

fix: request sorting

src/utils/requests.utils.ts

@@ -1,9 +1,11 @@
 import { OverviewContentRequest } from 'src/models/content';
 
-export const sort = (lists: [OverviewContentRequest[], OverviewContentRequest[]]): OverviewContentRequest[] => (
-    Array.prototype.concat(...lists)
-        .sort((a, b) => b.request.date - a.request.date)
-        .sort((a, b) => ((a.request.approved || a.request.denied || a.request.available)
-                            && (b.request.approved || b.request.denied || b.request.available))
-                            ? 0 : (a.request.approved || a.request.denied || a.request.available) ? 1 : -1)
-);
+export const sort = (lists: [OverviewContentRequest[], OverviewContentRequest[]]): OverviewContentRequest[] => {
+    const items = Array.prototype.concat([...lists[0], ...lists[1]])
+                    .sort((a, b) => b.request.date > a.request.date ? 1 : -1);
+
+    const openItems = items.filter(item =>!(item.request.approved || item.request.denied || item.request.available));
+    const closedItems = items.filter(item => item.request.approved || item.request.denied || item.request.available);
+
+    return [...openItems,...closedItems];
+};