Skip to content

fix: viewing as manager styling issues #229

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
MarconLP merged 2 commits into from
Jan 23, 2026
Merged

fix: viewing as manager styling issues #229

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4889e83
fix: viewing as manager styling issues
MarconLP Jan 23, 2026
170e942
prettier
MarconLP Jan 23, 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
87 changes: 45 additions & 42 deletions src/routes/employee.$employeeId.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1945,64 +1945,67 @@ function EmployeeOverview() {

{!isSensitiveHidden &&
'performancePrograms' in employee &&
employee.performancePrograms !== undefined ? (
employee.performancePrograms !== undefined &&
employee.performancePrograms.length > 0 &&
employee.performancePrograms[0].status === 'ACTIVE' ? (
<div className="w-full">
<PerformanceProgramPanel
employeeId={employee.id}
program={
'performancePrograms' in employee &&
employee.performancePrograms &&
employee.performancePrograms.length > 0
? (employee.performancePrograms[0] as any)
: null
}
program={employee.performancePrograms[0] as any}
onUpdate={() => router.invalidate()}
/>
</div>
) : null}

<div className="mt-2 flex flex-row items-center justify-between gap-2">
<div className="flex gap-2">
{showNewSalaryForm ? (
<Button
type="button"
variant="outline"
onClick={() =>
setShowReferenceEmployees(!showReferenceEmployees)
}
>
{showReferenceEmployees
? 'Hide reference employees'
: 'Show reference employees'}
</Button>
) : null}
{user?.role === ROLES.ADMIN &&
!isSensitiveHidden &&
!showNewSalaryForm ? (
<Button
type="button"
variant="outline"
onClick={() => setShowNewSalaryForm(!showNewSalaryForm)}
>
Add New Salary
</Button>
) : null}
{employee.cartaOptionGrants &&
employee.cartaOptionGrants.length > 0 && (
{(showNewSalaryForm ||
(user?.role === ROLES.ADMIN && !isSensitiveHidden) ||
(employee.cartaOptionGrants &&
employee.cartaOptionGrants.length > 0)) && (
<div className="mt-2 flex flex-row items-center justify-between gap-2">
<div className="flex gap-2">
{showNewSalaryForm ? (
<Button
type="button"
variant="outline"
onClick={() =>
setShowStockOptionsCalculator(!showStockOptionsCalculator)
setShowReferenceEmployees(!showReferenceEmployees)
}
>
{showStockOptionsCalculator
? 'Hide stock options calculator'
: 'Show stock options calculator'}
{showReferenceEmployees
? 'Hide reference employees'
: 'Show reference employees'}
</Button>
)}
) : null}
{user?.role === ROLES.ADMIN &&
!isSensitiveHidden &&
!showNewSalaryForm ? (
<Button
type="button"
variant="outline"
onClick={() => setShowNewSalaryForm(!showNewSalaryForm)}
>
Add New Salary
</Button>
) : null}
{employee.cartaOptionGrants &&
employee.cartaOptionGrants.length > 0 && (
<Button
type="button"
variant="outline"
onClick={() =>
setShowStockOptionsCalculator(
!showStockOptionsCalculator,
)
}
>
{showStockOptionsCalculator
? 'Hide stock options calculator'
: 'Show stock options calculator'}
</Button>
)}
</div>
</div>
</div>
)}

{employee.cartaOptionGrants &&
employee.cartaOptionGrants.length > 0 &&
Expand Down