fix: Organised the OOO page by Recxsmacx · Pull Request #27865 · calcom/cal.com

Recxsmacx · 2026-02-11T12:49:38Z

###Before

###After

Summary by cubic

Organized the Out of Office and Holidays settings pages to match the Settings shell and improve readability. Standardized headers, bordered shells across all states, fixed column widths, and cleaned up row layout; no behavior changes.

UI Improvements
- Enabled borderInShellHeader and wrapped loading/error/content in a bordered container on both pages; Holidays empty state now uses the shared calendar icon.
- Set column widths (Member 220, Out of Office 570) and simplified the Out of Office entry row for clearer spacing.
Refactors
- Removed unused imports in OutOfOfficeEntriesList.

^{Written for commit 8421533. Summary will update on new commits.}

paragon-review · 2026-02-11T12:49:42Z

Paragon Review Unavailable

Hi @Recxsmacx! To enable Paragon reviews on this repository, please register at https://home.polarity.cc

Once registered, connect your GitHub account and Paragon will automatically review your pull requests.

cubic-dev-ai

1 issue found across 2 files

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx">

<violation number="1" location="apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx:140">
P2: Using `isFetching` to replace `flatData` with skeletons causes the list to collapse to 5 rows during background refetches or when fetching the next page, disrupting infinite scroll. Use `isPending` (initial load) to avoid clobbering existing data while paginating.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx

Recxsmacx · 2026-02-11T13:38:28Z

@romitg2 @dhairyashiil need your view 🫡

devin-ai-integration · 2026-02-11T13:38:55Z

Review Summary

This PR adds bordered containers to the Out of Office and Holidays settings pages to match the Settings shell pattern (borderInShellHeader + border-subtle rounded-b-lg wrapper). It also simplifies the OOO table row layout (removes extra nesting, adjusts column widths).

Core changes are UI-only and should not break behavior. However, a few issues should be addressed before merging:

1. Import ordering violation (both files)

