Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

core: add support for group options for reminders

Abdullah Atta08a13ff35a0c
diff --git a/packages/core/src/api/settings.js b/packages/core/src/api/settings.js
index 66bac7cf4..0565ed02d 100644
--- a/packages/core/src/api/settings.js
+++ b/packages/core/src/api/settings.js
@@ -99,8 +99,10 @@ class Settings {
? "dateDeleted"
: key === "tags"
? "dateCreated"
+ : key === "reminders"
+ ? "dueDate"
: "dateEdited",
- sortDirection: "desc"
+ sortDirection: key === "reminders" ? "asc" : "desc"
}
);
}
diff --git a/packages/core/src/types.js b/packages/core/src/types.js
index 1eeaf3863..7698453ad 100644
--- a/packages/core/src/types.js
+++ b/packages/core/src/types.js
@@ -22,7 +22,7 @@ const _ignore = "";
/**
* @typedef {{
* groupBy: "abc" | "year" | "month" | "week" | "none" | undefined,
- * sortBy: "dateCreated" | "dateDeleted" | "dateEdited" | "dateModified" | "title",
+ * sortBy: "dateCreated" | "dateDeleted" | "dateEdited" | "dateModified" | "title" | "dueDate",
* sortDirection: "desc" | "asc"
* }} GroupOptions
*/
diff --git a/packages/core/src/utils/grouping.js b/packages/core/src/utils/grouping.js
index ff789a67d..9470b59a3 100644
--- a/packages/core/src/utils/grouping.js
+++ b/packages/core/src/utils/grouping.js
@@ -44,6 +44,10 @@ const comparators = {
asc: (a, b) => a.dateDeleted - b.dateDeleted,
desc: (a, b) => b.dateDeleted - a.dateDeleted
},
+ dueDate: {
+ asc: (a, b) => getUpcomingReminderTime(a) - getUpcomingReminderTime(b),
+ desc: (a, b) => getUpcomingReminderTime(b) - getUpcomingReminderTime(a)
+ },
title: {
asc: (a, b) =>
getTitle(a).localeCompare(getTitle(b), undefined, { numeric: true }),
@@ -143,19 +147,24 @@ export function groupArray(
* @param {GroupOptions} options
* @returns {(Reminder | {type: "header", title: string})[]} Grouped array
*/
-export function groupReminders(array) {
+export function groupReminders(
+ array,
+ options = {
+ sortBy: "dateEdited",
+ sortDirection: "desc"
+ }
+) {
const groups = new Map([
["Active", []],
["Inactive", []]
]);
- const sorted = array.sort((a, b) => {
- const d1 = a.mode === "repeat" ? getUpcomingReminderTime(a) : a.date;
- const d2 = b.mode === "repeat" ? getUpcomingReminderTime(b) : b.date;
- return !d1 || !d2 ? 0 : d1 - d2;
- });
+ if (options.sortBy && options.sortDirection) {
+ const selector = comparators[options.sortBy][options.sortDirection];
+ array.sort(selector);
+ }
- sorted.forEach((item) => {
+ array.forEach((item) => {
const groupTitle = isReminderActive(item) ? "Active" : "Inactive";
addToGroup(groups, groupTitle, item);
});