advanced filters category #46197

289Adam289 · 2024-07-25T14:00:51Z

Details

This PR adds page for category filter

Fixed Issues

$#46038
PROPOSAL:

Tests

visit route /search/filters
test category filter and whether navigation behaves correctly
Verify that no errors appear in the JS console

Offline tests

QA Steps

Same steps 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
- 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 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
  - 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.mov

Android: mWeb Chrome

android_web.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios_web.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

github-actions · 2024-07-25T14:01:06Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

289Adam289 · 2024-07-26T11:55:28Z

I have read the CLA Document and I hereby sign the CLA

Kicu

The code looks ok, there are some changes on the Category page itself that you will have to do.
Also called @luacmartins and @blazejkustra for some help :)

Please be advised that this is a draft and is blocked by my PR: #46022 (should be ready on Monday I hope)

src/pages/Search/SearchFiltersCategoryPage.tsx

Kicu · 2024-07-26T13:34:05Z

src/pages/Search/SearchFiltersCategoryPage.tsx

+                                newCategories = activeItems?.filter((category) => category !== item.value);
+                            } else {
+                                newCategories = [...(activeItems ?? []), item.value];
+                            }


@luacmartins we need some help with deciding what kind of input UI to use for selection of multiple values.
Also how should it behave?
A. user selects multiple values and has to click some kind of green Save button update filters - just like on dates
B. user selects multiple values and on every click we update the form data, so that when there is no Save button

@289Adam289 can you please drop 1-2 screenshots in this thread so show how the picker looks right now?

Option A is my preference. cc @Expensify/design for input.

Option A is my preference as well. Would it make sense to use our multi-select list pattern here instead of making what is usually a single-select list multi-select? Let me know if that doesn't make sense haha. Example of the multi-select list:

Yup, big time agree with Danny there that we should use the checkbox pattern we have.

src/types/form/SearchAdvancedFiltersForm.ts

melvin-bot · 2024-07-30T14:48:05Z

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

289Adam289 · 2024-07-30T14:50:09Z

@luacmartins hi! It's ready for review

luacmartins · 2024-07-30T16:49:45Z

@289Adam289 TS and performance checks are failing

src/libs/SearchUtils.ts

src/pages/Search/AdvancedSearchFilters.tsx

src/pages/Search/SearchFiltersCategoryPage.tsx

src/components/SelectionList/SelectableListItem.tsx

src/pages/Search/SearchFiltersCategoryPage.tsx

luacmartins

LGTM

luacmartins · 2024-07-31T15:06:13Z

All yours @ikevin127

ikevin127 · 2024-07-31T20:02:53Z

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

android.webm

Android: mWeb Chrome

android-mweb.webm

iOS: Native

ios.mp4

iOS: mWeb Safari

ios-mweb.mp4

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

ikevin127

Code and UI wise this is on point 🚀

The only thing that I found to be off with the functionality is that once applied e.g. the Car filter does not seem to change anything in the search Expenses list compared to before applying the filter.

For example the reviewer checklist Web video:

MacOS: Chrome / Safari

web.mov

@luacmartins @289Adam289 If this is expected for now, and will be fixed to actually work once all filter categories are implemented then we're good to go here 🟢, but if this is supposed to work differently than in the video shown above then I think it should be fixed here before merging.

dubielzyk-expensify · 2024-08-01T00:15:25Z

The only thing that I found to be off with the functionality is that once applied e.g. the Car filter does not seem to change anything in the search Expenses list compared to before applying the filter.
@luacmartins @289Adam289 If this is expected for now, and will be fixed to actually work once all filter categories are implemented then we're good to go here 🟢, but if this is supposed to work differently than in the video shown above then I think it should be fixed here before merging.

+1 to that, but otherwise from a visual perspective, this is looking good 👍

luacmartins · 2024-08-01T04:51:04Z

That is expected for now until this PR gets merged

luacmartins

LGTM!

OSBotify · 2024-08-01T05:06:40Z

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

OSBotify · 2024-08-02T01:42:14Z

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

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

OSBotify · 2024-08-06T04:02:25Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.16-8 🚀

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

shubham1206agra · 2024-10-08T09:29:55Z

src/pages/Search/AdvancedSearchFilters.tsx

@@ -36,6 +36,11 @@ function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fiel
        return dateValue;
    }

