Merge pull request finos#1431 from qube-rt/move-sort-to-db

chore: fix push sort order to be latest-first

Author: kriswest

src/db/file/pushes.ts

@@ -34,19 +34,21 @@ const defaultPushQuery: Partial<PushQuery> = {
 export const getPushes = (query: Partial<PushQuery>): Promise<Action[]> => {
   if (!query) query = defaultPushQuery;
   return new Promise((resolve, reject) => {
-    db.find(query, (err: Error, docs: Action[]) => {
-      // ignore for code coverage as neDB rarely returns errors even for an invalid query
-      /* istanbul ignore if */
-      if (err) {
-        reject(err);
-      } else {
-        resolve(
-          _.chain(docs)
-            .map((x) => toClass(x, Action.prototype))
-            .value(),
-        );
-      }
-    });
+    db.find(query)
+      .sort({ timestamp: -1 })
+      .exec((err, docs) => {
+        // ignore for code coverage as neDB rarely returns errors even for an invalid query
+        /* istanbul ignore if */
+        if (err) {
+          reject(err);
+        } else {
+          resolve(
+            _.chain(docs)
+              .map((x) => toClass(x, Action.prototype))
+              .value(),
+          );
+        }
+      });
   });
 };
 

src/db/mongo/pushes.ts

@@ -35,10 +35,11 @@ export const getPushes = async (
       rejected: 1,
       repo: 1,
       repoName: 1,
-      timepstamp: 1,
+      timestamp: 1,
       type: 1,
       url: 1,
     },
+    sort: { timestamp: -1 },
   });
 };
 

src/ui/views/PushRequests/components/PushesTable.tsx

@@ -113,7 +113,7 @@ const PushesTable: React.FC<PushesTableProps> = (props) => {
             </TableRow>
           </TableHead>
           <TableBody>
-            {[...currentItems].reverse().map((row) => {
+            {currentItems.map((row) => {
               const repoFullName = trimTrailingDotGit(row.repo);
               const repoBranch = trimPrefixRefsHeads(row.branch ?? '');
               const repoUrl = row.url;