Skip to content

Display SearchForReports results in proper tiers order - #94362

Open
carlosmiceli wants to merge 20 commits into
mainfrom
cm-searchforreports-result-order
Open

Display SearchForReports results in proper tiers order#94362
carlosmiceli wants to merge 20 commits into
mainfrom
cm-searchforreports-result-order

Conversation

@carlosmiceli

@carlosmiceli carlosmiceli commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

The chat-finder ordered results entirely client-side (report kind + recency) and ignored the order SearchForReports returns, so the backend's tier ranking was discarded.

The backend now returns an ordered searchResultReportIDs list reflecting its search tiers:

  1. Active (primary) workspace reports
  2. DMs with people on your email domain
  3. Reports in your other workspaces
  4. DMs with everyone else

This PR orders the chat-finder by that list when present, and renders the selfDM first (it's gets it from Onyxand the rest as a single ordered list.

Screen.Recording.2026-06-25.at.8.56.37.AM.mov

Fixed Issues

https://github.com/Expensify/Expensify/issues/530969

PROPOSAL:

Tests

  1. Open the search router (Cmd+K).
  2. Search a term matching chats across multiple tiers (your primary workspace + DMs + other workspaces).
  3. Verify results display in the backend's tier order: self, then your primary workspace chats (including rooms like #admins), then same-domain DMs, then other-workspace chats, then other DMs.
  4. Verify the list updates to that order once the search returns.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@carlosmiceli

Copy link
Copy Markdown
Contributor Author

@codex review

@carlosmiceli

Copy link
Copy Markdown
Contributor Author

@MelvinBot fix eslint

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Fixed the failing ESLint check.

The error was an unnecessary type assertion in tests/unit/SearchAutocompleteListTest.tsx:476 (@typescript-eslint/no-unnecessary-type-assertion): the typeof el.props.children === 'string' check already narrows the type to string, so the as string cast was redundant. Removed it.

Verified locally with ./scripts/lint.sh on all changed files — clean.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9c2c1d4039

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/components/Search/SearchAutocompleteList.tsx
@codecov

codecov Bot commented Jun 24, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/components/Search/SearchAutocompleteList.tsx 92.71% <100.00%> (+0.41%) ⬆️
src/libs/ExportOnyxState/common.ts 80.95% <ø> (ø)
src/libs/actions/Report/index.ts 71.41% <100.00%> (+0.01%) ⬆️
src/setup/index.ts 100.00% <ø> (ø)
... and 7 files with indirect coverage changes

@carlosmiceli carlosmiceli changed the title Display SearchForReports results in Auth's tier order Display SearchForReports results in proper tiers order Jun 25, 2026
@carlosmiceli
carlosmiceli marked this pull request as ready for review June 25, 2026 12:00
@carlosmiceli
carlosmiceli requested review from a team as code owners June 25, 2026 12:00
@melvin-bot
melvin-bot Bot requested review from flaviadefaria and sobitneupane and removed request for a team June 25, 2026 12:00
@melvin-bot

melvin-bot Bot commented Jun 25, 2026

Copy link
Copy Markdown

@sobitneupane Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot removed the request for review from a team June 25, 2026 12:00
@carlosmiceli

Copy link
Copy Markdown
Contributor Author

@sobitneupane this will not work fully until we deploy the BE PRs, but it should also be backwards compatible, so let's test that too.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2e2f2669c5

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/components/Search/SearchAutocompleteList.tsx
@carlosmiceli carlosmiceli removed the Help Wanted Apply this label when an issue is open to proposals by contributors label Jun 25, 2026
@carlosmiceli
carlosmiceli requested a review from huult June 25, 2026 16:05
@huult

huult commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

👍

@huult

huult commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@huult

huult commented Jun 29, 2026

Copy link
Copy Markdown
Contributor
Screen.Recording.2026-06-29.at.09.29.25.mov

@carlosmiceli Tag me when the backend PR is merged. I'll review this PR again.

@carlosmiceli

Copy link
Copy Markdown
Contributor Author

@huult sounds good! Thanks!

@huult

huult commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

@carlosmiceli Tag me when the backend is ready.

@huult

huult commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

@carlosmiceli The unit test is failing. Could you take a look?

@huult

huult commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

@carlosmiceli Tag me when the backend is ready.

@huult

huult commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

@carlosmiceli Can I ask if the backend changes are ready yet? If so, can I re-review this PR?

@huult

huult commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

@carlosmiceli Could you sync this branch with main?

@huult

huult commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

@carlosmiceli could you please sync with main to resolve the conflict?

@carlosmiceli

Copy link
Copy Markdown
Contributor Author

@MelvinBot please merge main and fix conflicts.

@huult sorry for being slow here, we're still needing to confirm some BE improvements before we can proceed with the App PR. Will let you know when it's ready to review 🙇

…esult-order

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>

# Conflicts:
#	src/components/Search/SearchAutocompleteList.tsx
@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Merged main and resolved the conflict.

There was one conflict, in src/components/Search/SearchAutocompleteList.tsx — the useMemo dependency array around the getSearchOptions call. This branch added searchResultReportIDs as a dependency while main added translate. Both variables are referenced inside the memo body (searchResultReportIDs for the maxResults guard, translate in the getSearchOptions args), so I kept both dependencies. The rest of the file auto-merged.

The PR now shows as mergeable.

Note on local validation

I couldn't run the local lint/typecheck suite in this environment, so I verified the resolution statically: both dependencies are in scope (searchResultReportIDs from useOnyx, translate from useLocalize) and each is used inside the callback, which is exactly what react-hooks/exhaustive-deps requires — dropping either is what would flag a lint error, not keeping both. Please rely on CI for the full check run.

Comment thread src/components/Search/SearchAutocompleteList.tsx Outdated
Comment thread src/components/Search/SearchAutocompleteList.tsx Outdated
}
} else {
// Active search: split rows into local (frozen order) and server sections.
// Active search without a server order yet: split rows into local (frozen order) and server sections.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can we remove this else branch?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think there's a risk that rows already on screen get reshuffled while the user is already seeing reports stored locally, but maybe @huult can confirm.

@carlosmiceli

Copy link
Copy Markdown
Contributor Author

@MelvinBot merge main and fix tests if failing.

@carlosmiceli

Copy link
Copy Markdown
Contributor Author

@huult the BE PRs have been merged, but still not deployed, will let you know when they are so you can start reviewing/testing.

…esult-order

Co-authored-by: Carlos Miceli <carlosmiceli@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Merged main into cm-searchforreports-result-order and pushed the merge commit (92cc474).

  • No merge conflicts — the merge was clean.
  • Ran the required local checks against the touched files:
    • npm run typecheckPASS (0 errors)
    • npm test tests/unit/SearchAutocompleteListTest.tsx tests/actions/ReportTest.tsPASS (293/293)
  • No code changes were needed — nothing was failing.

CI will now run the full suite on the updated branch.

@huult

huult commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

@huult the BE PRs have been merged, but still not deployed, will let you know when they are so you can start reviewing/testing.

Thanks! I’ll review the PR once the backend is ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Daily KSv2 Improvement Item broken or needs improvement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants