Stop displaying some advanced filters when they have no data #52102

Kicu · 2024-11-06T11:38:32Z

Explanation of Change

This PR adds logic to hide Category, Tag and Tax rate search filters if there is no data corresponding to specific filter.
Also added very small code tweaks and renames.

Fixed Issues

$ #50564
PROPOSAL:

Tests

Open Search and open Advanced filters RHP
verify that there is no tag filter displayed if user has no tags
verify that there is no category filter displayed if user has no categories
verify that there is no tax filter displayed if user has no taxes

Offline tests

QA Steps

Open Search and open Advanced filters RHP
verify that there is no tag filter displayed if user has no tags
verify that there is no category filter displayed if user has no categories
verify that there is no tax filter displayed if user has no taxes

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 verified the translation was requested/reviewed 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.js 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.
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

rec-filters-web.mov

MacOS: Desktop

Kicu · 2024-11-06T16:12:46Z

@luacmartins I need some advice here.
The code is written in the most (IMO) straightforward way. That is - if you have no data for category/tag/tax then don't show the filter.

However the original issue mentions something else: that if you do not have any policy selected, then you still get categories.
However I tested today and if you create a fresh account on new dot, then indeed you do get some general categories set in your onyx even if you have no policy. How should I handle that? I'm not sure how to discern between "general categories" that we should ignore, and "normal" categories that you could choose?

freshly created account

melvin-bot · 2024-11-06T16:13:02Z

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

luacmartins · 2024-11-06T18:15:01Z

@Kicu I think we can exclude those by comparing the policy type. Those default categories should belong to a policy with type = personal. So filtering on the policy type might help.

luacmartins

Looks good. We just need to address the personal policy categories now.

Kicu · 2024-11-07T11:30:05Z

Thanks for your explanation @luacmartins the PR is updated according to your suggestion and is ready for review

Category filter no longer shown even though there are categories for policy (personal)

luacmartins

LGTM

luacmartins · 2024-11-07T17:44:06Z

@fedirjh all yours. Please prioritize this review!

fedirjh · 2024-11-08T09:06:13Z

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 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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

fedirjh · 2024-11-08T09:20:31Z

verify that there is no category filter displayed if user has no categories

@Kicu When I disable the categories in the policy . I still still see the filter in Search, is that expected ?

CleanShot.2024-11-08.at.10.15.57.mp4

fedirjh · 2024-11-08T10:34:23Z

@Kicu When I disable the categories in the policy . I still still see the filter in Search, is that expected ?

This happens for tags and taxes as well.

289Adam289 · 2024-11-08T12:06:27Z

Hi! I'am Adam from SWM and I have worked recently on Search v2. @Kicu is currently OOO but I can answer some questions. I believe the observed behavior is as expected. Search retrieves data for display from Onyx, thus we have no way of knowing whether expenses tagged with disabled tags exist. This is why I think we should allow users to search using these tags (or categories or tax rates). Alternatively, we can adjust the logic to receive information from the BE about the existence of such expenses.

fedirjh

I believe the observed behavior is as expected. Search retrieves data for display from Onyx, thus we have no way of knowing whether expenses tagged with disabled tags exist. This is why I think we should allow users to search using these tags (or categories or tax rates).

That make sense. @luacmartins What do you think about that?

luacmartins · 2024-11-08T15:25:31Z

Yea, I agree.

OSBotify · 2024-11-08T15:37:26Z

✋ 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 · 2024-11-11T18:40:20Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.60-0 🚀

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

IuliiaHerets · 2024-11-12T09:24:06Z

This PR is failing because of issues #52361 and #52362

MonilBhavsar · 2024-11-12T09:34:33Z

@Kicu @fedirjh if you could please take a look 🙏

Kicu · 2024-11-12T10:49:41Z

will take a look at both

mjasikowski · 2024-11-12T11:39:52Z

@Kicu can you also take a look at #52378?

Kicu · 2024-11-12T15:12:40Z

@mjasikowski yup already asked a colleague to work on this

github-actions · 2024-11-13T00:43:49Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.60-3 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	skipped 🚫
🍎🔄 iOS HybridApp 🍎🔄	skipped 🚫

Ollyws · 2024-12-05T18:47:25Z

src/pages/Search/AdvancedSearchFilters.tsx

    const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);
    const taxRates = getAllTaxRates();
    const personalDetails = usePersonalDetails();
+
+    const [policies = {}] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const [allPolicyCategories = {}] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES);


