Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Improve the dashboard calendar picker

Damian Legawiec8d903c7e8c15
diff --git a/packages/admin/src/components/date-range-picker.tsx b/packages/admin/src/components/date-range-picker.tsx
index e0f1b606de..f2a7007f06 100644
--- a/packages/admin/src/components/date-range-picker.tsx
+++ b/packages/admin/src/components/date-range-picker.tsx
@@ -1,26 +1,32 @@
import { CalendarIcon, ChevronDownIcon } from 'lucide-react'
-import { useMemo, useState } from 'react'
-import { format, subDays, subHours, subMonths } from 'date-fns'
+import { useState } from 'react'
+import { format, subDays, startOfMonth, startOfYear } from 'date-fns'
import type { DateRange as DayPickerDateRange } from 'react-day-picker'
import { Button } from '@/components/ui/button'
import { Calendar } from '@/components/ui/calendar'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { cn } from '@/lib/utils'
export interface DateRange {
from: Date
to: Date
}
+type PresetKey = '7d' | '14d' | '30d' | '90d' | 'this_month' | 'ytd' | 'custom'
+
interface Preset {
+ key: PresetKey
label: string
value: () => DateRange
}
const presets: Preset[] = [
- { label: 'Last 24 hours', value: () => ({ from: subHours(new Date(), 24), to: new Date() }) },
- { label: 'Last 7 days', value: () => ({ from: subDays(new Date(), 7), to: new Date() }) },
- { label: 'Last 30 days', value: () => ({ from: subDays(new Date(), 30), to: new Date() }) },
- { label: 'Last 3 months', value: () => ({ from: subMonths(new Date(), 3), to: new Date() }) },
+ { key: '7d', label: 'Last 7 days', value: () => ({ from: subDays(new Date(), 7), to: new Date() }) },
+ { key: '14d', label: 'Last 14 days', value: () => ({ from: subDays(new Date(), 14), to: new Date() }) },
+ { key: '30d', label: 'Last 30 days', value: () => ({ from: subDays(new Date(), 30), to: new Date() }) },
+ { key: '90d', label: 'Last 90 days', value: () => ({ from: subDays(new Date(), 90), to: new Date() }) },
+ { key: 'this_month', label: 'This month', value: () => ({ from: startOfMonth(new Date()), to: new Date() }) },
+ { key: 'ytd', label: 'Year to date', value: () => ({ from: startOfYear(new Date()), to: new Date() }) },
]
interface DateRangePickerProps {
@@ -30,112 +36,85 @@ interface DateRangePickerProps {
export function DateRangePicker({ value, onChange }: DateRangePickerProps) {
const [open, setOpen] = useState(false)
- const [selecting, setSelecting] = useState<'presets' | 'custom'>('presets')
- const [customRange, setCustomRange] = useState<DayPickerDateRange | undefined>({
- from: value.from,
- to: value.to,
- })
-
- const activePresetLabel = useMemo(() => {
- const now = new Date()
- const diffMs = now.getTime() - value.from.getTime()
- const diffHours = diffMs / (1000 * 60 * 60)
- const diffDays = diffMs / (1000 * 60 * 60 * 24)
+ const [activePreset, setActivePreset] = useState<PresetKey>('30d')
+ const [calendarRange, setCalendarRange] = useState<DayPickerDateRange | undefined>()
- if (diffHours <= 25) return 'Last 24 hours'
- if (diffDays <= 8) return 'Last 7 days'
- if (diffDays <= 31) return 'Last 30 days'
- if (diffDays <= 92) return 'Last 3 months'
- return `${format(value.from, 'MMM d, yyyy')} – ${format(value.to, 'MMM d, yyyy')}`
- }, [value])
+ const triggerLabel = activePreset === 'custom'
+ ? `${format(value.from, 'MMM d')} – ${format(value.to, 'MMM d')}`
+ : presets.find((p) => p.key === activePreset)?.label ?? 'Last 30 days'
- function handlePreset(preset: Preset) {
- onChange(preset.value())
+ function selectPreset(preset: Preset) {
+ const range = preset.value()
+ setActivePreset(preset.key)
+ setCalendarRange({ from: range.from, to: range.to })
+ onChange(range)
setOpen(false)
- setSelecting('presets')
}
- function handleCustomApply() {
- if (customRange?.from && customRange?.to) {
- onChange({ from: customRange.from, to: customRange.to })
+ function applyCustomRange() {
+ if (calendarRange?.from && calendarRange?.to) {
+ setActivePreset('custom')
+ onChange({ from: calendarRange.from, to: calendarRange.to })
setOpen(false)
- setSelecting('presets')
}
}
- const displayRange = customRange?.from && customRange?.to
- ? `${format(customRange.from, 'MMM d, yyyy')} – ${format(customRange.to, 'MMM d, yyyy')}`
- : customRange?.from
- ? `${format(customRange.from, 'MMM d, yyyy')} – ...`
- : 'Select start and end dates'
+ const canApply = calendarRange?.from && calendarRange?.to
return (
- <Popover open={open} onOpenChange={setOpen}>
+ <Popover
+ open={open}
+ onOpenChange={(nextOpen) => {
+ setOpen(nextOpen)
+ if (nextOpen) {
+ setCalendarRange({ from: value.from, to: value.to })
+ }
+ }}
+ >
<PopoverTrigger asChild>
<Button size="sm" variant="outline" className="h-8 gap-2 text-sm font-normal">
<CalendarIcon className="size-3.5" />
- {activePresetLabel}
+ {triggerLabel}
<ChevronDownIcon className="size-3.5 text-muted-foreground" />
</Button>
</PopoverTrigger>
<PopoverContent align="end" className="w-auto p-0">
- {selecting === 'presets' ? (
- <div className="flex flex-col">
+ <div className="flex">
+ <div className="flex flex-col border-r py-2">
{presets.map((preset) => (
<button
- key={preset.label}
+ key={preset.key}
type="button"
- onClick={() => handlePreset(preset)}
- className="px-4 py-2.5 text-left text-sm hover:bg-muted transition-colors first:rounded-t-lg"
+ onClick={() => selectPreset(preset)}
+ className={cn(
+ 'whitespace-nowrap px-4 py-1.5 text-left text-sm transition-colors hover:bg-accent',
+ activePreset === preset.key && 'font-medium text-foreground',
+ activePreset !== preset.key && 'text-muted-foreground',
+ )}
>
{preset.label}
</button>
))}
- <div className="border-t" />
- <button
- type="button"
- onClick={() => {
- setSelecting('custom')
- setCustomRange({ from: value.from, to: value.to })
- }}
- className="px-4 py-2.5 text-left text-sm hover:bg-muted transition-colors rounded-b-lg"
- >
- Custom range...
- </button>
</div>
- ) : (
- <div className="flex flex-col gap-3 p-3">
- <div className="text-sm font-medium">Select date range</div>
+ <div className="flex flex-col p-3">
<Calendar
mode="range"
- defaultMonth={customRange?.from}
- selected={customRange}
- onSelect={setCustomRange}
+ defaultMonth={calendarRange?.from}
+ selected={calendarRange}
+ onSelect={setCalendarRange}
numberOfMonths={2}
/>
- <div className="flex items-center justify-between border-t pt-3">
- <div className="text-xs text-muted-foreground">
- {displayRange}
- </div>
- <div className="flex gap-2">
- <Button
- size="sm"
- onClick={() => setSelecting('presets')}
- >
- Back
- </Button>
- <Button
- size="sm"
-
- disabled={!customRange?.from || !customRange?.to}
- onClick={handleCustomApply}
- >
- Apply
- </Button>
- </div>
+ <div className="flex justify-end border-t pt-3">
+ <Button
+ size="sm"
+ disabled={!canApply}
+ onClick={applyCustomRange}
+ >
+ Apply
+ </Button>
</div>
</div>
- )}
+ </div>
</PopoverContent>
</Popover>
)
diff --git a/packages/admin/src/components/ui/calendar.tsx b/packages/admin/src/components/ui/calendar.tsx
index 26dde0b5fa..9e314c53e7 100644
--- a/packages/admin/src/components/ui/calendar.tsx
+++ b/packages/admin/src/components/ui/calendar.tsx
@@ -14,15 +14,15 @@ function Calendar({
showOutsideDays={showOutsideDays}
className={cn('p-3', className)}
classNames={{
- months: 'flex flex-col sm:flex-row gap-2',
+ months: 'flex flex-col sm:flex-row gap-2 relative',
month: 'flex flex-col gap-4',
month_caption: 'flex justify-center pt-1 relative items-center w-full',
caption_label: 'text-sm font-medium',
- nav: 'flex items-center gap-1',
+ nav: 'absolute top-1 inset-x-0 flex items-center justify-between px-1 z-10',
button_previous:
- 'absolute left-2 top-2 inline-flex size-7 items-center justify-center rounded-md border border-gray-200 bg-transparent p-0 text-gray-600 opacity-50 hover:opacity-100 transition-opacity',
+ 'inline-flex size-7 items-center justify-center rounded-md border border-gray-200 bg-transparent p-0 text-gray-600 transition-colors hover:bg-gray-100 hover:text-gray-950',
button_next:
- 'absolute right-2 top-2 inline-flex size-7 items-center justify-center rounded-md border border-gray-200 bg-transparent p-0 text-gray-600 opacity-50 hover:opacity-100 transition-opacity',
+ 'inline-flex size-7 items-center justify-center rounded-md border border-gray-200 bg-transparent p-0 text-gray-600 transition-colors hover:bg-gray-100 hover:text-gray-950',
month_grid: 'w-full border-collapse',
weekdays: 'flex',
weekday: 'text-muted-foreground rounded-md w-8 font-normal text-xs',
diff --git a/packages/admin/src/providers/store-provider.tsx b/packages/admin/src/providers/store-provider.tsx
index 4fd9e644d9..399aaac82c 100644
--- a/packages/admin/src/providers/store-provider.tsx
+++ b/packages/admin/src/providers/store-provider.tsx
@@ -1,4 +1,4 @@
-import { createContext, type ReactNode, useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import { createContext, type ReactNode, useCallback, useContext, useEffect, useState } from 'react'
import type { Store } from '@spree/admin-sdk'
import { adminClient } from '@/client'
diff --git a/packages/admin/src/routes/_authenticated/$storeId/index.tsx b/packages/admin/src/routes/_authenticated/$storeId/index.tsx
index d18fa1aed2..bd7d8bf2d2 100644
--- a/packages/admin/src/routes/_authenticated/$storeId/index.tsx
+++ b/packages/admin/src/routes/_authenticated/$storeId/index.tsx
@@ -52,7 +52,7 @@ function DashboardPage() {
to: new Date(),
})
- const { data, isLoading } = useQuery({
+ const { data } = useQuery({
queryKey: ['dashboard', 'analytics', dateRange.from.toISOString(), dateRange.to.toISOString()],
queryFn: () =>
adminClient.dashboard.analytics({
@@ -60,6 +60,7 @@ function DashboardPage() {
date_to: dateRange.to.toISOString(),
}),
staleTime: 5 * 60 * 1000,
+ placeholderData: (previousData) => previousData,
})
if (!data) {