Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(web): address calendar view review feedback

FVOCI93b78a0df9b5
diff --git a/apps/web/src/components/calendar/calendar-task-bar.tsx b/apps/web/src/components/calendar/calendar-task-bar.tsx
index fdf7534ee..066c6cd12 100644
--- a/apps/web/src/components/calendar/calendar-task-bar.tsx
+++ b/apps/web/src/components/calendar/calendar-task-bar.tsx
@@ -1,3 +1,4 @@
+import type { JSX } from "react";
import { useTranslation } from "react-i18next";
import { cn } from "@/lib/cn";
import { formatDateShort } from "@/lib/format";
@@ -18,7 +19,7 @@ export default function CalendarTaskBar({
segment,
projectSlug,
onOpenTask,
-}: CalendarTaskBarProps) {
+}: CalendarTaskBarProps): JSX.Element {
const { t } = useTranslation();
const {
task,
diff --git a/apps/web/src/components/calendar/calendar-toolbar.tsx b/apps/web/src/components/calendar/calendar-toolbar.tsx
index 86dd358f3..bf13b3594 100644
--- a/apps/web/src/components/calendar/calendar-toolbar.tsx
+++ b/apps/web/src/components/calendar/calendar-toolbar.tsx
@@ -1,4 +1,5 @@
import { ChevronLeft, ChevronRight } from "lucide-react";
+import type { JSX } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/components/ui/button";
import { formatDate } from "@/lib/format";
@@ -15,7 +16,7 @@ export default function CalendarToolbar({
onPreviousMonth,
onNextMonth,
onToday,
-}: CalendarToolbarProps) {
+}: CalendarToolbarProps): JSX.Element {
const { t } = useTranslation();
return (
diff --git a/apps/web/src/components/calendar/day-overflow-popover.tsx b/apps/web/src/components/calendar/day-overflow-popover.tsx
index a5e2c9422..73a68b9d2 100644
--- a/apps/web/src/components/calendar/day-overflow-popover.tsx
+++ b/apps/web/src/components/calendar/day-overflow-popover.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { type JSX, useState } from "react";
import { useTranslation } from "react-i18next";
import {
Popover,
@@ -23,7 +23,7 @@ export default function DayOverflowPopover({
hiddenCount,
projectSlug,
onOpenTask,
-}: DayOverflowPopoverProps) {
+}: DayOverflowPopoverProps): JSX.Element {
const { t } = useTranslation();
const [open, setOpen] = useState(false);
diff --git a/apps/web/src/components/calendar/month-grid.tsx b/apps/web/src/components/calendar/month-grid.tsx
index d7e130af1..2062edc4a 100644
--- a/apps/web/src/components/calendar/month-grid.tsx
+++ b/apps/web/src/components/calendar/month-grid.tsx
@@ -1,4 +1,5 @@
import { format, isSameMonth, isToday, isWeekend } from "date-fns";
+import { type JSX, useMemo } from "react";
import { cn } from "@/lib/cn";
import { formatDate } from "@/lib/format";
import CalendarTaskBar, { type CalendarTask } from "./calendar-task-bar";
@@ -21,8 +22,12 @@ export default function MonthGrid({
maxLanes,
projectSlug,
onOpenTask,
-}: MonthGridProps) {
+}: MonthGridProps): JSX.Element {
const weekdayTemplate = weeks[0] ?? [];
+ const layouts = useMemo(
+ () => weeks.map((week) => packWeekLanes(week, tasks, maxLanes)),
+ [weeks, tasks, maxLanes],
+ );
return (
<div className="flex min-h-0 flex-1 flex-col overflow-auto overscroll-x-contain">
@@ -38,12 +43,8 @@ export default function MonthGrid({
</div>
<div className="flex min-h-0 flex-1 flex-col">
- {weeks.map((week) => {
- const { segments, hiddenCountByDay, tasksByDay } = packWeekLanes(
- week,
- tasks,
- maxLanes,
- );
+ {weeks.map((week, weekIndex) => {
+ const { segments, hiddenCountByDay, tasksByDay } = layouts[weekIndex];
return (
<div
diff --git a/apps/web/src/components/common/header/mobile-project-nav.tsx b/apps/web/src/components/common/header/mobile-project-nav.tsx
index a50d97ce2..8c0f13d0d 100644
--- a/apps/web/src/components/common/header/mobile-project-nav.tsx
+++ b/apps/web/src/components/common/header/mobile-project-nav.tsx
@@ -6,6 +6,7 @@ import {
Plus,
SquareKanban,
} from "lucide-react";
+import { useTranslation } from "react-i18next";
import { Button } from "@/components/ui/button";
import {
Popover,
@@ -39,6 +40,7 @@ export default function MobileProjectNav({
onSelectProject,
onAddProject,
}: MobileProjectNavProps) {
+ const { t } = useTranslation();
const { data: projects = [] } = useGetProjects({ workspaceId });
return (
@@ -97,7 +99,7 @@ export default function MobileProjectNav({
)}
>
<CalendarRange className="size-3.5" />
- Calendar
+ {t("tasks:calendar.title")}
</button>
<button
type="button"
diff --git a/apps/web/src/components/common/project-layout.tsx b/apps/web/src/components/common/project-layout.tsx
index 279a20c27..1a3b5c285 100644
--- a/apps/web/src/components/common/project-layout.tsx
+++ b/apps/web/src/components/common/project-layout.tsx
@@ -6,6 +6,7 @@ import {
SquircleDashed,
} from "lucide-react";
import { type ReactNode, useState } from "react";
+import { useTranslation } from "react-i18next";
import MobileProjectNav from "@/components/common/header/mobile-project-nav";
import ProjectCrumbSelect from "@/components/common/header/project-crumb-select";
import WorkspaceCrumbSelect from "@/components/common/header/workspace-crumb-select";
@@ -42,6 +43,7 @@ export default function ProjectLayout({
showViewSwitcher = true,
activeView,
}: ProjectLayoutProps) {
+ const { t } = useTranslation();
const navigate = useNavigate();
const location = useLocation();
const { data: project } = useGetProject({ id: projectId, workspaceId });
@@ -193,7 +195,7 @@ export default function ProjectLayout({
)}
>
<CalendarRange className="size-3.5" />
- Calendar
+ {t("tasks:calendar.title")}
</Button>
<Button
variant={resolvedView === "gantt" ? "secondary" : "ghost"}
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/calendar.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/calendar.tsx
index 9cbe729d0..0910daaf7 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/calendar.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/calendar.tsx
@@ -38,7 +38,7 @@ function RouteComponent() {
const { projectId, workspaceId } = Route.useParams();
const { taskId } = Route.useSearch();
const navigate = useNavigate();
- const { data: project } = useGetTasks(projectId);
+ const { data: project, isLoading, isError } = useGetTasks(projectId);
const weekStartsOn = useUserPreferencesStore((state) => state.weekStartsOn);
const setViewMode = useUserPreferencesStore((state) => state.setViewMode);
const isMobile = useIsMobile();
@@ -128,7 +128,19 @@ function RouteComponent() {
onToday={handleToday}
/>
- {scheduledTasks.length === 0 ? (
+ {isLoading ? (
+ <div className="border-b border-border/80 px-4 py-3 text-center">
+ <p className="text-sm text-muted-foreground">
+ {t("common:empty.loading")}
+ </p>
+ </div>
+ ) : isError ? (
+ <div className="border-b border-border/80 px-4 py-3 text-center">
+ <p className="text-sm font-semibold text-destructive">
+ {t("tasks:calendar.loadError")}
+ </p>
+ </div>
+ ) : scheduledTasks.length === 0 ? (
<div className="border-b border-border/80 px-4 py-3 text-center">
<p className="text-sm font-semibold text-foreground">
{t("tasks:calendar.noTasks")}
diff --git a/i18n/en-US.json b/i18n/en-US.json
index 7851fdb1a..9bf35797a 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -1837,6 +1837,7 @@
"noTasks": "No scheduled tasks",
"noTasksSubtitle": "Add a start date, due date, or both to tasks to place them on the calendar.",
"moreTasks": "+{{count}} more",
+ "loadError": "Failed to load tasks.",
"dayTasksAriaLabel": "Show all tasks for {{date}}",
"taskAriaLabel": "{{title}}: open task"
},