A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
core: add support for sorting reminders by due date
Muhammad Ali2c22a7ca90fe
diff --git a/apps/web/src/components/group-header/index.tsx b/apps/web/src/components/group-header/index.tsxindex 9f9ccfd20..a41c309d7 100644--- a/apps/web/src/components/group-header/index.tsx+++ b/apps/web/src/components/group-header/index.tsx@@ -314,7 +314,7 @@ function GroupHeader(props: GroupHeaderProps) {{index === 0 && (<Flex mr={1}>- {groupingKey && (+ {groupingKey && groupingKey !== "reminders" && (<IconButtontestId={`${groupingKey}-sort-button`}icon={groupOptions.sortDirection === "asc" ? SortAsc : SortDesc}diff --git a/packages/core/src/collections/reminders.js b/packages/core/src/collections/reminders.jsindex 6d9e18c18..e80d0068c 100644--- a/packages/core/src/collections/reminders.js+++ b/packages/core/src/collections/reminders.js@@ -200,7 +200,7 @@ export function isReminderToday(reminder) {/*** @param {Reminder} reminder*/-function getUpcomingReminderTime(reminder) {+export function getUpcomingReminderTime(reminder) {if (reminder.mode === "once") return reminder.date;// this is only the time (hour & minutes); date is not includedconst time = dayjs(reminder.date);diff --git a/packages/core/src/utils/grouping.js b/packages/core/src/utils/grouping.jsindex 900a59c56..ff789a67d 100644--- a/packages/core/src/utils/grouping.js+++ b/packages/core/src/utils/grouping.js@@ -17,7 +17,10 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import { isReminderActive } from "../collections/reminders";+import {+ getUpcomingReminderTime,+ isReminderActive+} from "../collections/reminders";import "../types";import { getWeekGroupFromTimestamp, MONTHS_FULL } from "./date";@@ -146,7 +149,13 @@ export function groupReminders(array) {["Inactive", []]]);- array.forEach((item) => {+ 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;+ });++ sorted.forEach((item) => {const groupTitle = isReminderActive(item) ? "Active" : "Inactive";addToGroup(groups, groupTitle, item);});