Use SNJS's built-in display sorting and filtering

app/assets/javascripts/views/notes/note_utils.ts

@@ -2,64 +2,43 @@ import { SNNote, SNTag } from 'snjs';
 
 export enum NoteSortKey {
   CreatedAt = 'created_at',
-  UpdatedAt = 'updated_at',
-  ClientUpdatedAt = 'client_updated_at',
+  UserUpdatedAt = 'userModifiedDate',
   Title = 'title',
+
+  /** @legacy Use UserUpdatedAt instead */
+  UpdatedAt = 'updated_at',
+  /** @legacy Use UserUpdatedAt instead */
+  ClientUpdatedAt = 'client_updated_at',
 }
 
-export function filterAndSortNotes(
-  notes: SNNote[],
-  selectedTag: SNTag,
-  showArchived: boolean,
-  hidePinned: boolean,
-  filterText: string,
-  sortBy: string,
-  reverse: boolean,
-) {
-  const filtered = filterNotes(
-    notes,
-    selectedTag,
-    showArchived,
-    hidePinned,
-    filterText,
-  );
-  const sorted = sortNotes(
-    filtered,
-    sortBy,
-    reverse
-  );
-  return sorted;
-}
-
-export function filterNotes(
-  notes: SNNote[],
+export function notePassesFilter(
+  note: SNNote,
   selectedTag: SNTag,
   showArchived: boolean,
   hidePinned: boolean,
   filterText: string
+) {
+
+  let canShowArchived = showArchived;
+  const canShowPinned = !hidePinned;
+  if (!selectedTag.isTrashTag && note.trashed) {
+    return false;
+  }
+  const isSmartTag = selectedTag.isSmartTag();
+  if (isSmartTag) {
+    canShowArchived = (
+      canShowArchived ||
+      selectedTag.isArchiveTag ||
+      selectedTag.isTrashTag
+    );
+  }
+  if (
+    (note.archived && !canShowArchived) ||
+    (note.pinned && !canShowPinned)
   ) {
-  return notes.filter((note) => {
-    let canShowArchived = showArchived;
-    const canShowPinned = !hidePinned;
-    if (!selectedTag.isTrashTag && note.trashed) {
-      return false;
-    }
-    const isSmartTag = selectedTag.isSmartTag();
-    if (isSmartTag) {
-      canShowArchived = (
-        canShowArchived ||
-        selectedTag.isArchiveTag ||
-        selectedTag.isTrashTag
-      );
-    }
-    if (
-      (note.archived && !canShowArchived) ||
-      (note.pinned && !canShowPinned)
-    ) {
-      return false;
-    }
-    return noteMatchesQuery(note, filterText);
-  });
+    return false;
+  }
+  return noteMatchesQuery(note, filterText);
 }
 
 function noteMatchesQuery(
@@ -72,16 +51,13 @@ function noteMatchesQuery(
   const title = note.safeTitle().toLowerCase();
   const text = note.safeText().toLowerCase();
   const lowercaseText = query.toLowerCase();
-
   const quotedText = stringBetweenQuotes(lowercaseText);
   if (quotedText) {
     return title.includes(quotedText) || text.includes(quotedText);
   }
-
   if (stringIsUuid(lowercaseText)) {
     return note.uuid === lowercaseText;
   }
-
   const words = lowercaseText.split(" ");
   const matchesTitle = words.every((word) => {
     return title.indexOf(word) >= 0;
@@ -89,7 +65,6 @@ function noteMatchesQuery(
   const matchesBody = words.every((word) => {
     return text.indexOf(word) >= 0;
   });
-
   return matchesTitle || matchesBody;
 }
 
@@ -104,47 +79,4 @@ function stringIsUuid(text: string) {
   );
   // eslint-disable-next-line no-unneeded-ternary
   return matches ? true : false;
-}
-
-export function sortNotes(
-  notes: SNNote[] = [],
-  sortBy: string,
-  reverse: boolean
-) {
-  const sortValueFn = (a: SNNote, b: SNNote, pinCheck = false): number => {
-    if (!pinCheck) {
-      if (a.pinned && b.pinned) {
-        return sortValueFn(a, b, true);
-      }
-      if (a.pinned) { return -1; }
-      if (b.pinned) { return 1; }
-    }
-    let aValue = (a as any)[sortBy] || '';
-    let bValue = (b as any)[sortBy] || '';
-    let vector = 1;
-    if (reverse) {
-      vector *= -1;
-    }
-    if (sortBy === NoteSortKey.Title) {
-      aValue = aValue.toLowerCase();
-      bValue = bValue.toLowerCase();
-      if (aValue.length === 0 && bValue.length === 0) {
-        return 0;
-      } else if (aValue.length === 0 && bValue.length !== 0) {
-        return 1 * vector;
-      } else if (aValue.length !== 0 && bValue.length === 0) {
-        return -1 * vector;
-      } else {
-        vector *= -1;
-      }
-    }
-    if (aValue > bValue) { return -1 * vector; }
-    else if (aValue < bValue) { return 1 * vector; }
-    return 0;
-  };
-
-  const result = notes.sort(function (a, b) {
-    return sortValueFn(a, b);
-  });
-  return result;
-}
+}