82304: Search - The workspace with the same name is not displayed in the autocomplete

[abbasifaizan70]

Search - The workspace with the same name is not displayed in the autocomplete

Explanation of Change

Fixes Reports search so multiple workspaces that share the same name can all be picked from workspace: autocomplete by storing each choice under an index-based substitution key (policyID:Name, policyID:Name:1, …) instead of one key per name. It also keeps substitutions in sync when the query is edited (e.g. removing a duplicate) by remapping ordered IDs and by always applying the updated substitution map in the page header, including when it becomes empty.

Fixed Issues

$ #82304
PROPOSAL: #82304 (comment)

Tests

1. Open the app.
2. Create two workspaces with the same name.
3. Go to the Reports tab.
4. In search, type workspace: and verify the autocomplete list appears.
5. Select one workspace and confirm the results update.
6. Add a comma after the selected workspace.
7. Verify the second workspace (with the same name) appears in the autocomplete list.

• Verify that no errors appear in the JS console

Offline tests

Same as 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 verified there are no new alerts related to the canBeMissing param for useOnyx
• 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
    • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
  • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
  • 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)
  • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
  • I verified the JSDocs style guidelines (in STYLE.md) were followed
• 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)
• I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
• I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
• I verified that if a function's arguments changed that all usages have also been updated correctly
• 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.
• If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
• 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

Screen.Recording.2026-04-07.at.8.28.22.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-04-07.at.8.18.41.PM.mov

iOS: Native

Screen.Recording.2026-04-07.at.8.13.18.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-04-07.at.8.16.16.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-01.at.5.03.09.AM.mov

[codecov]

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/components/Search/SearchAutocompleteList.tsx	88.78% <ø> (ø)
...nents/Search/SearchRouter/buildSubstitutionsMap.ts	100.00% <100.00%> (ø)
...hRouter/getAutocompleteSelectionSubstitutionKey.ts	100.00% <100.00%> (ø)
.../Search/SearchRouter/getUpdatedSubstitutionsMap.ts	100.00% <100.00%> (ø)
src/hooks/useAutocompleteSuggestions.ts	76.57% <100.00%> (+3.24%)	⬆️
...rc/components/Search/SearchRouter/SearchRouter.tsx	40.98% <0.00%> (ø)
...s/Search/SearchRouter/getQueryWithSubstitutions.ts	96.96% <94.44%> (-3.04%)	⬇️
.../Search/SearchPageHeader/SearchPageHeaderInput.tsx	46.61% <0.00%> (-0.36%)	⬇️
... and 19 files with indirect coverage changes

[melvin-bot]

@aimane-chnaif 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]

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5a1073b768

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

[JmillsExpensify]

LGTM

[MelvinBot]

PR Review

The approach is sound — using index-based substitution keys to disambiguate workspaces (and potentially other entities) that share the same display name is a clean solution. A few items to address:

1. Duplicated substitution-key logic — extract to a shared helper

The 8-line block that parses the query, counts same-key ranges, and builds the substitution key is copy-pasted identically between SearchRouter.tsx (~L282-290) and SearchPageHeaderInput.tsx (~L233-241). Meanwhile, getSubstitutionMapKeyWithIndex already exists and does the key formatting. Consider extracting the full "compute substitution key for the just-selected item" logic into a single utility (e.g. in getQueryWithSubstitutions.ts) and calling it from both files.

2. Unsafe as cast on parser result

Both files cast parseSearchQuery(newSearchQuery) with:

const parsed = parseSearchQuery(newSearchQuery) as {ranges: Array<{key: string; value: string}>};

If the parser ever returns undefined or a different shape, this will crash at runtime. Use the parser's actual return type or add a guard (e.g. parsed?.ranges ?? []).

3. Missing unit tests for the new indexing behavior

The existing tests in getQueryWithSubstitutionsTest.ts and getUpdatedSubstitutionsMapTest.ts don't cover the duplicate-name scenario that this PR fixes. Please add at least:

• getQueryWithSubstitutions: a test with two identical filter values mapped to different IDs (e.g. workspace:"My WS",workspace:"My WS" with keys policyID:My WS → id1 and policyID:My WS:1 → id2)
• getUpdatedSubstitutionsMap: a test verifying that removing one of two duplicate-name filters correctly preserves the remaining key and re-indexes

4. Minor: index <= 0 vs index === 0

In the inline logic (SearchRouter.tsx:289, SearchPageHeaderInput.tsx:240), the guard is index <= 0, but getSubstitutionMapKeyWithIndex uses index === 0. The <= 0 version silently swallows a -1 index (which would indicate a bug). Consider using === 0 consistently and letting an unexpected -1 surface as a visible problem rather than hiding it.

---

Everything else (the useAutocompleteSuggestions filtering by ID instead of name, the backward-compatible fallback in getQueryWithSubstitutions, passing autocompleteSubstitutions down) looks good. CI is green (only the reviewer checklist is failing, which is expected).

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4c02a00d48

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

[abbasifaizan70]

@aimane-chnaif Refactored code and added unit test cases. Thanks

[aimane-chnaif]

Are all AI reviews addressed?

[abbasifaizan70]

@aimane-chnaif, yes, all AI feedback is addressed. CI is failing because someone else made changes. I'll update it in the main.

[abbasifaizan70]

@aimane-chnaif PR is ready for review. Thanks.