Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvement: Search Feature for help expensify #24299

Conversation

studentofcoding
Copy link
Contributor

@studentofcoding studentofcoding commented Aug 8, 2023

As per the last discussion with @marcochavezf here we are using XML Configuration to handle the Search Feature

  • Make related components & add gse script
  • Configure CSP for each inline script
  • Styling related components
  • Add relevant setup (Annotations, & Context)

Additional context:

  • The initial state of https://help.expensify.com/ is having errors on CSP. This PR handles that also.
  • There's an unrelated error from Google inline script that is related to ads async-ads.js. It's not affected the functionality & already hides the ads anyway.

Details

Fixed Issues

$ #23978
PROPOSAL: #23978 (comment)

Tests

  1. Open https://help.expensify.com/
  2. Click Search Icon to open the Search sidebar
  3. On the Opened Search Sidebar Type the query you want to find & Press "Enter" or Click Magnifying glass icon
  4. If there are results, They'll be shown on the list below it.
  5. If there aren't, It'll show Upps no results found, Please try again....
  6. To Clear the result click the X button on the search input.
  7. To Close the Search sidebar, click the X button on the right side top of the Sidebar
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Open https://help.expensify.com/
  2. Click Search Icon to open the Search sidebar
  3. On the Opened Search Sidebar Type the query you want to find & Press "Enter" or Click Magnifying glass icon
  4. If there are results, They'll be shown on the list below it.
  5. If there aren't, It'll show Upps no results found, Please try again....
  6. To Clear the result click the X button on the search input.
  7. To Close the Search sidebar, click the X button on the right side top of the Sidebar
  • 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 / Chrome
    • iOS / native
    • iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web Screenshot 2023-08-11 at 05 07 42

https://www.loom.com/share/892b56bba57f463a8c839a2b9a712ee5?sid=d2dfe9d4-35f8-4c67-935d-aaaccb6a4f51

Mobile Web - Chrome
mobile_chrome.mp4
Mobile Web - Safari
mobile_safari.mp4
Desktop
iOS
Android

- Make related components
- Configure CSP for each inline script
- Styling related components
- Add relevant setup (Annotations, & Context)
@studentofcoding studentofcoding requested a review from a team as a code owner August 8, 2023 21:02
@melvin-bot melvin-bot bot requested review from eVoloshchak and removed request for a team August 8, 2023 21:02
@melvin-bot
Copy link

melvin-bot bot commented Aug 8, 2023

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

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

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

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

CLA Assistant Lite bot:
Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.


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


You can retrigger this bot by commenting recheck in this Pull Request

@studentofcoding
Copy link
Contributor Author

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

@studentofcoding
Copy link
Contributor Author

recheck

@studentofcoding
Copy link
Contributor Author

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

@marcochavezf
Copy link
Contributor

@eVoloshchak, let me know if you have bandwidth to review it soon. I can jump into the review tomorrow

@marcochavezf
Copy link
Contributor

@studentofcoding thank you for raising the PR! Just one more thing, can you upload videos (instead of screenshots) of the search functionality in the screenshots/videos section? It would be required for design review since it involves different UI changes

@studentofcoding
Copy link
Contributor Author

@studentofcoding thank you for raising the PR! Just one more thing, can you upload videos (instead of screenshots) of the search functionality in the screenshots/videos section? It would be required for design review since it involves different UI changes

The videos are added @marcochavezf, thanks!

Copy link
Contributor

@marcochavezf marcochavezf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! I just left a few comments to change a few minor things, but everything looks good so far 🚀

docs/_includes/search-toggle.html Outdated Show resolved Hide resolved
docs/_includes/sidebar-search.html Outdated Show resolved Hide resolved
docs/_includes/search-toggle.html Outdated Show resolved Hide resolved
docs/_includes/sidebar-search.html Outdated Show resolved Hide resolved
docs/annotations.xml Outdated Show resolved Hide resolved
docs/assets/js/main.js Show resolved Hide resolved
docs/assets/js/main.js Outdated Show resolved Hide resolved
docs/assets/js/main.js Outdated Show resolved Hide resolved
docs/assets/js/main.js Show resolved Hide resolved
docs/context.xml Outdated Show resolved Hide resolved
@studentofcoding
Copy link
Contributor Author

All resolved @marcochavezf

@shawnborton
Copy link
Contributor

A couple of comments:

It looks like all of the content is cut off at the bottom.

Can you double check that the correct font is being applied to the smaller text under the links?

For the search button, we should just use our standard green button styles here. Same for the text input, can we make sure this matches what we have on NewDot?

@studentofcoding
Copy link
Contributor Author

It looks like all of the content is cut off at the bottom.

Can you double check that the correct font is being applied to the smaller text under the links?

For the search button, we should just use our standard green button styles here. Same for the text input, can we make sure this matches what we have on NewDot?

Done it all @shawnborton, here are the vercel staging for references https://xml-docs.vercel.app

cc : @marcochavezf

@shawnborton
Copy link
Contributor

Are the screenshots updated?