+    if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY && filters[fieldName]) {
+        const categories = filters[fieldName] ?? [];
+        return categories.join(', ');


You did not sort the categories before showing which caused #48496

Kicu and others added 6 commits July 24, 2024 12:08

Add displaying chosen date advanced filters value

0809a25

Update search filters type page

ef5190c

Finalize SearchFiltersTypePage with correct input UI

6e03029

Add status advanced filter for Search

d4c91c4

Improve styling of advanced search filters

b8c4643

Add category advanced filter for Search

5525339

289Adam289 changed the title ~~289 adam289/46038 advanced filters category~~ advanced filters category Jul 25, 2024

luacmartins self-requested a review July 25, 2024 14:30

Update policyID usage in category page search filters

0c944e0

Kicu suggested changes Jul 26, 2024

View reviewed changes

Apply review sugestions

5df9b97

luacmartins reviewed Jul 26, 2024

View reviewed changes

src/types/form/SearchAdvancedFiltersForm.ts Outdated Show resolved Hide resolved

Reduce useOnyx calls

e354d81

Kicu mentioned this pull request Jul 30, 2024

[$250] [Search v2.1] [App] Create Tag filter #46040

Closed

289Adam289 added 5 commits July 30, 2024 10:06

Improve catgeory filter UI

ee9da9f

Merge branch 'main' into 289Adam289/46038-advanced-filters-category

a35848c

Fix merge problems

a1cd0dd

Remove redundant styles

5550dc4

Enhance code maintainability and clarity

53c0802

289Adam289 marked this pull request as ready for review July 30, 2024 14:48

289Adam289 requested a review from a team as a code owner July 30, 2024 14:48

melvin-bot bot removed the request for review from a team July 30, 2024 14:48

melvin-bot bot requested a review from ikevin127 July 30, 2024 14:48

luacmartins requested changes Jul 30, 2024

View reviewed changes

Fix type error and review sugestions

ee320a8

luacmartins approved these changes Jul 31, 2024

View reviewed changes

ikevin127 approved these changes Jul 31, 2024

View reviewed changes

melvin-bot bot requested a review from luacmartins July 31, 2024 22:40

ikevin127 mentioned this pull request Jul 31, 2024

Create description, merchant and reportID filters #46477

Merged

48 tasks

luacmartins requested a review from Kicu August 1, 2024 04:54

luacmartins approved these changes Aug 1, 2024

View reviewed changes

luacmartins merged commit d69b203 into Expensify:main Aug 1, 2024
15 of 16 checks passed

github-actions bot mentioned this pull request Aug 2, 2024

Deploy Checklist: New Expensify 2024-08-02 #46687

Closed

50 tasks

melvin-bot bot mentioned this pull request Aug 6, 2024

[HOLD for payment 2024-08-13] [$250] [Search v2.1] [App] Create Category filter #46038

Closed

shubham1206agra reviewed Oct 8, 2024

View reviewed changes

shubham1206agra mentioned this pull request Oct 8, 2024

[HOLD for payment 2024-09-27][$125] [Search v2.1] - Selected categories are not arranged alphabetically in Category field #48496

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

advanced filters category #46197

advanced filters category #46197

289Adam289 commented Jul 25, 2024 •

edited

Loading

github-actions bot commented Jul 25, 2024 •

edited

Loading

289Adam289 commented Jul 26, 2024

Kicu left a comment

Kicu Jul 26, 2024

289Adam289 Jul 26, 2024

luacmartins Jul 26, 2024 •

edited

Loading

dannymcclain Jul 26, 2024

shawnborton Jul 29, 2024

melvin-bot bot commented Jul 30, 2024

289Adam289 commented Jul 30, 2024 •

edited

Loading

luacmartins commented Jul 30, 2024 •

edited

Loading

luacmartins left a comment

luacmartins commented Jul 31, 2024

ikevin127 commented Jul 31, 2024 •

edited

Loading

ikevin127 left a comment

dubielzyk-expensify commented Aug 1, 2024

luacmartins commented Aug 1, 2024

luacmartins left a comment

OSBotify commented Aug 1, 2024

OSBotify commented Aug 2, 2024

OSBotify commented Aug 6, 2024

shubham1206agra Oct 8, 2024

advanced filters category #46197

advanced filters category #46197

Conversation

289Adam289 commented Jul 25, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented Jul 25, 2024 • edited Loading

289Adam289 commented Jul 26, 2024

Kicu left a comment

Choose a reason for hiding this comment

Kicu Jul 26, 2024

Choose a reason for hiding this comment

289Adam289 Jul 26, 2024

Choose a reason for hiding this comment

luacmartins Jul 26, 2024 • edited Loading

Choose a reason for hiding this comment

dannymcclain Jul 26, 2024

Choose a reason for hiding this comment

shawnborton Jul 29, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Jul 30, 2024

289Adam289 commented Jul 30, 2024 • edited Loading

luacmartins commented Jul 30, 2024 • edited Loading

luacmartins left a comment

Choose a reason for hiding this comment

luacmartins commented Jul 31, 2024

ikevin127 commented Jul 31, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ikevin127 left a comment

Choose a reason for hiding this comment

dubielzyk-expensify commented Aug 1, 2024

luacmartins commented Aug 1, 2024

luacmartins left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 1, 2024

OSBotify commented Aug 2, 2024

OSBotify commented Aug 6, 2024

shubham1206agra Oct 8, 2024

Choose a reason for hiding this comment

289Adam289 commented Jul 25, 2024 •

edited

Loading

github-actions bot commented Jul 25, 2024 •

edited

Loading

luacmartins Jul 26, 2024 •

edited

Loading

289Adam289 commented Jul 30, 2024 •

edited

Loading

luacmartins commented Jul 30, 2024 •

edited

Loading

ikevin127 commented Jul 31, 2024 •

edited

Loading