Reorganize repo structure and standards references
This commit is contained in:
1 parent
3cb93a81be
commit
be2054274d
5885 files changed
+2588
-195
No files matched your search
+34
@@ -0,0 +1,34 @@
|
||||
import { describe, it, expect, vi } from "vitest";
|
||||
import { render } from "@testing-library/react";
|
||||
import React from "react";
|
||||
import DateCell from "./DateCell";
|
||||
|
||||
vi.mock("react-i18next", () => ({
|
||||
useTranslation: () => ({
|
||||
i18n: { language: "en" },
|
||||
}),
|
||||
}));
|
||||
|
||||
describe("DateCell", () => {
|
||||
it("renders date with default displays", () => {
|
||||
const date = new Date(Date.now() - 60 * 60 * 1000);
|
||||
const { container } = render(<DateCell date={date} />);
|
||||
expect(container.querySelector("div")).not.toBeNull();
|
||||
expect(container.querySelector("div")?.getAttribute("title")).toBeTruthy();
|
||||
expect(container.textContent).toMatch(/ago|vor/i);
|
||||
});
|
||||
|
||||
it("renders date with specific displays", () => {
|
||||
const date = new Date(Date.now() - 60 * 60 * 1000);
|
||||
const { container } = render(<DateCell date={date} displays={["dm", "ago"]} />);
|
||||
expect(container.querySelector("div")).not.toBeNull();
|
||||
expect(container.querySelector("div")?.getAttribute("title")).toBeTruthy();
|
||||
expect(container.textContent).toMatch(/ago|vor/i);
|
||||
expect(container.textContent).not.toContain("ymd");
|
||||
});
|
||||
|
||||
it("renders empty when date is null", () => {
|
||||
const { container } = render(<DateCell date={null} />);
|
||||
expect(container.querySelector("div")).toBeNull();
|
||||
});
|
||||
});
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
import clsx from "clsx";
|
||||
import { cn } from "~/lib/utils";
|
||||
import { useLocaleFormatters } from "~/locale/format";
|
||||
import type { DateDisplay } from "~/utils/shared/DateUtils";
|
||||
|
||||
export default function DateCell({ date, displays = ["ymd", "ago"], className }: { date: Date | null; displays?: DateDisplay[]; className?: string }) {
|
||||
const fmt = useLocaleFormatters();
|
||||
return (
|
||||
<>
|
||||
{date && (
|
||||
<div title={fmt.dateTime(date)} className={cn("flex flex-col", className)}>
|
||||
{displays.includes("ymd") && <div>{fmt.date(date, { dateStyle: "medium" })}</div>}
|
||||
{displays.includes("dm") && <div>{fmt.date(date, { day: "numeric", month: "short" })}</div>}
|
||||
{displays.includes("mdy") && <div>{fmt.date(date, { dateStyle: "long" })}</div>}
|
||||
{displays.includes("hms") && <div>{fmt.date(date, { timeStyle: "medium" })}</div>}
|
||||
{displays.includes("ymdhms") && <div>{fmt.dateTime(date)}</div>}
|
||||
{displays.includes("ymdhmsms") && (
|
||||
<div>
|
||||
{fmt.date(date, {
|
||||
year: "numeric",
|
||||
month: "2-digit",
|
||||
day: "2-digit",
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
second: "2-digit",
|
||||
fractionalSecondDigits: 3,
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
{displays.includes("ago") && <div className={clsx(displays.length > 1 && "text-xs")}>{fmt.relativeDate(date)}</div>}
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import { createDateRangePresets, getDateKeyInTimezone } from "./DateRangeFilter";
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers();
|
||||
});
|
||||
|
||||
describe("createDateRangePresets", () => {
|
||||
it("uses translated labels for short preset names", () => {
|
||||
const presets = createDateRangePresets("UTC", (key) => {
|
||||
const copy: Record<string, string> = {
|
||||
"shared.dateRange.today": "Heute",
|
||||
"shared.dateRange.yesterday": "Gestern",
|
||||
"shared.dateRange.last7Days": "Letzte 7 Tage",
|
||||
"shared.dateRange.last14Days": "Letzte 14 Tage",
|
||||
"shared.dateRange.last30Days": "Letzte 30 Tage",
|
||||
"shared.dateRange.thisWeek": "Diese Woche",
|
||||
"shared.dateRange.lastWeek": "Letzte Woche",
|
||||
"shared.dateRange.thisMonth": "Dieser Monat",
|
||||
"shared.dateRange.lastMonth": "Letzter Monat",
|
||||
"shared.dateRange.thisYear": "Dieses Jahr",
|
||||
"shared.dateRange.custom": "Benutzerdefiniert",
|
||||
};
|
||||
return copy[key] ?? key;
|
||||
});
|
||||
|
||||
expect(presets.find((preset) => preset.value === "today")?.label).toBe("Heute");
|
||||
expect(presets.find((preset) => preset.value === "yesterday")?.label).toBe("Gestern");
|
||||
expect(presets.find((preset) => preset.value === "last-7-days")?.label).toBe("Letzte 7 Tage");
|
||||
expect(presets.find((preset) => preset.value === "last-14-days")?.label).toBe("Letzte 14 Tage");
|
||||
expect(presets.find((preset) => preset.value === "last-30-days")?.label).toBe("Letzte 30 Tage");
|
||||
expect(presets.find((preset) => preset.value === "this-week")?.label).toBe("Diese Woche");
|
||||
expect(presets.find((preset) => preset.value === "last-week")?.label).toBe("Letzte Woche");
|
||||
expect(presets.find((preset) => preset.value === "this-month")?.label).toBe("Dieser Monat");
|
||||
expect(presets.find((preset) => preset.value === "last-month")?.label).toBe("Letzter Monat");
|
||||
expect(presets.find((preset) => preset.value === "this-year")?.label).toBe("Dieses Jahr");
|
||||
expect(presets.find((preset) => preset.value === "custom")?.label).toBe("Benutzerdefiniert");
|
||||
});
|
||||
|
||||
it("does not depend on autogenerated keys for preset labels", () => {
|
||||
const source = createDateRangePresets.toString();
|
||||
|
||||
expect(source).not.toContain("ui.autogenerated");
|
||||
});
|
||||
|
||||
it("uses the active locale week start for week presets", () => {
|
||||
vi.useFakeTimers();
|
||||
vi.setSystemTime(new Date("2026-05-27T12:00:00Z"));
|
||||
|
||||
const germanWeek = createDateRangePresets("UTC", (key) => key, { weekStartsOn: 1 }).find((preset) => preset.value === "this-week")?.getRange();
|
||||
const englishWeek = createDateRangePresets("UTC", (key) => key, { weekStartsOn: 0 }).find((preset) => preset.value === "this-week")?.getRange();
|
||||
|
||||
expect(germanWeek).toBeDefined();
|
||||
expect(englishWeek).toBeDefined();
|
||||
expect(getDateKeyInTimezone(germanWeek!.from, "UTC")).toBe("2026-05-25");
|
||||
expect(getDateKeyInTimezone(germanWeek!.to, "UTC")).toBe("2026-05-31");
|
||||
expect(getDateKeyInTimezone(englishWeek!.from, "UTC")).toBe("2026-05-24");
|
||||
expect(getDateKeyInTimezone(englishWeek!.to, "UTC")).toBe("2026-05-30");
|
||||
});
|
||||
});
|
||||
+469
@@ -0,0 +1,469 @@
|
||||
import { useState, useEffect, useMemo } from "react";
|
||||
import { t as i18nT } from "i18next";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { CalendarIcon } from "~/components/ui/icons/vendor";
|
||||
import { DateRange } from "react-day-picker";
|
||||
import { cn } from "~/lib/utils";
|
||||
import { Button } from "~/components/ui/button";
|
||||
import { Calendar } from "~/components/ui/calendar";
|
||||
import { Popover, PopoverContent, PopoverTrigger } from "~/components/ui/popover";
|
||||
import { Separator } from "~/components/ui/separator";
|
||||
import { toZonedTime, formatInTimeZone } from "date-fns-tz";
|
||||
import { getLocaleWeekStartsOn } from "~/locale/date-fns";
|
||||
import { useLocaleFormatters } from "~/locale/format";
|
||||
|
||||
type DateRangeTranslator = (key: string) => string;
|
||||
|
||||
export type DateRangePreset = {
|
||||
value: string;
|
||||
label: string;
|
||||
getRange: () => { from: Date; to: Date };
|
||||
};
|
||||
|
||||
type DateRangePresetOptions = {
|
||||
weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
|
||||
};
|
||||
|
||||
export function getDateKeyInTimezone(date: Date, timezone: string): string {
|
||||
return formatInTimeZone(date, timezone, "yyyy-MM-dd");
|
||||
}
|
||||
|
||||
// Factory function to create timezone-aware presets
|
||||
export const createDateRangePresets = (
|
||||
timezone: string,
|
||||
t: DateRangeTranslator = (key) => String(i18nT(key)),
|
||||
options: DateRangePresetOptions = {}
|
||||
): DateRangePreset[] => {
|
||||
const weekStartsOn = options.weekStartsOn ?? 1;
|
||||
// Helper function to get start and end of day in a specific timezone
|
||||
const getDateRangeInTimezone = (date: Date, timezone: string) => {
|
||||
const zonedDate = toZonedTime(date, timezone);
|
||||
const year = zonedDate.getFullYear();
|
||||
const month = String(zonedDate.getMonth() + 1).padStart(2, "0");
|
||||
const day = String(zonedDate.getDate()).padStart(2, "0");
|
||||
|
||||
const startStr = `${year}-${month}-${day}T00:00:00`;
|
||||
const endStr = `${year}-${month}-${day}T23:59:59.999`;
|
||||
|
||||
const startOffset = formatInTimeZone(new Date(startStr), timezone, "xxx");
|
||||
const endOffset = formatInTimeZone(new Date(endStr), timezone, "xxx");
|
||||
|
||||
const startIsoString = `${startStr}${startOffset}`;
|
||||
const endIsoString = `${endStr}${endOffset}`;
|
||||
|
||||
return {
|
||||
from: new Date(startIsoString),
|
||||
to: new Date(endIsoString),
|
||||
};
|
||||
};
|
||||
|
||||
return [
|
||||
{
|
||||
value: "today",
|
||||
label: t("shared.dateRange.today"),
|
||||
getRange: () => {
|
||||
const now = new Date();
|
||||
return getDateRangeInTimezone(now, timezone);
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "yesterday",
|
||||
label: t("shared.dateRange.yesterday"),
|
||||
getRange: () => {
|
||||
const yesterday = new Date();
|
||||
yesterday.setDate(yesterday.getDate() - 1);
|
||||
return getDateRangeInTimezone(yesterday, timezone);
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "last-7-days",
|
||||
label: t("shared.dateRange.last7Days"),
|
||||
getRange: () => {
|
||||
const end = new Date();
|
||||
const endRange = getDateRangeInTimezone(end, timezone);
|
||||
const start = new Date();
|
||||
start.setDate(start.getDate() - 7);
|
||||
const startRange = getDateRangeInTimezone(start, timezone);
|
||||
return { from: startRange.from, to: endRange.to };
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "last-14-days",
|
||||
label: t("shared.dateRange.last14Days"),
|
||||
getRange: () => {
|
||||
const end = new Date();
|
||||
const endRange = getDateRangeInTimezone(end, timezone);
|
||||
const start = new Date();
|
||||
start.setDate(start.getDate() - 14);
|
||||
const startRange = getDateRangeInTimezone(start, timezone);
|
||||
return { from: startRange.from, to: endRange.to };
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "last-30-days",
|
||||
label: t("shared.dateRange.last30Days"),
|
||||
getRange: () => {
|
||||
const end = new Date();
|
||||
const endRange = getDateRangeInTimezone(end, timezone);
|
||||
const start = new Date();
|
||||
start.setDate(start.getDate() - 30);
|
||||
const startRange = getDateRangeInTimezone(start, timezone);
|
||||
return { from: startRange.from, to: endRange.to };
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "this-week",
|
||||
label: t("shared.dateRange.thisWeek"),
|
||||
getRange: () => {
|
||||
const now = new Date();
|
||||
const zonedNow = toZonedTime(now, timezone);
|
||||
const dayOfWeek = zonedNow.getDay();
|
||||
const daysSinceWeekStart = (dayOfWeek - weekStartsOn + 7) % 7;
|
||||
const start = new Date(zonedNow);
|
||||
start.setDate(zonedNow.getDate() - daysSinceWeekStart);
|
||||
const startRange = getDateRangeInTimezone(start, timezone);
|
||||
const end = new Date(start);
|
||||
end.setDate(start.getDate() + 6);
|
||||
const endRange = getDateRangeInTimezone(end, timezone);
|
||||
return { from: startRange.from, to: endRange.to };
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "last-week",
|
||||
label: t("shared.dateRange.lastWeek"),
|
||||
getRange: () => {
|
||||
const now = new Date();
|
||||
const zonedNow = toZonedTime(now, timezone);
|
||||
const dayOfWeek = zonedNow.getDay();
|
||||
const daysSinceWeekStart = (dayOfWeek - weekStartsOn + 7) % 7;
|
||||
const start = new Date(zonedNow);
|
||||
start.setDate(zonedNow.getDate() - daysSinceWeekStart - 7);
|
||||
const startRange = getDateRangeInTimezone(start, timezone);
|
||||
const end = new Date(start);
|
||||
end.setDate(start.getDate() + 6);
|
||||
const endRange = getDateRangeInTimezone(end, timezone);
|
||||
return { from: startRange.from, to: endRange.to };
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "this-month",
|
||||
label: t("shared.dateRange.thisMonth"),
|
||||
getRange: () => {
|
||||
const now = new Date();
|
||||
const zonedNow = toZonedTime(now, timezone);
|
||||
const start = new Date(zonedNow.getFullYear(), zonedNow.getMonth(), 1);
|
||||
const startRange = getDateRangeInTimezone(start, timezone);
|
||||
const end = new Date(zonedNow.getFullYear(), zonedNow.getMonth() + 1, 0);
|
||||
const endRange = getDateRangeInTimezone(end, timezone);
|
||||
return { from: startRange.from, to: endRange.to };
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "last-month",
|
||||
label: t("shared.dateRange.lastMonth"),
|
||||
getRange: () => {
|
||||
const now = new Date();
|
||||
const zonedNow = toZonedTime(now, timezone);
|
||||
const start = new Date(zonedNow.getFullYear(), zonedNow.getMonth() - 1, 1);
|
||||
const startRange = getDateRangeInTimezone(start, timezone);
|
||||
const end = new Date(zonedNow.getFullYear(), zonedNow.getMonth(), 0);
|
||||
const endRange = getDateRangeInTimezone(end, timezone);
|
||||
return { from: startRange.from, to: endRange.to };
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "this-year",
|
||||
label: t("shared.dateRange.thisYear"),
|
||||
getRange: () => {
|
||||
const now = new Date();
|
||||
const zonedNow = toZonedTime(now, timezone);
|
||||
const start = new Date(zonedNow.getFullYear(), 0, 1);
|
||||
const startRange = getDateRangeInTimezone(start, timezone);
|
||||
const end = new Date(zonedNow.getFullYear(), 11, 31);
|
||||
const endRange = getDateRangeInTimezone(end, timezone);
|
||||
return { from: startRange.from, to: endRange.to };
|
||||
},
|
||||
},
|
||||
{
|
||||
value: "custom",
|
||||
label: t("shared.dateRange.custom"),
|
||||
getRange: () => {
|
||||
return { from: new Date(), to: new Date() };
|
||||
},
|
||||
},
|
||||
];
|
||||
};
|
||||
|
||||
// Default presets for backward compatibility
|
||||
export const dateRangePresets = createDateRangePresets("UTC");
|
||||
|
||||
interface DateRangeFilterProps {
|
||||
value?: DateRange;
|
||||
onChange: (range: DateRange | undefined) => void;
|
||||
placeholder?: string;
|
||||
className?: string;
|
||||
disabled?: boolean;
|
||||
showPresets?: boolean;
|
||||
align?: "start" | "center" | "end";
|
||||
size?: "xs" | "default" | "sm" | "lg";
|
||||
childclass?: string;
|
||||
variant?: "default" | "full";
|
||||
}
|
||||
|
||||
export function DateRangeFilter({
|
||||
value,
|
||||
onChange,
|
||||
placeholder = i18nT("shared.dateRange.pickRange"),
|
||||
className,
|
||||
disabled = false,
|
||||
size = "default",
|
||||
childclass,
|
||||
variant = "default",
|
||||
}: DateRangeFilterProps) {
|
||||
const { t } = useTranslation();
|
||||
const formatters = useLocaleFormatters();
|
||||
const weekStartsOn = getLocaleWeekStartsOn(formatters.locale);
|
||||
const [open, setOpen] = useState(false);
|
||||
const [tempDateRange, setTempDateRange] = useState<DateRange | undefined>(value);
|
||||
const [activePreset, setActivePreset] = useState<string | null>(null);
|
||||
const [showPresets, setShowPresets] = useState(value ? false : true);
|
||||
|
||||
// Get timezone from app data, fall back to UTC if not available
|
||||
let timezone = "UTC";
|
||||
// try {
|
||||
// const appData = useAppData();
|
||||
// timezone = appData?.timezone || "UTC";
|
||||
// } catch (error) {
|
||||
// // useAppData might not be available in all contexts, fall back to UTC
|
||||
// console.debug("DateRangeFilter: useAppData not available, using UTC timezone");
|
||||
// }
|
||||
|
||||
// Create timezone-aware presets
|
||||
const dateRangePresetsWithTimezone = useMemo(
|
||||
() => createDateRangePresets(timezone, (key) => String(t(key)), { weekStartsOn }),
|
||||
[t, timezone, weekStartsOn]
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
setTempDateRange(value);
|
||||
// Check if current value matches any preset
|
||||
if (value?.from && value?.to) {
|
||||
const valueFrom = value.from;
|
||||
const valueTo = value.to;
|
||||
const matchingPreset = dateRangePresetsWithTimezone.find((preset) => {
|
||||
const range = preset.getRange();
|
||||
return (
|
||||
getDateKeyInTimezone(range.from, timezone) === getDateKeyInTimezone(valueFrom, timezone) &&
|
||||
getDateKeyInTimezone(range.to, timezone) === getDateKeyInTimezone(valueTo, timezone)
|
||||
);
|
||||
});
|
||||
setActivePreset(matchingPreset?.value || null);
|
||||
} else {
|
||||
setActivePreset(null);
|
||||
}
|
||||
}, [dateRangePresetsWithTimezone, value, timezone]);
|
||||
|
||||
const handlePresetClick = (presetValue: string) => {
|
||||
const preset = dateRangePresetsWithTimezone.find((p) => p.value === presetValue);
|
||||
if (preset) {
|
||||
if (preset.value === "custom") {
|
||||
setShowPresets(false);
|
||||
} else {
|
||||
const range = preset.getRange();
|
||||
setTempDateRange(range);
|
||||
setActivePreset(presetValue);
|
||||
onChange(range);
|
||||
setOpen(false);
|
||||
setShowPresets(true);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const handleDateRangeChange = (range: DateRange | undefined) => {
|
||||
setTempDateRange(range);
|
||||
setActivePreset(null);
|
||||
};
|
||||
|
||||
const handleApply = () => {
|
||||
// Adjust the date range to include the full day in the user's timezone
|
||||
if (tempDateRange?.from) {
|
||||
// Convert the selected dates to the user's timezone and get start/end of day
|
||||
const zonedFromDate = toZonedTime(tempDateRange.from, timezone);
|
||||
const fromYear = zonedFromDate.getFullYear();
|
||||
const fromMonth = String(zonedFromDate.getMonth() + 1).padStart(2, "0");
|
||||
const fromDay = String(zonedFromDate.getDate()).padStart(2, "0");
|
||||
|
||||
const fromStartStr = `${fromYear}-${fromMonth}-${fromDay}T00:00:00`;
|
||||
const fromOffset = formatInTimeZone(new Date(fromStartStr), timezone, "xxx");
|
||||
const fromIsoString = `${fromStartStr}${fromOffset}`;
|
||||
|
||||
const adjustedRange: DateRange = {
|
||||
from: new Date(fromIsoString),
|
||||
};
|
||||
|
||||
if (tempDateRange.to) {
|
||||
// Set the end date to the end of the day in the user's timezone
|
||||
const zonedToDate = toZonedTime(tempDateRange.to, timezone);
|
||||
const toYear = zonedToDate.getFullYear();
|
||||
const toMonth = String(zonedToDate.getMonth() + 1).padStart(2, "0");
|
||||
const toDay = String(zonedToDate.getDate()).padStart(2, "0");
|
||||
|
||||
const toEndStr = `${toYear}-${toMonth}-${toDay}T23:59:59.999`;
|
||||
const toOffset = formatInTimeZone(new Date(toEndStr), timezone, "xxx");
|
||||
const toIsoString = `${toEndStr}${toOffset}`;
|
||||
|
||||
adjustedRange.to = new Date(toIsoString);
|
||||
}
|
||||
|
||||
onChange(adjustedRange);
|
||||
} else {
|
||||
onChange(tempDateRange);
|
||||
}
|
||||
setOpen(false);
|
||||
};
|
||||
|
||||
const handleReset = () => {
|
||||
setTempDateRange(undefined);
|
||||
setActivePreset(null);
|
||||
onChange(undefined);
|
||||
setOpen(false);
|
||||
};
|
||||
|
||||
const formatDateRange = () => {
|
||||
const range = value;
|
||||
if (!range?.from) return placeholder;
|
||||
if (!range.to) return formatters.date(range.from, { dateStyle: "medium", timeZone: timezone });
|
||||
|
||||
// Check if the current range matches any preset
|
||||
for (const preset of dateRangePresetsWithTimezone) {
|
||||
const presetRange = preset.getRange();
|
||||
if (
|
||||
getDateKeyInTimezone(range.from, timezone) === getDateKeyInTimezone(presetRange.from, timezone) &&
|
||||
getDateKeyInTimezone(range.to, timezone) === getDateKeyInTimezone(presetRange.to, timezone)
|
||||
) {
|
||||
return preset.label;
|
||||
}
|
||||
}
|
||||
|
||||
return `${formatters.date(range.from, { dateStyle: "medium", timeZone: timezone })} - ${formatters.date(range.to, {
|
||||
dateStyle: "medium",
|
||||
timeZone: timezone,
|
||||
})}`;
|
||||
};
|
||||
|
||||
const hasValue = value?.from || value?.to;
|
||||
|
||||
return (
|
||||
<div className={cn("grid gap-2", className)}>
|
||||
<Popover modal={true} open={open} onOpenChange={setOpen}>
|
||||
<PopoverTrigger asChild>
|
||||
<Button id="date" variant="outline" size={size} className={cn("justify-start truncate pl-3 text-left font-normal", childclass)} disabled={disabled}>
|
||||
{variant === "full" && (
|
||||
<div className={cn("flex items-center gap-2 truncate", !hasValue && "text-text-neutral-tertiary")}>
|
||||
<CalendarIcon className="size-3.5" />
|
||||
<div className="truncate">{formatDateRange()}</div>
|
||||
</div>
|
||||
)}
|
||||
{variant === "default" && (
|
||||
<div className="flex items-center gap-2">
|
||||
<CalendarIcon className="size-3.5" />
|
||||
<div className="hidden 2xl:block">{formatDateRange()}</div>
|
||||
</div>
|
||||
)}
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent className="bg-surface-neutral-primary mb-4 overflow-y-auto p-3" side="bottom" sideOffset={4}>
|
||||
<div className="space-y-3">
|
||||
<div className="flex justify-between gap-2">
|
||||
<div className="flex flex-1 gap-2">
|
||||
<Button type="button" variant="outline" size="sm" onClick={handleReset} disabled={!value && !tempDateRange}>
|
||||
{t("shared.reset")}
|
||||
</Button>
|
||||
<Button type="button" variant="outline" size="sm" onClick={() => setShowPresets(!showPresets)}>
|
||||
{showPresets ? t("shared.dateRange.custom") : t("shared.dateRange.presets")}
|
||||
</Button>
|
||||
</div>
|
||||
<Button type="button" variant="outline" size="sm" onClick={handleApply} disabled={disabled}>
|
||||
{t("shared.apply")}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
<Separator />
|
||||
|
||||
<div className="max-h-[200px] space-y-3 overflow-y-auto pb-4 sm:max-h-[400px]">
|
||||
{showPresets && (
|
||||
<div className="grid grid-cols-2 gap-1">
|
||||
{dateRangePresetsWithTimezone.map((preset) => (
|
||||
<Button
|
||||
key={preset.value}
|
||||
variant={activePreset === preset.value ? "secondary" : "ghost"}
|
||||
size="sm"
|
||||
className="justify-start"
|
||||
onClick={() => handlePresetClick(preset.value)}
|
||||
>
|
||||
{preset.label}
|
||||
</Button>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
{/* {showPresets && <Separator />} */}
|
||||
{!showPresets && (
|
||||
<div className="space-y-3">
|
||||
<Calendar
|
||||
mode="range"
|
||||
selected={tempDateRange}
|
||||
onSelect={handleDateRangeChange}
|
||||
defaultMonth={tempDateRange?.from}
|
||||
numberOfMonths={1}
|
||||
disabled={disabled}
|
||||
className="bg-surface-neutral-primary rounded-md border"
|
||||
/>
|
||||
{tempDateRange?.from && (
|
||||
<div className="text-text-neutral-tertiary text-center text-xs">
|
||||
{tempDateRange.from && !tempDateRange.to && t("shared.dateRange.selectEndDate")}
|
||||
{tempDateRange.from && tempDateRange.to && (
|
||||
<>
|
||||
{formatters.date(tempDateRange.from, { dateStyle: "medium" })} - {formatters.date(tempDateRange.to, { dateStyle: "medium" })}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
// Helper function to convert DateRange to query params
|
||||
export function dateRangeToParams(range: DateRange | undefined): { fromDate?: string; toDate?: string } {
|
||||
if (!range?.from) return {};
|
||||
|
||||
const params: { fromDate?: string; toDate?: string } = {
|
||||
fromDate: range.from.toISOString(),
|
||||
};
|
||||
|
||||
if (range.to) {
|
||||
params.toDate = range.to.toISOString();
|
||||
}
|
||||
|
||||
return params;
|
||||
}
|
||||
|
||||
// Helper function to convert query params to DateRange
|
||||
export function paramsToDateRange(fromDate?: string | null, toDate?: string | null): DateRange | undefined {
|
||||
if (!fromDate) return undefined;
|
||||
|
||||
const range: DateRange = {
|
||||
from: new Date(fromDate),
|
||||
};
|
||||
|
||||
if (toDate) {
|
||||
range.to = new Date(toDate);
|
||||
}
|
||||
|
||||
return range;
|
||||
}
|
||||
+100
@@ -0,0 +1,100 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useSearchParams } from "react-router";
|
||||
import { DateRange } from "react-day-picker";
|
||||
import { t as i18nT } from "i18next";
|
||||
import { FilterDto } from "~/components/ui/input/InputFilters";
|
||||
import { DateRangeFilter, dateRangeToParams, paramsToDateRange } from "./DateRangeFilter";
|
||||
|
||||
interface DateRangeInputFilterProps {
|
||||
name?: string;
|
||||
className?: string;
|
||||
placeholder?: string;
|
||||
onChange?: (range: DateRange | undefined) => void;
|
||||
childclass?: string;
|
||||
size?: "xs" | "default" | "sm" | "lg";
|
||||
variant?: "default" | "full";
|
||||
defaultRange?: DateRange;
|
||||
}
|
||||
|
||||
export function DateRangeInputFilter({
|
||||
name = "dateRange",
|
||||
className,
|
||||
placeholder,
|
||||
onChange,
|
||||
childclass,
|
||||
size,
|
||||
variant = "default",
|
||||
defaultRange,
|
||||
}: DateRangeInputFilterProps) {
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
const [dateRange, setDateRange] = useState<DateRange | undefined>(defaultRange);
|
||||
|
||||
useEffect(() => {
|
||||
const fromDate = searchParams.get(`${name}From`);
|
||||
const toDate = searchParams.get(`${name}To`);
|
||||
if (!fromDate && !toDate) {
|
||||
setDateRange(defaultRange);
|
||||
} else {
|
||||
const range = paramsToDateRange(fromDate, toDate);
|
||||
setDateRange(range);
|
||||
}
|
||||
}, [searchParams, name]);
|
||||
|
||||
const handleDateRangeChange = (range: DateRange | undefined) => {
|
||||
setDateRange(range);
|
||||
|
||||
// Update search params
|
||||
const params = dateRangeToParams(range);
|
||||
|
||||
if (params.fromDate) {
|
||||
searchParams.set(`${name}From`, params.fromDate);
|
||||
} else {
|
||||
searchParams.delete(`${name}From`);
|
||||
}
|
||||
|
||||
if (params.toDate) {
|
||||
searchParams.set(`${name}To`, params.toDate);
|
||||
} else {
|
||||
searchParams.delete(`${name}To`);
|
||||
}
|
||||
|
||||
searchParams.delete("page"); // Reset pagination
|
||||
setSearchParams(searchParams);
|
||||
|
||||
// Call onChange callback if provided
|
||||
onChange?.(range);
|
||||
};
|
||||
|
||||
return (
|
||||
<DateRangeFilter
|
||||
variant={variant}
|
||||
value={dateRange}
|
||||
onChange={handleDateRangeChange}
|
||||
placeholder={placeholder}
|
||||
className={className}
|
||||
size={size}
|
||||
childclass={childclass}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
// Create a filter definition for InputFilters component
|
||||
export function createDateRangeFilter(options?: { name?: string; title?: string; fromParam?: string; toParam?: string }): FilterDto[] {
|
||||
const name = options?.name || "dateRange";
|
||||
const title = options?.title || i18nT("shared.dateRange.label");
|
||||
const fromParam = options?.fromParam || `${name}From`;
|
||||
const toParam = options?.toParam || `${name}To`;
|
||||
|
||||
return [
|
||||
{
|
||||
name: fromParam,
|
||||
title: i18nT("shared.dateRange.from", { title }),
|
||||
hideSearch: true,
|
||||
},
|
||||
{
|
||||
name: toParam,
|
||||
title: i18nT("shared.dateRange.to", { title }),
|
||||
hideSearch: true,
|
||||
},
|
||||
];
|
||||
}
|
||||
Reference in new issue
Block a user