Skip to content

fix(portal): show Company Forms section even when all tasks are compl… #2334

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 1 commit into from
Mar 18, 2026
Merged

fix(portal): show Company Forms section even when all tasks are compl… #2334

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
54 changes: 26 additions & 28 deletions apps/portal/src/app/(app)/(home)/[orgId]/components/EmployeeTasksList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ export const EmployeeTasksList = ({

const allCompleted = completedCount === accordionItems.length;

if (allCompleted) {
return (
<div className="space-y-4">
return (
<div className="space-y-4">
{allCompleted ? (
<Card>
<CardContent>
<div className="flex flex-col items-center justify-center py-16 text-center">
Expand All @@ -191,32 +191,30 @@ export const EmployeeTasksList = ({
</div>
</CardContent>
</Card>
</div>
);
}

return (
<div className="space-y-4">
{/* Progress indicator */}
<div>
<div className="text-muted-foreground text-sm">
{completedCount} of {accordionItems.length} tasks completed
</div>
<div className="w-full bg-muted rounded-full h-2.5">
<div
className="bg-primary h-full rounded-full"
style={{ width: `${(completedCount / accordionItems.length) * 100}%` }}
></div>
</div>
</div>
) : (
<>
{/* Progress indicator */}
<div>
<div className="text-muted-foreground text-sm">
{completedCount} of {accordionItems.length} tasks completed
</div>
<div className="w-full bg-muted rounded-full h-2.5">
<div
className="bg-primary h-full rounded-full"
style={{ width: `${(completedCount / accordionItems.length) * 100}%` }}
></div>
</div>
</div>

<div className="space-y-3">
<Accordion>
{accordionItems.map((item, idx) => (
<div key={item.title ?? idx}>{item.content}</div>
))}
</Accordion>
</div>
<div className="space-y-3">
<Accordion>
{accordionItems.map((item, idx) => (
<div key={item.title ?? idx}>{item.content}</div>
))}
</Accordion>
</div>
</>
)}

{/* Company forms */}
{visiblePortalForms.length > 0 && (
Expand Down
Loading