@marcochavezf
Copy link
Contributor

marcochavezf commented Aug 11, 2023

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 / Chrome
    • iOS / native
    • iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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(themeColors.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 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

Web Screenshot 2023-08-11 at 13 27 16
Mobile Web - Chrome Screenshot 2023-08-11 at 13 28 50
Mobile Web - Safari Screenshot 2023-08-11 at 13 28 18
Desktop
iOS
Android

@marcochavezf marcochavezf removed the request for review from eVoloshchak August 11, 2023 19:29
marcochavezf
marcochavezf previously approved these changes Aug 11, 2023
Copy link
Contributor

@marcochavezf marcochavezf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you @studentofcoding!

@studentofcoding
Copy link
Contributor Author

LGTM, thank you @studentofcoding!

Can you approve it again? There is lint error before and it's fix now @marcochavezf Thanks!

@studentofcoding
Copy link
Contributor Author

Hmm the Jest and perf checks already taking 15 mins ++ while I only running lint fix npm run prettier

Do I need to do anything @marcochavezf ?

@marcochavezf
Copy link
Contributor

Hmm the Jest and perf checks already taking 15 mins ++ while I only running lint fix npm run prettier

Do I need to do anything @marcochavezf ?

We'd just need to wait for the checks to pass

@studentofcoding
Copy link
Contributor Author

studentofcoding commented Aug 11, 2023

Finally the check is done.

If you still have time, Please kindly approve @marcochavezf 🙏🏻

Thanks

@marcochavezf marcochavezf merged commit 60c4d1d into Expensify:main Aug 11, 2023
13 checks passed
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.3.54-0 🚀

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

1 similar comment
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.3.54-0 🚀

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

@johncschuster
Copy link
Contributor

Hey folks! I've noticed a few things that might have missed QA (or didn't explicitly get considered as "wrong")

Body text color is dark, but it should be bright to match the body text of the rest of the help site

When you misspell a word and get a suggested replacement, the color of the text that says, "Did you mean:" is dark (almost black), but shouldn't be. It should match the text color of the light body text of the rest of the help site.

Keep in mind, we should make sure that the text color will change when we give users the option to switch between dark mode and light mode.

2023-08-15_12-53-12

Background color of the pagination is bright. It does not match the background color of the rest of the helpsite.

Keep in mind, we should make sure that the background color of the pagination will change when we give users the option to switch between dark mode and light mode.

2023-08-15_12-50-10

CC @shawnborton

@marcochavezf
Copy link
Contributor

Hi @studentofcoding, while reviewing the new implementation, we noticed a few minor visual aspects (posted above by @johncschuster) that might need some attention. Can you create a follow-up PR to address those?

@studentofcoding
Copy link
Contributor Author

Hi, @marcochavezf sure thing!, Where do I need to connect the branch from, as I checked it's not on main yet. Do I need to connect it based on this PR branch?

And just a follow-up on this requirement Keep in mind, we should make sure that the text color will change when we give users the option to switch between dark mode and light mode.. As this is not based on the issue request, Will it extend the scope, or it's just a note and we can use the same variable color for now?

Thanks

@johncschuster

@marcochavezf
Copy link
Contributor

Thanks @studentofcoding

Where do I need to connect the branch from, as I checked it's not on main yet. Do I need to connect it based on this PR branch?

It should be on main, for example here is the new context file.

And just a follow-up on this requirement Keep in mind, we should make sure that the text color will change when we give users the option to switch between dark mode and light mode.. As this is not based on the issue request, Will it extend the scope, or it's just a note and we can use the same variable color for now?

Yup, we'd just need to keep the color values in variables as we did in the original PR. This will help us to switch the colors when the light mode is implemented.

@studentofcoding
Copy link
Contributor Author

Noted @marcochavezf

Also, guys, I have a small suggestion on the Pagination color text, how if we use the same color of green or blue (link) to the active page, so it'll pop up and is recognized by the user

  • Default
Screenshot 2023-08-16 at 02 09 21
  • Green
Screenshot 2023-08-16 at 02 07 39
  • Blue
Screenshot 2023-08-16 at 02 07 13

cc: @shawnborton

@shawnborton
Copy link
Contributor

For pagination, can we use our standard button styles for these?

Also, it looks like the paragraph text below the blue link is not using the correct font - sorry for not catching that sooner!

@studentofcoding
Copy link
Contributor Author

Noted @shawnborton, like this?

Screenshot 2023-08-16 at 02 16 11

@shawnborton
Copy link
Contributor

Yup, much better for the text.

@studentofcoding
Copy link
Contributor Author

PR opened : #24598

@marcochavezf @johncschuster @shawnborton

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.54-13 🚀

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

background-color: $color-appBG;
border: $color-appBG;
font-family: "ExpensifyNeue", "Helvetica Neue", "Helvetica", Arial, sans-serif !important;
max-height: 80vh;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fixed max-height may cause the content to not fully display on mobile devices. We replaced it to flex layout in PR #27619. : )

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants