[CP Staging] Filter page improvements by parasharrajat · Pull Request #65411 · Expensify/App

parasharrajat · 2025-07-03T11:52:55Z

Explanation of Change

Open workspace filter, reset button now reset only selection instead of directly updating the filters. This matches other filter pages.
On tax rate filter page, previously selected filters were shown as duplicates item when multiple workspaces had same tax rates. This PR fixed it so that there are no duplicates.

Fixed Issues

$ #65418
$ #65453
PROPOSAL:

Tests

Prerequisites

Create at least two workspaces.
Create tax rates in both of these workspaces. Make sure there are similar tax rate values in these workspaces. e.g. Tax Exempt, Tax Rate 1

Go to Reports page.
Open filters and go to the workspace filter page.
Select both workspaces.
Save the filter.
Go back to the workspace filter page and press the reset button.
- Verify that this only removes the selection, and until you press Save button filter is not updated.
Now, keep both workspaces selected and go to the tax rate filter page.
- Verify that there are no duplicate names for the tax rates in the list.
Now, select any tax rate values and save this filter.
Go back to the tax rate filter page.

Verify that there are no duplicate names in the 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

Screenshots/Videos

Android: Native

03.07.2025_18.03.50_REC.mp4

Android: mWeb Chrome

03.07.2025_18.08.33_REC.mp4

iOS: Native

03.07.2025_17.58.10_REC.mp4

iOS: mWeb Safari

03.07.2025_17.59.36_REC.mp4

MacOS: Chrome / Safari

03.07.2025_14.20.52_REC.mp4

MacOS: Desktop

03.07.2025_18.07.45_REC.mp4

melvin-bot · 2025-07-03T12:39:54Z

@alitoshmatov 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]

parasharrajat · 2025-07-03T12:41:15Z

@alitoshmatov Sorry for bump. Please don't review it yet. It will be linked to a different issue so the review will be based on that.

JmillsExpensify · 2025-07-03T13:05:45Z

Note for later: Before we merge this PR, I'd like to test an adhoc build.

parasharrajat · 2025-07-03T13:13:03Z

Sure, Ready for review now.

parasharrajat · 2025-07-03T16:45:09Z

@alitoshmatov can you please review this asap? I would love to get this shipped to staging before the current checklist; otherwise, QA might raise this as a bug.

github-actions · 2025-07-05T05:15:32Z

🚧 @mountiny has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2025-07-05T05:45:01Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪
Built from App PR #65411.

Android 🤖	iOS 🍎
❌ FAILED ❌	❌ FAILED ❌
The QR code can't be generated, because the Android build failed	The QR code can't be generated, because the iOS build failed

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/65411/NewExpensify.dmg	https://65411.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

DylanDylann · 2025-07-05T05:54:33Z

@shubham1206agra I already started reviewing this PR from this thread

cc @mountiny

shubham1206agra · 2025-07-05T05:57:08Z

@DylanDylann Sorry, but I also started reviewing this PR. And I was assigned by CME here.

shubham1206agra · 2025-07-05T06:17:29Z

@@ -70,7 +70,7 @@ function SearchFiltersWorkspacePage() {
    }, [selectedOptions]);


@parasharrajat Can you fix this function by using below?

const applyChanges = useCallback(() => { const policyIds = selectedOptions.map((option) => (option ? option.toString() : undefined)).filter(Boolean) as string[]; updateWorkspaceFilter(policyIds.length > 0 ? policyIds : null); }, [selectedOptions]);

Actually, fix the buildQueryStringFromFilterFormValues function.

See the diff

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts index 52fb60daeaa..18239a27095 100644 --- a/src/libs/SearchQueryUtils.ts +++ b/src/libs/SearchQueryUtils.ts @@ -395,7 +395,7 @@ function buildSearchQueryString(queryJSON?: SearchQueryJSON) { */ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvancedFiltersForm>) { // We separate type and status filters from other filters to maintain hashes consistency for saved searches - const {type, status, policyID, groupBy, ...otherFilters} = filterValues; + const {type, status, groupBy, ...otherFilters} = filterValues; const filtersString: string[] = []; // When switching types/setting the type, ensure we aren't polluting our query with filters that are @@ -436,11 +436,6 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc filtersString.push(`${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${filterValueArray.map(sanitizeSearchValue).join(',')}`); } - if (policyID) { - const sanitizedPolicyIDs = Array.isArray(policyID) ? policyID.map((id) => sanitizeSearchValue(id)).join(',') : sanitizeSearchValue(policyID); - filtersString.push(`${CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID}:${sanitizedPolicyIDs}`); - } - const mappedFilters = Object.entries(otherFilters) .map(([filterKey, filterValue]) => { if (

Which issue are we solving here?

The query issue.

I see. I think we need this logic for sanitizing but, the fix here might be to check the length as the value is an array. Pushing that change now.

There is similar logic below which handles sanitizing

@parasharrajat See

App/src/libs/SearchQueryUtils.ts

Line 490 in 99e31a5

filterKey === FILTER_KEYS.POLICY_ID ||

shubham1206agra · 2025-07-05T07:33:12Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- 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 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)
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
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
xIf 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.
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.
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

Screen.Recording.2025-07-05.at.12.53.55.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-07-05.at.12.20.09.PM.mov

iOS: HybridApp

Screen.Recording.2025-07-05.at.12.50.17.PM.mov

iOS: mWeb Safari

Screen.Recording.2025-07-05.at.11.57.33.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2025-07-05.at.11.30.41.AM.mov

MacOS: Desktop

Screen.Recording.2025-07-05.at.12.26.53.PM.mov

…space (cherry picked from commit c5f6b11) (cherry-picked to staging by mountiny)

OSBotify · 2025-07-06T15:45:32Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-07-06T16:27:11Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.1.76-4 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

…lti-workspace" This reverts commit c5f6b11, reversing changes made to 99e31a5.

github-actions · 2025-07-07T10:58:28Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.76-5 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

github-actions · 2025-07-07T11:32:34Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.1.77-1 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2025-07-08T21:02:16Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.77-2 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

parasharrajat added 3 commits July 3, 2025 13:40

Reset Filters in UI instead of actual filter on reset click

0c72bca

Fix duplicate items after selection

9fc44c2

Fix Filters

fe04631

parasharrajat marked this pull request as ready for review July 3, 2025 12:39

parasharrajat requested a review from a team as a code owner July 3, 2025 12:39

melvin-bot Bot requested review from alitoshmatov and removed request for a team July 3, 2025 12:39

parasharrajat marked this pull request as draft July 3, 2025 12:40

parasharrajat marked this pull request as ready for review July 3, 2025 13:05

Fix category and tag filter pages

d8e5c7b

parasharrajat mentioned this pull request Jul 4, 2025

[Due for payment 2025-07-15] [Due for payment 2025-07-14] [$125] Filters - Category and tag lists are missing in the advanced filters #65453

Closed

8 tasks

mountiny assigned parasharrajat and mountiny Jul 5, 2025

mountiny changed the title ~~Filter page improvements~~ [CP Staging] Filter page improvements Jul 5, 2025

mountiny requested review from shubham1206agra and removed request for alitoshmatov July 5, 2025 05:24

mountiny removed their assignment Jul 5, 2025

mountiny self-requested a review July 5, 2025 05:24

shubham1206agra reviewed Jul 5, 2025

View reviewed changes

Comment thread src/components/Search/SearchMultipleSelectionPicker.tsx Outdated

shubham1206agra reviewed Jul 5, 2025

View reviewed changes

More fixes

3b1bf61

shubham1206agra approved these changes Jul 5, 2025

View reviewed changes

melvin-bot Bot requested a review from mjasikowski July 5, 2025 12:47

mountiny approved these changes Jul 6, 2025

View reviewed changes

mountiny merged commit c5f6b11 into Expensify:main Jul 6, 2025
20 checks passed

OSBotify pushed a commit that referenced this pull request Jul 6, 2025

Merge pull request #65411 from parasharrajat/parasharrajat/multi-work…

83516a2

…space (cherry picked from commit c5f6b11) (cherry-picked to staging by mountiny)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jul 6, 2025

github-actions Bot mentioned this pull request Jul 6, 2025

Deploy Checklist: New Expensify 2025-07-03 #65447

Closed

63 tasks

mountiny added a commit that referenced this pull request Jul 7, 2025

Revert "Merge pull request #65411 from parasharrajat/parasharrajat/mu…

d67a0a7

…lti-workspace" This reverts commit c5f6b11, reversing changes made to 99e31a5.

mountiny mentioned this pull request Jul 7, 2025

[NoQA] Revert "Support for Multi workspace filter in search" #65543

Merged

51 tasks

github-actions Bot mentioned this pull request Jul 7, 2025

Deploy Checklist: New Expensify 2025-07-07 #65549

Closed

54 tasks

melvin-bot Bot mentioned this pull request Jul 7, 2025

[Due for payment 2025-07-18] [Due for payment 2025-07-15] [Due for payment 2025-07-14] [$250] Tax rates filters shows duplicates on save #65418

Closed

		@@ -70,7 +70,7 @@ function SearchFiltersWorkspacePage() {
		}, [selectedOptions]);

Conversation

parasharrajat commented Jul 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Prerequisites

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jul 3, 2025

Uh oh!

parasharrajat commented Jul 3, 2025

Uh oh!

JmillsExpensify commented Jul 3, 2025

Uh oh!

parasharrajat commented Jul 3, 2025

Uh oh!

parasharrajat commented Jul 3, 2025

Uh oh!

github-actions Bot commented Jul 5, 2025

Uh oh!

Uh oh!

github-actions Bot commented Jul 5, 2025

Uh oh!

DylanDylann commented Jul 5, 2025

Uh oh!

shubham1206agra commented Jul 5, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shubham1206agra Jul 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shubham1206agra commented Jul 5, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Jul 6, 2025

Uh oh!

github-actions Bot commented Jul 6, 2025

Uh oh!

github-actions Bot commented Jul 7, 2025

Uh oh!

github-actions Bot commented Jul 7, 2025

Uh oh!

github-actions Bot commented Jul 8, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

parasharrajat commented Jul 3, 2025 •

edited

Loading

shubham1206agra Jul 5, 2025 •

edited

Loading