From b72ce575445050a4d7b39462aacd69e9d2339345 Mon Sep 17 00:00:00 2001 From: Ricky Stretch Date: Sun, 22 Mar 2026 15:17:26 -0400 Subject: [PATCH] v0.11.23 filter schedule list bug fix --- backend/package.json | 2 +- build.sh | 2 +- frontend/package.json | 2 +- frontend/src/components/SchedulePage.jsx | 10 +++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 6baccd6..1866b8b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "jama-backend", - "version": "0.11.22", + "version": "0.11.23", "description": "TeamChat backend server", "main": "src/index.js", "scripts": { diff --git a/build.sh b/build.sh index fc54e58..fff6952 100644 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ # ───────────────────────────────────────────────────────────── set -euo pipefail -VERSION="${1:-0.11.22}" +VERSION="${1:-0.11.23}" ACTION="${2:-}" REGISTRY="${REGISTRY:-}" IMAGE_NAME="jama" diff --git a/frontend/package.json b/frontend/package.json index b3efab7..b0e484f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "jama-frontend", - "version": "0.11.22", + "version": "0.11.23", "private": true, "scripts": { "dev": "vite", diff --git a/frontend/src/components/SchedulePage.jsx b/frontend/src/components/SchedulePage.jsx index 8a47310..18c646b 100644 --- a/frontend/src/components/SchedulePage.jsx +++ b/frontend/src/components/SchedulePage.jsx @@ -856,6 +856,9 @@ function ScheduleView({ events, selectedDate, onSelect, filterKeyword='', filter const today=new Date(); today.setHours(0,0,0,0); const terms=parseKeywords(filterKeyword); const hasFilters = terms.length > 0 || !!filterTypeId || filterAvailability; + // Only keyword/availability filters should shift the date window to today-onwards. + // Type filter is for browsing within the current time window, not jumping to future-only. + const hasDateShiftingFilters = terms.length > 0 || filterAvailability; // Expand recurring events over a wide range (2 years forward) const farFuture = new Date(today); farFuture.setFullYear(farFuture.getFullYear()+2); const expandedEvents = expandEvents(events, new Date(y,m,1), farFuture); @@ -863,14 +866,15 @@ function ScheduleView({ events, selectedDate, onSelect, filterKeyword='', filter const isCurrentMonth = y === today.getFullYear() && m === today.getMonth(); // from/to logic: // - filterFromDate set (mini-calendar click): show from that date to end of its month - // - hasFilters (keyword/type/avail): show from today to far future - // - month nav (no filterFromDate, no filters): show full month, including past events in grey + // - keyword/availability filters: show from today to far future (find upcoming matches) + // - type filter only: use normal month window (same events, just filtered by type) + // - no filters: show full month, including past events in grey let from, to; if (filterFromDate) { const fd = new Date(filterFromDate); fd.setHours(0,0,0,0); from = fd; to = new Date(fd.getFullYear(), fd.getMonth()+1, 0, 23, 59, 59); - } else if (hasFilters) { + } else if (hasDateShiftingFilters) { from = today; to = new Date(9999,11,31); } else {