Show Ongoing Events in Upcoming Events Section of LeftSidebar (#809)

Author: ComputelessComputer

apps/desktop/src/components/left-sidebar/index.tsx

@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import { useMatch } from "@tanstack/react-router";
-import { addDays } from "date-fns";
+import { addDays, subHours } from "date-fns";
 import { AnimatePresence, LayoutGroup, motion } from "motion/react";
 
 import { useHypr, useHyprSearch, useLeftSidebar } from "@/contexts";
@@ -43,22 +43,34 @@ export default function LeftSidebar() {
     refetchInterval: 5000,
     queryKey: ["events", ongoingSessionId],
     queryFn: async () => {
-      const events = await dbCommands.listEvents({
+      const now = new Date();
+      // Fetch events that started up to 12 hours ago.
+      // This is to include events that are currently ongoing but might have started earlier.
+      // These are then filtered by end_date to ensure we only show active or upcoming events.
+      const rawEvents = await dbCommands.listEvents({
         type: "dateRange",
         user_id: userId,
         limit: 3,
-        start: new Date().toISOString(),
-        end: addDays(new Date(), 28).toISOString(),
+        start: subHours(now, 12).toISOString(),
+        end: addDays(now, 28).toISOString(),
       });
 
+      const ongoingOrUpcomingEvents = rawEvents.filter(
+        (event) => event.end_date > now.toISOString(),
+      );
+
+      if (ongoingOrUpcomingEvents.length === 0) {
+        return [];
+      }
+
       const sessions = await Promise.all(
-        events.map((event) => dbCommands.getSession({ calendarEventId: event.id })),
+        ongoingOrUpcomingEvents.map((event) => dbCommands.getSession({ calendarEventId: event.id })),
       );
       sessions
         .filter((s) => s !== null)
-        .forEach((s) => insertSession(s));
+        .forEach((s) => insertSession(s!));
 
-      return events.map((event, index) => ({
+      return ongoingOrUpcomingEvents.map((event, index) => ({
         ...event,
         session: sessions[index],
       }));

apps/desktop/src/locales/en/messages.po

@@ -208,6 +208,41 @@ msgstr "1 day later"
 msgid "{weeks} weeks later"
 msgstr "{weeks} weeks later"
 
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:168
+#~ msgid "just now"
+#~ msgstr "just now"
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:207
+#~ msgid "in progress"
+#~ msgstr "in progress"
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:223
+#~ msgid "in {seconds} seconds"
+#~ msgstr "in {seconds} seconds"
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:225
+#~ msgid "in 1 minute"
+#~ msgstr "in 1 minute"
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:227
+#~ msgid "in {minutes} minutes"
+#~ msgstr "in {minutes} minutes"
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:229
+#~ msgid "in 1 hour"
+#~ msgstr "in 1 hour"
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:231
+#~ msgid "in {hours} hours"
+#~ msgstr "in {hours} hours"
+
 #: src/components/settings/views/notifications.tsx:105
 msgid "(Beta) Detect meetings automatically"
 msgstr "(Beta) Detect meetings automatically"

apps/desktop/src/locales/ko/messages.po

@@ -208,6 +208,41 @@ msgstr ""
 msgid "{weeks} weeks later"
 msgstr ""
 
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:168
+#~ msgid "just now"
+#~ msgstr ""
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:207
+#~ msgid "in progress"
+#~ msgstr ""
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:223
+#~ msgid "in {seconds} seconds"
+#~ msgstr ""
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:225
+#~ msgid "in 1 minute"
+#~ msgstr ""
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:227
+#~ msgid "in {minutes} minutes"
+#~ msgstr ""
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:229
+#~ msgid "in 1 hour"
+#~ msgstr ""
+
+#. js-lingui-explicit-id
+#: ../../packages/utils/src/datetime.ts:231
+#~ msgid "in {hours} hours"
+#~ msgstr ""
+
 #: src/components/settings/views/notifications.tsx:105
 msgid "(Beta) Detect meetings automatically"
 msgstr ""

apps/docs/data/i18n.json

@@ -1,12 +1,12 @@
 [
   {
     "language": "ko",
-    "total": 239,
-    "missing": 239
+    "total": 267,
+    "missing": 267
   },
   {
     "language": "en (source)",
-    "total": 239,
+    "total": 267,
     "missing": 0
   }
 ]