Workspace filter is displayed when account has no workspace #59943

sumo-slonik · 2025-04-09T16:41:16Z

Explanation of Change

Fixed Issues

$ #59882
PROPOSAL:

Tests

Precondition:
Account has no workspace.

Go to staging.new.expensify.com
Go to Reports.
Click Filters.
Click Workspace.
Expected: There should be no workspace filter.
Create a workspace.
Go to Reports.
Click Filters.
Expected: There should be a workspace filter.

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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
- MacOS: Desktop
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 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 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.2025-04-10.at.12.00.19.mov

Android: mWeb Chrome

android.web.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios.web.mov

MacOS: Chrome / Safari

Screen.Recording.2025-04-09.at.18.37.56.mov

MacOS: Desktop

sumo-slonik · 2025-04-09T16:42:52Z

src/pages/Search/AdvancedSearchFilters.tsx

+        searchTerm: debouncedSearchTerm,
+    });
+
+    const isWorkspaceNameStillPresent = (filterTitle: string | undefined) => workspaces.some((section) => section.data?.some((item) => item.text === filterTitle));


I added this to prevent scenarios like this:

Screen.Recording.2025-04-09.at.18.16.07.mov

Can you please explain why?

@dukenv0307

As you can see in the 0:30 of recording, after adding a new workspace, the first workspace is selected by default, even though we don't have that one. It's actually the previously selected workspace, which had been deleted earlier — that's why I'm checking if it's still present.

Why don't we use workspaces to get selectedWorkspaceName, like const selectedWorkspaceName = baseFilterConfig[key].getTitle(searchAdvancedFilters, workspaces);?

Or filter the policy data using shouldShowPolicy

I tried not to disrupt the logic we've been using so far to avoid introducing new bugs.
If you think it's better to change it, I can do that, but my solution seems quite clear to me and doesn't disrupt the previous logic, the only issue with which was showing the filter when it wasn't necessarily needed.

@sumo-slonik What do you mean about the previous logic?

baseFilterConfig[key].getTitle(searchAdvancedFilters, policies);

this logic is new and under beta. Furthermore, we're getting the name from policies (policies can contain the deleted WS) then use workspaces to check if it's present or not. Why don't we just use data from workspaces

Here is my sample code

const data = workspaces.flatMap((section) => section.data); ... filterTitle = baseFilterConfig[key].getTitle(searchAdvancedFilters, data);

What do you think?

I think it makes sense. I know it's behind the beta here, but I was afraid of breaking something that was already working in it. But now I understand what you mean, and it seems like a reasonable fix to me.

src/pages/Search/AdvancedSearchFilters.tsx

melvin-bot · 2025-04-10T10:03:54Z

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

dukenv0307 · 2025-04-11T14:52:27Z

@sumo-slonik Please let me know when it's ready for review again

sumo-slonik · 2025-04-14T10:09:18Z

@dukenv0307 I think it's ready to be reviewed again

src/pages/Search/AdvancedSearchFilters.tsx

dukenv0307 · 2025-04-14T15:10:31Z

Looks good, just left 1 minor comment

…pace-filter-is-displayed-when-account-has-no-workspace

sumo-slonik · 2025-04-15T12:10:01Z

Fixed :D

dukenv0307 · 2025-04-15T15:26:33Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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
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.
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.
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: Native

Screen.Recording.2025-04-15.at.22.22.13.mov

Android: mWeb Chrome

Screen.Recording.2025-04-15.at.22.19.48.mov

iOS: Native

Screen.Recording.2025-04-15.at.22.22.26.mov

iOS: mWeb Safari

Screen.Recording.2025-04-15.at.22.19.30.mov

MacOS: Chrome / Safari

web-resize.mp4

MacOS: Desktop

Screen.Recording.2025-04-15.at.22.23.46.mov

dukenv0307

LGTM

mountiny

Thanks!

mountiny · 2025-04-16T09:14:56Z

src/pages/Search/AdvancedSearchFilters.tsx