The PR moves third-party imports (@tanstack/react-query, @tanstack/react-table, next/navigation, react) below @calcom/* imports. The codebase convention (and the original file ordering) is:

External/third-party imports
@calcom/* imports
Local/relative (~/, ./) imports

For example in OutOfOfficeEntriesList.tsx, react and @tanstack/* should stay at the top, not be moved after @calcom/ui imports. Same issue in holidays-view.tsx where import { memo, useCallback, useMemo } from "react" was moved below @calcom imports.

2. Column width change — verify on TEAM tab

The OOO column width changed from a dynamic selectedTab === OutOfOfficeTab.TEAM ? 370 : 660 to a fixed 570, and Member from 300 to 220. On the TEAM tab this increases total width (220+570+90=880 vs 300+370+90=760), and on MINE tab decreases it (570+90=660 vs 660+90=750). Worth verifying this doesn't compress the date/forwarding text awkwardly on narrower screens.

anikdhabal · 2026-02-11T13:39:33Z

@Recxsmacx yes, pls check the above comment and address

apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx

Recxsmacx · 2026-02-11T13:47:50Z

Okay @anikdhabal anything else to fix in this???

anikdhabal · 2026-02-11T14:19:22Z

No, fix them and test

Recxsmacx · 2026-02-11T14:20:19Z

No, fix them and test

Yessirrr!

Recxsmacx · 2026-02-12T06:08:19Z

@anikdhabal gm gm addressed something regarding your requested changes !

romitg2 · 2026-02-12T07:15:14Z

@anikdhabal gm gm addressed something regarding your requested changes !

I can see no new commits, seems like you forgot to push changes?

Recxsmacx · 2026-02-12T07:18:14Z

@anikdhabal gm gm addressed something regarding your requested changes !

I can see no new commits, seems like you forgot to push changes?

Hey romit ! i addressed my pov on the requested changes

romitg2 · 2026-02-12T07:24:56Z

@anikdhabal gm gm addressed something regarding your requested changes !

I can see no new commits, seems like you forgot to push changes?

Hey romit ! i addressed my pov on the requested changes

where? i can't see any comments from your side. please make sure you've addressed changes and self-reviewed your code before asking for reviews. Thanks!

you can see there are duplicated imports, as also told by Anik.

Removed unused imports from OutOfOfficeEntriesList.tsx

Recxsmacx · 2026-02-12T07:35:14Z

@romitg2 it's done !

romitg2 · 2026-02-12T08:03:52Z

@romitg2 it's done !

I can still see duplicate useSegments import. requesting again to self-review your changes before asking for reviews, as it ends up wasting time.

Co-authored-by: Cursor <[email protected]>

Recxsmacx · 2026-02-12T14:11:30Z

@romitg2 sorry for

@romitg2 it's done !

I can still see duplicate useSegments import. requesting again to self-review your changes before asking for reviews, as it ends up wasting time.

i'll take care of it ig its completely fixed now !
@romitg2

romitg2

LGTM!

Recxsmacx added 6 commits January 20, 2026 17:21

fixed text issue

a2c1609

Merge branch 'calcom:main' into main

ec1b330

matched style of api keys page

9cc3d91

Merge branch 'calcom:main' into main

281b56a

Merge branch 'calcom:main' into main

01e946c

organised the out of office page

264ff57

pull-request-size bot added the size/L label Feb 11, 2026

graphite-app bot added the community Created by Linear-GitHub Sync label Feb 11, 2026

cubic-dev-ai bot reviewed Feb 11, 2026

View reviewed changes

apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx Show resolved Hide resolved

Merge branch 'main' into OOO

aa3ca9e

anikdhabal reviewed Feb 11, 2026

View reviewed changes

apps/web/modules/settings/outOfOffice/OutOfOfficeEntriesList.tsx Outdated Show resolved Hide resolved

Merge branch 'main' into OOO

be7f82e

romitg2 marked this pull request as draft February 12, 2026 07:25

Recxsmacx added 2 commits February 12, 2026 13:00

Merge branch 'main' into OOO

f45977f

Clean up unused imports in OutOfOfficeEntriesList

7b07bca

Removed unused imports from OutOfOfficeEntriesList.tsx

Recxsmacx marked this pull request as ready for review February 12, 2026 07:34

romitg2 marked this pull request as draft February 12, 2026 08:03

Recxsmacx and others added 2 commits February 12, 2026 19:32

Merge remote-tracking branch 'origin/OOO' into OOO

b9acb6c

Co-authored-by: Cursor <[email protected]>

Merge branch 'main' into OOO

78ca293

Recxsmacx marked this pull request as ready for review February 12, 2026 14:09

romitg2 self-requested a review February 12, 2026 14:39

romitg2 previously approved these changes Feb 12, 2026

View reviewed changes

graphite-app bot added the ready-for-e2e label Feb 12, 2026

Merge remote-tracking branch 'upstream/main' into OOO

c764a7c

romitg2 dismissed their stale review via c764a7c February 12, 2026 15:10

romitg2 previously approved these changes Feb 12, 2026

View reviewed changes

romitg2 added ready-for-e2e run-ci Approve CI to run for external contributors and removed ready-for-e2e labels Feb 12, 2026

romitg2 enabled auto-merge (squash) February 12, 2026 15:14

romitg2 disabled auto-merge February 12, 2026 15:20

Merge branch 'main' into OOO

4e2356b

romitg2 added ready-for-e2e run-ci Approve CI to run for external contributors and removed ready-for-e2e run-ci Approve CI to run for external contributors labels Feb 12, 2026

remove unused imports

8421533

romitg2 dismissed their stale review via 8421533 February 12, 2026 16:14

romitg2 added ready-for-e2e run-ci Approve CI to run for external contributors and removed ready-for-e2e run-ci Approve CI to run for external contributors labels Feb 12, 2026

romitg2 approved these changes Feb 12, 2026

View reviewed changes

romitg2 enabled auto-merge (squash) February 12, 2026 16:18

romitg2 merged commit bc9a9c0 into calcom:main Feb 12, 2026
184 of 197 checks passed

Recxsmacx deleted the OOO branch February 13, 2026 13:49

Conversation

Recxsmacx commented Feb 11, 2026 • edited by cubic-dev-ai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary by cubic

Uh oh!

paragon-review bot commented Feb 11, 2026

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Recxsmacx commented Feb 11, 2026

Uh oh!

devin-ai-integration bot commented Feb 11, 2026 • edited by anikdhabal Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review Summary

1. Import ordering violation (both files)

2. Column width change — verify on TEAM tab

Uh oh!

anikdhabal commented Feb 11, 2026

Uh oh!

Uh oh!

Recxsmacx commented Feb 11, 2026

Uh oh!

anikdhabal commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Recxsmacx commented Feb 11, 2026

Uh oh!

Recxsmacx commented Feb 12, 2026

Uh oh!

romitg2 commented Feb 12, 2026

Uh oh!

Recxsmacx commented Feb 12, 2026

Uh oh!

romitg2 commented Feb 12, 2026

Uh oh!

Recxsmacx commented Feb 12, 2026

Uh oh!

romitg2 commented Feb 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Recxsmacx commented Feb 12, 2026

Uh oh!

romitg2 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Recxsmacx commented Feb 11, 2026 •

edited by cubic-dev-ai bot

Loading

devin-ai-integration bot commented Feb 11, 2026 •

edited by anikdhabal

Loading

anikdhabal commented Feb 11, 2026 •

edited

Loading

romitg2 commented Feb 12, 2026 •

edited

Loading