Skip to content

[dev] [Marfuen] mariano/cs-312-employment-events-fixes #2881

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
Marfuen merged 2 commits into from
May 20, 2026
+19 −25
Merged

[dev] [Marfuen] mariano/cs-312-employment-events-fixes #2881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
464e8af
fix(people): ds component compatibility fixes for offboarding UI
Marfuen May 20, 2026
7dc8e37
fix(people): override popover width for date range filter
Marfuen May 20, 2026
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
2 changes: 1 addition & 1 deletion apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/OffboardingChecklistItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function ItemBadges({
<>
{item.isAccessRevocation && (
<div>
<Badge variant="destructive">Critical</Badge>
<Badge variant="accent">Critical</Badge>
</div>
)}
{item.evidenceRequired && (
Expand Down
42 changes: 18 additions & 24 deletions apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembersClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,8 @@ function DateRangeFilter({
<ChevronDown size={12} className="text-muted-foreground" />
</div>
</PopoverTrigger>
<PopoverContent align="start">
<div className="w-[420px] border bg-background p-4 shadow-md rounded-lg">
<div className="flex flex-col gap-4">
<PopoverContent align="start" style={{ width: 'auto' }}>
<div className="flex w-[380px] flex-col gap-4 p-1.5">
<span className="text-[10px] font-bold uppercase tracking-[0.08em] text-muted-foreground">
{label} between
</span>
Expand Down Expand Up @@ -693,16 +692,14 @@ function DateRangeFilter({
</div>
</PopoverTrigger>
<PopoverContent align="start">
<div className="w-auto border bg-background p-0 shadow-md rounded-lg">
<Calendar
mode="single"
selected={draftFrom}
onSelect={(d) => { setDraftFrom(d ?? undefined); setActivePreset(null); setFromPickerOpen(false); }}
captionLayout="dropdown"
fromYear={2000}
toYear={new Date().getFullYear() + 1}
/>
</div>
<Calendar
mode="single"
selected={draftFrom}
onSelect={(d) => { setDraftFrom(d ?? undefined); setActivePreset(null); setFromPickerOpen(false); }}
captionLayout="dropdown"
fromYear={2000}
toYear={new Date().getFullYear() + 1}
/>
</PopoverContent>
</Popover>
<span className="text-muted-foreground">→</span>
Expand All @@ -714,16 +711,14 @@ function DateRangeFilter({
</div>
</PopoverTrigger>
<PopoverContent align="start">
<div className="w-auto border bg-background p-0 shadow-md rounded-lg">
<Calendar
mode="single"
selected={draftTo}
onSelect={(d) => { setDraftTo(d ?? undefined); setActivePreset(null); setToPickerOpen(false); }}
captionLayout="dropdown"
fromYear={2000}
toYear={new Date().getFullYear() + 1}
/>
</div>
<Calendar
mode="single"
selected={draftTo}
onSelect={(d) => { setDraftTo(d ?? undefined); setActivePreset(null); setToPickerOpen(false); }}
captionLayout="dropdown"
fromYear={2000}
toYear={new Date().getFullYear() + 1}
/>
</PopoverContent>
</Popover>
</div>
Expand All @@ -737,7 +732,6 @@ function DateRangeFilter({
</div>
</div>
</div>
</div>
</PopoverContent>
</Popover>
</div>
Expand Down
Loading