Skip to content

Allow users to set their own holidays #1399

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
jmgasper merged 1 commit into from
Jan 14, 2026
Merged

Allow users to set their own holidays #1399

Show file tree
Hide file tree
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
31 changes: 18 additions & 13 deletions src/apps/calendar/src/lib/components/TeamCalendar/TeamCalendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,19 +118,24 @@ export const TeamCalendar: FC<TeamCalendarProps> = (props: TeamCalendarProps) =>
<span className={styles.dateNumber}>{date.getDate()}</span>
<div className={styles.userList}>
{displayedUsers.length > 0
&& displayedUsers.map((user, userIndex) => (
<div
key={`${dateKey}-${user.userId}-${userIndex.toString()}`}
className={classNames(
styles.userItem,
user.status === LeaveStatus.WIPRO_HOLIDAY
? styles.userHoliday
: styles.userLeave,
)}
>
{getUserDisplayName(user)}
</div>
))}
&& displayedUsers.map((user, userIndex) => {
const isHolidayStatus = user.status === LeaveStatus.WIPRO_HOLIDAY
Copy link

@github-actions github-actions bot Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ maintainability]
Consider extracting the logic for determining isHolidayStatus into a separate function for better readability and maintainability. This will make the code easier to test and understand.

|| user.status === LeaveStatus.HOLIDAY

return (
<div
key={`${dateKey}-${user.userId}-${userIndex.toString()}`}
className={classNames(
styles.userItem,
isHolidayStatus
? styles.userHoliday
: styles.userLeave,
)}
>
{getUserDisplayName(user)}
</div>
)
})}
{overflowCount > 0 && (
<div className={styles.overflowIndicator}>
{`+${overflowCount} more`}
Expand Down
7 changes: 4 additions & 3 deletions src/apps/calendar/src/lib/models/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import { TokenModel } from '~/libs/core'
export enum LeaveStatus {
AVAILABLE = 'AVAILABLE',
LEAVE = 'LEAVE',
WEEKEND = 'WEEKEND',
HOLIDAY = 'HOLIDAY',
WIPRO_HOLIDAY = 'WIPRO_HOLIDAY',
WEEKEND = 'WEEKEND',
}

export type LeaveUpdateStatus = LeaveStatus.AVAILABLE | LeaveStatus.LEAVE
export type LeaveUpdateStatus = LeaveStatus.AVAILABLE | LeaveStatus.LEAVE | LeaveStatus.HOLIDAY

export interface LeaveDate {
date: string
Expand All @@ -21,7 +22,7 @@ export interface TeamLeaveDate {
handle?: string
firstName?: string
lastName?: string
status: LeaveStatus.LEAVE | LeaveStatus.WIPRO_HOLIDAY
status: LeaveStatus.LEAVE | LeaveStatus.HOLIDAY | LeaveStatus.WIPRO_HOLIDAY
}>
}

Expand Down
3 changes: 3 additions & 0 deletions src/apps/calendar/src/lib/utils/calendar.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ import { LeaveDate, LeaveStatus } from '../models'

const statusColorMap: Record<LeaveStatus, string> = {
[LeaveStatus.LEAVE]: 'status-leave',
[LeaveStatus.HOLIDAY]: 'status-holiday',
[LeaveStatus.WIPRO_HOLIDAY]: 'status-holiday',
[LeaveStatus.WEEKEND]: 'status-weekend',
[LeaveStatus.AVAILABLE]: 'status-available',
}

const statusLabelMap: Record<LeaveStatus, string> = {
[LeaveStatus.LEAVE]: 'Leave',
[LeaveStatus.HOLIDAY]: 'Personal Holiday',
[LeaveStatus.WIPRO_HOLIDAY]: 'Wipro Holiday',
[LeaveStatus.WEEKEND]: 'Weekend',
[LeaveStatus.AVAILABLE]: 'Available',
Expand All @@ -19,6 +21,7 @@ const statusLabelMap: Record<LeaveStatus, string> = {
export const legendStatusOrder: LeaveStatus[] = [
LeaveStatus.AVAILABLE,
LeaveStatus.LEAVE,
LeaveStatus.HOLIDAY,
LeaveStatus.WIPRO_HOLIDAY,
LeaveStatus.WEEKEND,
]
Expand Down
21 changes: 21 additions & 0 deletions src/apps/calendar/src/pages/personal-calendar/PersonalCalendarPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@ const PersonalCalendarPage: FC = () => {
}
}, [loadCurrentMonth, selectedDates, updateLeaveDates])

const handleSetAsHoliday = useCallback(async () => {
if (!selectedDates.size) return

setActionError('')
try {
await updateLeaveDates(Array.from(selectedDates), LeaveStatus.HOLIDAY)
setSelectedDates(new Set())
await loadCurrentMonth()
} catch {
Copy link

@github-actions github-actions bot Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ maintainability]
Consider adding specific error handling for different types of errors that might occur during updateLeaveDates or loadCurrentMonth. This will provide more informative feedback to the user and help with debugging.

setActionError('Unable to update leave dates. Please try again.')
}
}, [loadCurrentMonth, selectedDates, updateLeaveDates])

const handleSetAsAvailable = useCallback(async () => {
if (!selectedDates.size) return

Expand Down Expand Up @@ -133,6 +146,14 @@ const PersonalCalendarPage: FC = () => {
>
Set as Leave
</Button>
<Button
secondary
variant='warning'
onClick={handleSetAsHoliday}
disabled={!selectedDates.size || isUpdating}
Copy link

@github-actions github-actions bot Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[💡 design]
Ensure that the variant='warning' for the 'Set as Personal Holiday' button aligns with the design guidelines and user expectations. This variant might imply a cautionary action, which may not be the intended user experience.

>
Set as Personal Holiday
</Button>
<Button
secondary
onClick={handleSetAsAvailable}
Expand Down
Loading