fix: pagination state on search for custom sounds and emojis#40115
Draft
nazabucciarelli wants to merge 5 commits into
Draft
fix: pagination state on search for custom sounds and emojis#40115nazabucciarelli wants to merge 5 commits into
nazabucciarelli wants to merge 5 commits into
Conversation
Contributor
|
Looks like this PR is not ready to merge, because of the following issues:
Please fix the issues and try again If you have any trouble, please check the PR guidelines |
🦋 Changeset detectedLatest commit: e341162 The changes in this PR will be included in the next version bump. This PR includes changesets to release 42 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
✅ Files skipped from review due to trivial changes (1)
🚧 Files skipped from review as they are similar to previous changes (1)
📜 Recent review details⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (4)
WalkthroughReset pagination to page 0 when filter text changes for Custom Emojis and Custom Sounds; add a changeset declaring a patch release for ChangesChangesets
Pagination reset on filter inputs
Estimated code review effort🎯 2 (Simple) | ⏱️ ~8 minutes Suggested labels
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. Warning Review ran into problems🔥 ProblemsErrors were encountered while retrieving linked issues. Errors (1)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In @.changeset/real-suns-float.md:
- Line 5: Update the changeset description string that currently reads "Fixes
pagination reset on search for Customs Sounds and Emojis" to use the correct
wording "Custom Sounds" (i.e., change "Customs Sounds" → "Custom Sounds") so the
description becomes "Fixes pagination reset on search for Custom Sounds and
Emojis"; ensure only the typo is corrected and punctuation/capitalization
remains consistent.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 8f2e7b1d-0bb3-4f4a-ae81-9d97ae3b6e81
📒 Files selected for processing (3)
.changeset/real-suns-float.mdapps/meteor/client/views/admin/customEmoji/CustomEmoji.tsxapps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx
📜 Review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
- GitHub Check: 📦 Build Packages
- GitHub Check: cubic · AI code reviewer
- GitHub Check: CodeQL-Build
🧰 Additional context used
📓 Path-based instructions (1)
**/*.{ts,tsx,js}
📄 CodeRabbit inference engine (.cursor/rules/playwright.mdc)
**/*.{ts,tsx,js}: Write concise, technical TypeScript/JavaScript with accurate typing in Playwright tests
Avoid code comments in the implementation
Files:
apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsxapps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx
🧠 Learnings (5)
📚 Learning: 2026-02-24T19:09:09.561Z
Learnt from: ahmed-n-abdeltwab
Repo: RocketChat/Rocket.Chat PR: 38974
File: apps/meteor/app/api/server/v1/im.ts:220-221
Timestamp: 2026-02-24T19:09:09.561Z
Learning: In RocketChat/Rocket.Chat OpenAPI migration PRs for apps/meteor/app/api/server/v1 endpoints, maintainers prefer to avoid any logic changes; style-only cleanups (like removing inline comments) may be deferred to follow-ups to keep scope tight.
Applied to files:
.changeset/real-suns-float.md
📚 Learning: 2026-02-24T19:05:56.710Z
Learnt from: ahmed-n-abdeltwab
Repo: RocketChat/Rocket.Chat PR: 0
File: :0-0
Timestamp: 2026-02-24T19:05:56.710Z
Learning: Rocket.Chat repo context: When a workspace manifest on develop already pins a dependency version (e.g., packages/web-ui-registration → "rocket.chat/ui-contexts": "27.0.1"), a lockfile change in a feature PR that upgrades only that dependency’s resolution is considered a manifest-driven sync and can be kept, preferably as a small "chore: sync yarn.lock with manifests" commit.
Applied to files:
.changeset/real-suns-float.md
📚 Learning: 2025-11-19T18:20:07.720Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 37419
File: packages/i18n/src/locales/en.i18n.json:918-921
Timestamp: 2025-11-19T18:20:07.720Z
Learning: Repo: RocketChat/Rocket.Chat — i18n/formatting
Learning: This repository uses a custom message formatting parser in UI blocks/messages; do not assume standard Markdown rules. For keys like Call_ended_bold, Call_not_answered_bold, Call_failed_bold, and Call_transferred_bold in packages/i18n/src/locales/en.i18n.json, retain the existing single-asterisk emphasis unless maintainers request otherwise.
Applied to files:
.changeset/real-suns-float.md
📚 Learning: 2026-03-16T21:50:37.589Z
Learnt from: amitb0ra
Repo: RocketChat/Rocket.Chat PR: 39676
File: .changeset/migrate-users-register-openapi.md:3-3
Timestamp: 2026-03-16T21:50:37.589Z
Learning: For changes related to OpenAPI migrations in Rocket.Chat/OpenAPI, when removing endpoint types and validators from rocket.chat/rest-typings (e.g., UserRegisterParamsPOST, /v1/users.register) document this as a minor changeset (not breaking) per RocketChat/Rocket.Chat-Open-API#150 Rule 7. Note that the endpoint type is re-exposed via a module augmentation .d.ts in the consuming package (e.g., packages/web-ui-registration/src/users-register.d.ts). In reviews, ensure the changeset clearly states: this is a non-breaking change, the major version should not be bumped, and the changeset reflects a minor version bump. Do not treat this as a breaking change during OpenAPI migrations.
Applied to files:
.changeset/real-suns-float.md
📚 Learning: 2026-03-27T14:52:56.865Z
Learnt from: dougfabris
Repo: RocketChat/Rocket.Chat PR: 39892
File: apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx:150-155
Timestamp: 2026-03-27T14:52:56.865Z
Learning: In Rocket.Chat, there are two different `ModalBackdrop` components with different prop APIs. During review, confirm the import source: (1) `rocket.chat/fuselage` `ModalBackdrop` uses `ModalBackdropProps` based on `BoxProps` (so it supports `onClick` and other Box/DOM props) and does not have an `onDismiss` prop; (2) `rocket.chat/ui-client` `ModalBackdrop` uses a narrower props interface like `{ children?: ReactNode; onDismiss?: () => void }` and handles Escape keypress and outside mouse-up, and it does not forward arbitrary DOM props such as `onClick`. Flag mismatched props (e.g., `onDismiss` passed to the fuselage component or `onClick` passed to the ui-client component) and ensure the usage matches the correct component being imported.
Applied to files:
apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsxapps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx
🔇 Additional comments (2)
apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx (1)
68-74: Good fix: page index reset is applied at the right place.Resetting
currentinside the searchonChangehandler correctly prevents stale offsets during filtered queries.apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx (1)
71-77: Looks correct: search now reliably starts from page 1.This change properly resets pagination state when the filter text changes.
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #40115 +/- ##
===========================================
- Coverage 69.57% 69.57% -0.01%
===========================================
Files 3317 3317
Lines 121867 121866 -1
Branches 21801 21847 +46
===========================================
- Hits 84794 84788 -6
- Misses 33740 33748 +8
+ Partials 3333 3330 -3
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
dougfabris
requested changes
Apr 13, 2026
Member
dougfabris
left a comment
dougfabris
left a comment
There was a problem hiding this comment.
This fix seems a little weak, I'm wondering if we could have a more wider solution under the usePagination or something else, so all places we use it, could benefit from a potential fix
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
nazabucciarelli
force-pushed
the
fix/pagination-reset-sounds-and-emojis
branch
from
6c822db to
e341162
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes an admin UI pagination bug where searching in Custom Sounds / Custom Emojis could keep the previous page offset, resulting in empty/out-of-range results. It does so by extending the shared usePagination hook to allow resetting the current page when specified “reset trigger” values change.
Changes:
- Extended
usePaginationto accept an optionalresetDependenciesarray that triggerssetCurrent(0)when any dependency changes. - Wired Custom Sounds and Custom Emojis tables to reset pagination when the search text changes.
- Added a changeset entry for a patch release.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| packages/ui-client/src/components/GenericTable/hooks/usePagination.ts | Adds optional reset-dependencies support to reset pagination state when filters/search change. |
| apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx | Passes search text into usePagination so pagination resets on search changes. |
| apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx | Passes search text into usePagination so pagination resets on search changes; minor null-safe condition tweak. |
| .changeset/real-suns-float.md | Patch release note for the pagination reset fix. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
26
to
+29
| // Reset to first page when itemsPerPage changes | ||
| useEffect(() => { | ||
| setCurrent(0); | ||
| }, [itemsPerPage, setCurrent]); | ||
| }, [itemsPerPage, setCurrent, ...resetDependencies]); |
Comment on lines
26
to
31
| const CustomSoundsTable = ({ reload, onClick }: CustomSoundsTableProps) => { | ||
| const t = useTranslation(); | ||
| const { sortBy, sortDirection, setSort } = useSort<'name'>('name'); | ||
| const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination(); | ||
|
|
||
| const [text, setText] = useState(''); | ||
| const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination([text]); | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed changes (including videos or screenshots)
Introduced a new optional parameter
resetDependencies(an array) to theusePaginationcustom hook. When any value inside this array changes, the hook automatically resets the current page to 0.Instead of accepting a single value for the reset trigger, I implemented it directly as an array. This allows any table using this hook to easily handle multiple simultaneous filters in the future (e.g., [text, status, category]) without modifying the hook's signature again.
Issue(s)
CORE-2096 [Improvement] Pagination not resetting on search in Custom Sounds and Custom Emojis tables
Steps to test or reproduce
To test this you will need to bring the changes from this PR to unblock the bug on Custom Sounds pagination.
Further comments
Summary by CodeRabbit
Bug Fixes
Chores