Skip to content

Further wording tweaks requested #1401

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

Further wording tweaks requested #1401

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
b530246
Minor tweaks to legend view based on user feedback
jmgasper Jan 15, 2026
fa871ac
Legend wording
jmgasper Jan 15, 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
3 changes: 1 addition & 2 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 @@ -12,7 +12,7 @@ const statusColorMap: Record<LeaveStatus, string> = {

const statusLabelMap: Record<LeaveStatus, string> = {
[LeaveStatus.LEAVE]: 'Leave',
[LeaveStatus.HOLIDAY]: 'Personal Holiday',
[LeaveStatus.HOLIDAY]: 'Holiday',
[LeaveStatus.WIPRO_HOLIDAY]: 'Wipro Holiday',
[LeaveStatus.WEEKEND]: 'Weekend',
[LeaveStatus.AVAILABLE]: 'Available',
Expand All @@ -22,7 +22,6 @@ export const legendStatusOrder: LeaveStatus[] = [
LeaveStatus.AVAILABLE,
LeaveStatus.LEAVE,
LeaveStatus.HOLIDAY,
LeaveStatus.WIPRO_HOLIDAY,
LeaveStatus.WEEKEND,
Copy link

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

Choose a reason for hiding this comment

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

[❗❗ correctness]
Removing LeaveStatus.WIPRO_HOLIDAY from legendStatusOrder may affect the order of items in the legend. Ensure that this change is intentional and that the application logic or UI does not rely on the previous order.

]

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -152,7 +152,7 @@ const PersonalCalendarPage: FC = () => {
onClick={handleSetAsHoliday}
disabled={!selectedDates.size || isUpdating}
>
Set as Personal Holiday
Set as Holiday
</Button>
<Button
secondary
Expand Down
3 changes: 3 additions & 0 deletions src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

.navigation {
display: flex;
flex-direction: column;
align-items: center;
gap: 8px;
justify-content: center;
margin: 14px 0 10px;
}
Expand Down
3 changes: 2 additions & 1 deletion src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { addMonths, endOfMonth, startOfMonth, subMonths } from 'date-fns'
import { FC, useCallback, useEffect, useMemo, useState } from 'react'

import { MonthNavigation, TeamCalendar } from '../../lib/components'
import { CalendarLegend, MonthNavigation, TeamCalendar } from '../../lib/components'
import { useFetchTeamLeave } from '../../lib/hooks'

import styles from './TeamCalendarPage.module.scss'
Expand Down Expand Up @@ -57,6 +57,7 @@ const TeamCalendarPage: FC = () => {
onNextMonth={handleNextMonth}
onPrevMonth={handlePrevMonth}
/>
<CalendarLegend />
</section>

<section className={styles.calendarSection}>
Expand Down
Loading