This was causing the category menu to show after deletion (#52362), we fixed this in #52608.

Kicu force-pushed the kicu/50564-hide-category-filter branch from e342e0b to 92c9783 Compare November 6, 2024 11:39

Kicu marked this pull request as ready for review November 6, 2024 16:12

Kicu requested a review from a team as a code owner November 6, 2024 16:12

melvin-bot bot requested review from fedirjh and removed request for a team November 6, 2024 16:13

luacmartins self-requested a review November 6, 2024 18:13

luacmartins reviewed Nov 6, 2024

View reviewed changes

Kicu added 2 commits November 7, 2024 10:47

Stop displaying some advanced filters when they have no data

a1e8938

Stop displaying category filter for categories from personal policy

5292f56

Kicu force-pushed the kicu/50564-hide-category-filter branch from 92c9783 to 5292f56 Compare November 7, 2024 11:29

luacmartins approved these changes Nov 7, 2024

View reviewed changes

fedirjh approved these changes Nov 8, 2024

View reviewed changes

melvin-bot bot requested a review from luacmartins November 8, 2024 14:59

luacmartins approved these changes Nov 8, 2024

View reviewed changes

luacmartins merged commit a569cbc into Expensify:main Nov 8, 2024
17 of 18 checks passed

github-actions bot mentioned this pull request Nov 11, 2024

[HOLD for payment 2024-11-21] Deploy Checklist: New Expensify 2024-11-11 #52320

Closed

95 tasks

IuliiaHerets mentioned this pull request Nov 12, 2024

Search - "Save search" is shown when no category is displayed #52361

Closed

8 tasks

IuliiaHerets mentioned this pull request Nov 12, 2024

[PAID] [Search v2.5] - Category field is still present after deleting all the categories #52362

Closed

8 tasks

IuliiaHerets mentioned this pull request Nov 12, 2024

[Search v2.5] Tax rate field is displayed after disabling Taxes #52378

Closed

8 tasks

melvin-bot bot mentioned this pull request Nov 13, 2024

[HOLD for payment 2024-11-20] [$250] Search filters - Category list shows default categories when no workspace is created #50564

Closed

6 tasks

Ollyws reviewed Dec 5, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stop displaying some advanced filters when they have no data #52102

Stop displaying some advanced filters when they have no data #52102

Kicu commented Nov 6, 2024 •

edited

Loading

Kicu commented Nov 6, 2024

melvin-bot bot commented Nov 6, 2024

luacmartins commented Nov 6, 2024

luacmartins left a comment

Kicu commented Nov 7, 2024 •

edited

Loading

luacmartins left a comment

luacmartins commented Nov 7, 2024

fedirjh commented Nov 8, 2024 •

edited

Loading

fedirjh commented Nov 8, 2024 •

edited

Loading

fedirjh commented Nov 8, 2024

289Adam289 commented Nov 8, 2024

fedirjh left a comment

luacmartins commented Nov 8, 2024

OSBotify commented Nov 8, 2024

github-actions bot commented Nov 11, 2024

IuliiaHerets commented Nov 12, 2024 •

edited

Loading

MonilBhavsar commented Nov 12, 2024

Kicu commented Nov 12, 2024

mjasikowski commented Nov 12, 2024

Kicu commented Nov 12, 2024

github-actions bot commented Nov 13, 2024

Ollyws Dec 5, 2024 •

edited

Loading

Stop displaying some advanced filters when they have no data #52102

Stop displaying some advanced filters when they have no data #52102

Conversation

Kicu commented Nov 6, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Kicu commented Nov 6, 2024

freshly created account

melvin-bot bot commented Nov 6, 2024

luacmartins commented Nov 6, 2024

luacmartins left a comment

Choose a reason for hiding this comment

Kicu commented Nov 7, 2024 • edited Loading

Category filter no longer shown even though there are categories for policy (personal)

luacmartins left a comment

Choose a reason for hiding this comment

luacmartins commented Nov 7, 2024

fedirjh commented Nov 8, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

fedirjh commented Nov 8, 2024 • edited Loading

fedirjh commented Nov 8, 2024

289Adam289 commented Nov 8, 2024

fedirjh left a comment

Choose a reason for hiding this comment

luacmartins commented Nov 8, 2024

OSBotify commented Nov 8, 2024

github-actions bot commented Nov 11, 2024

IuliiaHerets commented Nov 12, 2024 • edited Loading

MonilBhavsar commented Nov 12, 2024

Kicu commented Nov 12, 2024

mjasikowski commented Nov 12, 2024

Kicu commented Nov 12, 2024

github-actions bot commented Nov 13, 2024

Ollyws Dec 5, 2024 • edited Loading

Choose a reason for hiding this comment

Kicu commented Nov 6, 2024 •

edited

Loading

Kicu commented Nov 7, 2024 •

edited

Loading

fedirjh commented Nov 8, 2024 •

edited

Loading

fedirjh commented Nov 8, 2024 •

edited

Loading

IuliiaHerets commented Nov 12, 2024 •

edited

Loading

Ollyws Dec 5, 2024 •

edited

Loading