@@ -160,7 +162,7 @@ const baseFilterConfig = {
 */
 const typeFiltersKeys: Record<string, Array<Array<ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>>>> = {
    [CONST.SEARCH.DATA_TYPES.EXPENSE]: [
-        [CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD, CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM, CONST.SEARCH.SYNTAX_FILTER_KEYS.TO],


I think the policy filter should be available for other search types too (expense reports, trips etc) as those are also associated with policies

Going to discuss with the team

github-actions · 2025-04-16T09:23:43Z

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

OSBotify · 2025-04-16T09:26:25Z

✋ 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-04-16T09:28:47Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
Android 🤖🔄	iOS 🍎🔄


Desktop 💻	Web 🕸️
❌ FAILED ❌	https://59943.pr-testing.expensify.com
The QR code can't be generated, because the Desktop build failed

👀 View the workflow run that generated this build 👀

github-actions · 2025-04-16T21:39:44Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.29-0 🚀

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

github-actions · 2025-04-18T20:31:39Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.29-10 🚀

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

sumo-slonik added 2 commits April 9, 2025 18:19

fix no showing workspace filter if there is no workspace

1e9a699

fix case of removed workspace

1c7983e

sumo-slonik commented Apr 9, 2025

View reviewed changes

dukenv0307 reviewed Apr 9, 2025

View reviewed changes

src/pages/Search/AdvancedSearchFilters.tsx Outdated Show resolved Hide resolved

WojtekBoman mentioned this pull request Apr 10, 2025

[Desktop Navigation] Add a dedicated Workspace filter to the Reports tab #59450

Merged

50 tasks

sumo-slonik marked this pull request as ready for review April 10, 2025 10:03

sumo-slonik requested a review from a team as a code owner April 10, 2025 10:03

melvin-bot bot requested review from dukenv0307 and removed request for a team April 10, 2025 10:03

cleanup code

a00c722

mountiny assigned sumo-slonik Apr 10, 2025

cleanup code

0d421e2

change workspace filter tittle getter function

67b6794

sumo-slonik force-pushed the bugfix/kuba_nowakowski/Reports-filters-Workspace-filter-is-displayed-when-account-has-no-workspace branch from ae0462a to 67b6794 Compare April 14, 2025 10:11

brunovjk mentioned this pull request Apr 14, 2025

[Desktop Navigation] [$250] Reports - Deleted workspace is displayed on workspace filter option and switcher #59914

Closed

8 tasks

dukenv0307 reviewed Apr 14, 2025

View reviewed changes

src/pages/Search/AdvancedSearchFilters.tsx Show resolved Hide resolved

sumo-slonik added 2 commits April 15, 2025 13:57

new condition in shouldDisplayWorkspaceFilter

5c3d774

Merge branch 'main' into bugfix/kuba_nowakowski/Reports-filters-Works…

f09448e

…pace-filter-is-displayed-when-account-has-no-workspace

dukenv0307 approved these changes Apr 15, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny April 15, 2025 15:26

mountiny approved these changes Apr 16, 2025

View reviewed changes

mountiny merged commit 1172ce3 into Expensify:main Apr 16, 2025
19 of 20 checks passed

github-actions bot mentioned this pull request Apr 16, 2025

Deploy Checklist: New Expensify 2025-04-16 #60369

Closed

87 tasks

melvin-bot bot mentioned this pull request Apr 18, 2025

[Due for payment 2025-04-25] [Desktop Navigation] Reports filters - Workspace filter is displayed when account has no workspace #59882

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Workspace filter is displayed when account has no workspace #59943

Workspace filter is displayed when account has no workspace #59943

sumo-slonik commented Apr 9, 2025 •

edited

Loading

sumo-slonik Apr 9, 2025

dukenv0307 Apr 9, 2025

sumo-slonik Apr 10, 2025 •

edited

Loading

dukenv0307 Apr 10, 2025

dukenv0307 Apr 10, 2025

sumo-slonik Apr 10, 2025

dukenv0307 Apr 10, 2025 •

edited

Loading

sumo-slonik Apr 11, 2025

melvin-bot bot commented Apr 10, 2025

dukenv0307 commented Apr 11, 2025

sumo-slonik commented Apr 14, 2025

dukenv0307 commented Apr 14, 2025

sumo-slonik commented Apr 15, 2025

dukenv0307 commented Apr 15, 2025

dukenv0307 left a comment

mountiny left a comment

mountiny Apr 16, 2025

mountiny Apr 16, 2025

github-actions bot commented Apr 16, 2025

OSBotify commented Apr 16, 2025

github-actions bot commented Apr 16, 2025

github-actions bot commented Apr 16, 2025

github-actions bot commented Apr 18, 2025

Workspace filter is displayed when account has no workspace #59943

Workspace filter is displayed when account has no workspace #59943

Conversation

sumo-slonik commented Apr 9, 2025 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sumo-slonik Apr 10, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dukenv0307 Apr 10, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

melvin-bot bot commented Apr 10, 2025

dukenv0307 commented Apr 11, 2025

sumo-slonik commented Apr 14, 2025

dukenv0307 commented Apr 14, 2025

sumo-slonik commented Apr 15, 2025

dukenv0307 commented Apr 15, 2025

Reviewer Checklist

Screenshots/Videos

dukenv0307 left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Apr 16, 2025

OSBotify commented Apr 16, 2025

github-actions bot commented Apr 16, 2025

github-actions bot commented Apr 16, 2025

github-actions bot commented Apr 18, 2025

sumo-slonik commented Apr 9, 2025 •

edited

Loading

sumo-slonik Apr 10, 2025 •

edited

Loading

dukenv0307 Apr 10, 2025 •

edited

Loading