Skip to content

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

web: use new virtualized grouping for reminders

Abdullah Atta95b638a135af
diff --git a/apps/web/src/stores/reminder-store.js b/apps/web/src/stores/reminder-store.ts
similarity index 76%
rename from apps/web/src/stores/reminder-store.js
rename to apps/web/src/stores/reminder-store.ts
index 6ca4a8719..57224196d 100644
--- a/apps/web/src/stores/reminder-store.js
+++ b/apps/web/src/stores/reminder-store.ts
@@ -24,26 +24,28 @@ import { TaskScheduler } from "../utils/task-scheduler";
import { showReminderPreviewDialog } from "../common/dialog-controller";
import dayjs from "dayjs";
import Config from "../utils/config";
-import { store as notestore } from "./note-store";
-
import { desktop } from "../common/desktop-bridge";
-
-/**
- * @extends {BaseStore<ReminderStore>}
- */
-class ReminderStore extends BaseStore {
- reminders = [];
-
- refresh = (reset = true) => {
- // const reminders = db.reminders.all;
- // this.set((state) => (state.reminders = groupReminders(reminders)));
- // if (reset) {
- // resetReminders(reminders);
- // notestore.refresh();
- // }
+import { Reminder, VirtualizedGrouping } from "@notesnook/core";
+import { store as noteStore } from "./note-store";
+import { FilteredSelector } from "@notesnook/core/dist/database/sql-collection";
+
+class ReminderStore extends BaseStore<ReminderStore> {
+ reminders: VirtualizedGrouping<Reminder> | undefined = undefined;
+
+ refresh = async (reset = true) => {
+ const reminders = db.reminders.all;
+ this.set({
+ reminders: await reminders.grouped(
+ db.settings.getGroupOptions("reminders")
+ )
+ });
+ if (reset) {
+ await resetReminders(reminders);
+ await noteStore.refresh();
+ }
};
- delete = async (...ids) => {
+ delete = async (...ids: string[]) => {
await db.reminders.remove(...ids);
this.refresh();
};
@@ -52,7 +54,7 @@ class ReminderStore extends BaseStore {
const [useStore, store] = createStore(ReminderStore);
export { useStore, store };
-async function resetReminders(reminders) {
+async function resetReminders(reminders: FilteredSelector<Reminder>) {
await TaskScheduler.stopAllWithPrefix("reminder:");
if (
@@ -61,15 +63,19 @@ async function resetReminders(reminders) {
)
return;
- for (const reminder of reminders) {
+ for await (const reminder of reminders) {
if (reminder.disabled) continue;
// set a one time reminder at the snoozed date
- if (reminder.snoozeUntil > Date.now()) {
+ if (reminder.snoozeUntil && reminder.snoozeUntil > Date.now()) {
await scheduleReminder(
`${reminder.id}-snoozed`,
reminder,
- reminderToCronExpression({ mode: "once", date: reminder.snoozeUntil })
+ reminderToCronExpression({
+ ...reminder,
+ mode: "once",
+ date: reminder.snoozeUntil
+ })
);
}
@@ -81,14 +87,7 @@ async function resetReminders(reminders) {
}
}
-/**
- *
- * @param {string} id
- * @param {import("@notesnook/core/dist/collections/reminders").Reminder} reminder
- * @param {string} cron
- * @returns
- */
-function scheduleReminder(id, reminder, cron) {
+function scheduleReminder(id: string, reminder: Reminder, cron: string) {
return TaskScheduler.register(`reminder:${id}`, cron, async () => {
if (!Config.get("reminderNotifications", true)) return;
@@ -109,7 +108,6 @@ function scheduleReminder(id, reminder, cron) {
: reminder.priority === "vibrate"
? "normal"
: "low",
- focusOnClick: true,
tag: id
});
@@ -120,7 +118,7 @@ function scheduleReminder(id, reminder, cron) {
} else {
const notification = new Notification(reminder.title, {
body: reminder.description,
- vibrate: reminder.priority === "vibrate",
+ vibrate: reminder.priority === "vibrate" ? 200 : undefined,
silent: reminder.priority === "silent",
tag: id,
renotify: true,
@@ -137,11 +135,11 @@ function scheduleReminder(id, reminder, cron) {
});
}
-function reminderToCronExpression(reminder) {
+function reminderToCronExpression(reminder: Reminder) {
const { date, recurringMode, selectedDays, mode } = reminder;
const dateTime = dayjs(date);
- if (mode === "once") {
+ if (mode === "once" || !selectedDays) {
return dateTime.format("ss mm HH DD MM * YYYY");
} else {
const cron = dateTime.format("ss mm HH").split(" ");
diff --git a/apps/web/src/views/reminders.tsx b/apps/web/src/views/reminders.tsx
index 1601baac2..a8f948ada 100644
--- a/apps/web/src/views/reminders.tsx
+++ b/apps/web/src/views/reminders.tsx
@@ -27,7 +27,7 @@ function Reminders() {
useNavigate("reminders", () => store.refresh());
const reminders = useStore((state) => state.reminders);
const refresh = useStore((state) => state.refresh);
- console.log(reminders);
+ if (!reminders) return <Placeholder context="reminders" />;
return (
<>
<ListContainer
diff --git a/apps/web/src/views/trash.tsx b/apps/web/src/views/trash.tsx
index 4b7815dd8..60e943b79 100644
--- a/apps/web/src/views/trash.tsx
+++ b/apps/web/src/views/trash.tsx
@@ -30,6 +30,7 @@ function Trash() {
const refresh = useStore((store) => store.refresh);
const clearTrash = useStore((store) => store.clear);
+ if (!items) return <Placeholder context="trash" />;
return (
<ListContainer
group="trash"