Skip to content

move date picker quick select buttons to footer #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adibarra merged 1 commit into from
Mar 20, 2026
Merged

move date picker quick select buttons to footer #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 70 additions & 79 deletions packages/app/src/components/ui/date-range-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,69 +189,6 @@ export function DateRangePicker({
)}
</DialogDescription>
</DialogHeader>
{availableDates && availableDates.length >= 2 && (
<div className="flex flex-wrap gap-2">
{[
{
label: 'Max Range',
getRange: () => ({
startDate: availableDates[0],
endDate: availableDates[availableDates.length - 1],
}),
},
{
label: 'Last 30 Days',
getRange: () => {
const cutoff = new Date();
cutoff.setDate(cutoff.getDate() - 30);
const cutoffStr = cutoff.toISOString().slice(0, 10);
const filtered = availableDates.filter((d) => d >= cutoffStr);
if (filtered.length < 2) return null;
return { startDate: filtered[0], endDate: filtered[filtered.length - 1] };
},
},
{
label: 'Last 60 Days',
getRange: () => {
const cutoff = new Date();
cutoff.setDate(cutoff.getDate() - 60);
const cutoffStr = cutoff.toISOString().slice(0, 10);
const filtered = availableDates.filter((d) => d >= cutoffStr);
if (filtered.length < 2) return null;
return { startDate: filtered[0], endDate: filtered[filtered.length - 1] };
},
},
{
label: 'Last 90 Days',
getRange: () => {
const cutoff = new Date();
cutoff.setDate(cutoff.getDate() - 90);
const cutoffStr = cutoff.toISOString().slice(0, 10);
const filtered = availableDates.filter((d) => d >= cutoffStr);
if (filtered.length < 2) return null;
return { startDate: filtered[0], endDate: filtered[filtered.length - 1] };
},
},
].map(({ label, getRange }) => {
const range = getRange();
if (!range) return null;
return (
<Button
key={label}
variant="outline"
size="sm"
className="text-xs h-7"
onClick={() => {
setTempRange(range);
track('date_range_picker_quick_select', { label });
}}
>
{label}
</Button>
);
})}
</div>
)}
<div className="py-4 relative">
<CalendarGrid
dateRange={tempRange}
Expand Down Expand Up @@ -299,23 +236,77 @@ export function DateRangePicker({
)}
</div>
{error && <p className="text-md text-center text-red-500">{error}</p>}
<DialogFooter>
<DialogClose asChild>
<Button variant="outline" onClick={handleCancel}>
Cancel
<DialogFooter className="flex-row justify-between sm:justify-between">
{availableDates && availableDates.length >= 2 ? (
<div className="flex flex-wrap gap-1.5">
{[
{
label: 'Max Range',
getRange: () => ({
startDate: availableDates[0],
endDate: availableDates[availableDates.length - 1],
}),
},
{
label: 'Last 90 Days',
getRange: () => {
const cutoff = new Date();
cutoff.setDate(cutoff.getDate() - 90);
const cutoffStr = cutoff.toISOString().slice(0, 10);
const filtered = availableDates.filter((d) => d >= cutoffStr);
if (filtered.length < 2) return null;
return { startDate: filtered[0], endDate: filtered[filtered.length - 1] };
},
},
{
label: 'Last 30 Days',
getRange: () => {
const cutoff = new Date();
cutoff.setDate(cutoff.getDate() - 30);
const cutoffStr = cutoff.toISOString().slice(0, 10);
const filtered = availableDates.filter((d) => d >= cutoffStr);
if (filtered.length < 2) return null;
return { startDate: filtered[0], endDate: filtered[filtered.length - 1] };
},
},
].map(({ label, getRange }) => {
const range = getRange();
if (!range) return null;
return (
<Button
key={label}
variant="outline"
onClick={() => {
setTempRange(range);
track('date_range_picker_quick_select', { label });
}}
>
{label}
</Button>
);
})}
</div>
) : (
<div />
)}
<div className="flex gap-2">
<DialogClose asChild>
<Button variant="outline" onClick={handleCancel}>
Cancel
</Button>
</DialogClose>
<Button
onClick={handleApply}
disabled={
!tempRange.startDate ||
!tempRange.endDate ||
isApplying ||
(availableDates !== undefined && availableDates.length < 2)
}
>
{isApplying ? 'Applying...' : 'Apply'}
</Button>
</DialogClose>
<Button
onClick={handleApply}
disabled={
!tempRange.startDate ||
!tempRange.endDate ||
isApplying ||
(availableDates !== undefined && availableDates.length < 2)
}
>
{isApplying ? 'Applying...' : 'Apply'}
</Button>
</div>
</DialogFooter>
</DialogContent>
</Dialog>
Expand Down