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

Tags - Violation for unselected dependent tags displays tag name briefly then changes to "tag" #40741

Conversation

pac-guerreiro
Copy link
Contributor

@pac-guerreiro pac-guerreiro commented Apr 23, 2024

Details

Fixed Issues

$ #38095
PROPOSAL:

  • Determine tag violations for dependent multilevel tags on the client side, based one the data coming from the server. This is because the server data doesn't include the name of the tags that are missing, so we have to add them on the client side.

Tests

  1. Create a policy in old dot with multi level dependent tags. You can use this tags file dependent_tags.csv
  2. Click on Submit expense in a workspace you just created
  3. Select manual and enter any valid amount
  4. Fill the required fields while leaving the tag fields empty and create the expense
  5. Click on the preview of the expense you just created
  6. The tag fields that you didn't fill should display an error message - missing {tagName}, where tagName is the name of the tag field
  7. Wait a bit (1 min or so) until the app is refreshed with updated data from the server
  8. Confirm that the same error messages are showing, and not missing tag on every tag field
  9. Then, pick an option for a tag field that is missing and confirm that missing {tagName} is replaced by all tags required on every tag fields

Offline tests

Scenario A - Violations are shown correctly after synching with the server

  1. Do steps from 1 to 5
  2. Become online again, then do step 6
  3. Do the remaining steps

Scenario B - Violations are shown correctly while offline

  1. Do steps from 1 to 5
  2. Do step 8

QA Steps

Same as tests

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.-.Native.mp4
Android: mWeb Chrome
Android.-.Chrome.mp4
iOS: Native
iOS.-.Native.mp4
iOS: mWeb Safari
iOS.-.Safari.mp4
MacOS: Chrome / Safari
MacOS.-.Chrome.mp4
MacOS: Desktop
MacOS.-.Desktop.mp4

@cead22
Copy link
Contributor

cead22 commented Apr 23, 2024

I think we should update and move a few things, let me know what you think

  • Policy.ts
    • Add hasDependentTags = () => hasMultiLevelTagList && _.some(tagLists, (tagList) => _.some(tagList.tagListData.tags, (tag) => boolean(tag.rules?.parentTagsFilter? || tag.parentTagsFilter?)
      • rules is an object and parentTagsFilter is a string, both optional
  • MoneyRequestView
    • Update getErrorForField('tag', {tagListIndex: index, tagListName: name}) to getErrorForField('tag', policy.hasDependentTags ? {tagListIndex: index, tagListName: name, policyHasDependentTagLists: true} : {tagListIndex: index, tagListName: name})
  • useViolations
    • Shouldn't need new params
    • Similar to someTagLevelsRequired and tagOutOfPolicy, only one of the three -- including missingTag can happen at a time
    • Given that, we can add another check like currentViolations[0]?.data?.policyHasDependentTagLists? && currentViolations[0]?.name === 'missingTag' && currentViolations[0]?.data?.tagName == data?.tagListName with an early return like the ones we have for someTagLevelsRequired and tagOutOfPolicy
  • ViolationsUtils
    • We shouldn't need to export getTagViolationsForSingleLevelTags/getTagViolationsForMultiLevelTags
    • Update getTagViolationsForMultiLevelTags
      • We can pass a new bool param hasDependentTags -- which we'd need to pass to getViolationsOnyxData
      • if hasDependentTags is false, we run the current code in getTagViolationsForMultiLevelTags
        • Create getViolationsForDependentTags/getViolationsForIndependentTags if you think it's a good idea to split this functionality
      • Otherwise
        • If (!updatedTransaction.tag)
          • Iterate over the array of tagLists
            • Push {name: CONST.VIOLATIONS.MISSING_TAG, type: CONST.VIOLATION_TYPES.VIOLATION, data: {tagName: tagList.name}} to the newTransactionViolations
          • return newTransactionViolations

@pac-guerreiro
Copy link
Contributor Author

@cead22

I applied your suggestions locally and the correct data is being stored optimistically, but the API overwrites it 😞

Optimistic data:
Screenshot 2024-04-23 at 19 46 42

API data:
Screenshot 2024-04-23 at 19 47 03

This is why I used the same logic that we use to generate the optimistic violations after the data is fetched from the API

@cead22
Copy link
Contributor

cead22 commented Apr 23, 2024

Yeah, that also happens today with the existing violations, but so long as we display the correct violations, that's fine. If we want to refactor this, I think we should do it in a separate issue.

I think we'll need a separate issue to handle the allTagLevelsRequired violation case for dependent tags in getViolationsOnyxData, cause I didn't want to include it in my previous comment to avoid adding scope to this PR that isn't related to the linked issue

@pac-guerreiro
Copy link
Contributor Author

@cead22

They are displayed correctly until the API data overwrites the local data, thus causing the bug again 😅

I think this needs to be handled from the backend side!

@pac-guerreiro
Copy link
Contributor Author

@cead22

Just pushed the fix, let me know if there's anything else that needs polishing 😄

Copy link
Contributor

@cead22 cead22 left a comment

Choose a reason for hiding this comment

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

Code looks good. Let's add some tests too!

src/hooks/useViolations.ts Outdated Show resolved Hide resolved
src/hooks/useViolations.ts Outdated Show resolved Hide resolved
src/libs/PolicyUtils.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
src/libs/actions/IOU.ts Outdated Show resolved Hide resolved
src/types/onyx/PolicyTag.ts Show resolved Hide resolved
src/types/onyx/PolicyTag.ts Show resolved Hide resolved
src/types/onyx/TransactionViolation.ts Outdated Show resolved Hide resolved
@pac-guerreiro
Copy link
Contributor Author

@cead22

All feedback addressed and test case added! 😄

Copy link
Contributor

@cead22 cead22 left a comment

Choose a reason for hiding this comment

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

Code is looking good! Let's add manual tests

src/hooks/useViolations.ts Outdated Show resolved Hide resolved
src/hooks/useViolations.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
@cead22
Copy link
Contributor

cead22 commented May 3, 2024

@pac-guerreiro do you have an ETA for this PR?

@pac-guerreiro pac-guerreiro requested a review from cead22 May 3, 2024 18:22
@pac-guerreiro
Copy link
Contributor Author

@cead22

Feedback applied, added manual tests and filled PR author checklist.

Only things missing now are screen recordings 😄

@cead22
Copy link
Contributor

cead22 commented May 6, 2024

Ping me when ready for review :)

@pac-guerreiro
Copy link
Contributor Author

@cead22

Sorry for the delay, I was having problems building the app on android but after an intensive cleaning process I was able to 😅

All screen recordings added! Feel free to review and let me know when I can set this PR as ready for review 😄

@hoangzinh
Copy link
Contributor

  1. The tag fields that you didn't fill should display an error message - missing {tagName}, where tagName is the name of the tag field

@pac-guerreiro This step failed on my end when in offline mode.

src/components/ReportActionItem/MoneyRequestView.tsx Outdated Show resolved Hide resolved
src/components/ReportActionItem/MoneyRequestView.tsx Outdated Show resolved Hide resolved
src/hooks/useViolations.ts Show resolved Hide resolved
src/hooks/useViolations.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
@pac-guerreiro
Copy link
Contributor Author

@hoangzinh Strange, can you provide a screen recording while testing that step?

Here is a screen recording I took while doing the steps on my side:

Screen.Recording.2024-06-04.at.23.25.27.mp4

@hoangzinh
Copy link
Contributor

@pac-guerreiro sorry I couldn't reproduce that bug anymore.

@pac-guerreiro pac-guerreiro requested a review from cead22 June 5, 2024 12:35
Copy link
Contributor

@hoangzinh hoangzinh left a comment

Choose a reason for hiding this comment

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

LGTM. all yours @cead22

src/types/onyx/TransactionViolation.ts Outdated Show resolved Hide resolved
src/components/ReportActionItem/MoneyRequestView.tsx Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
let newTransactionViolations = [...transactionViolations];
newTransactionViolations = newTransactionViolations.filter(
Copy link
Contributor

Choose a reason for hiding this comment

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

Why was this removed? I think we should keep it so we're not adding SOME_TAG_LEVELS_REQUIRED to an array of violations that already has it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cead22 I removed it because we're already filtering those in the function that calls this one 😅

src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
@pac-guerreiro pac-guerreiro requested a review from cead22 June 7, 2024 15:49
@@ -79,8 +79,28 @@ function useViolations(violations: TransactionViolation[]) {
}));
}

// missingTag has special logic for policies with dependent tags, because only one violation is returned for all tags
// when no tags are present, so the tag name isn't set in the violation data. That's why we add it here
if (policyHasDependentTags && currentViolations[0]?.name === CONST.VIOLATIONS.MISSING_TAG && data?.tagListName) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a suggestion: currentViolations[0] is used several times so we can create a variable for this like firstViolation.

src/components/ReportActionItem/MoneyRequestView.tsx Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
src/libs/Violations/ViolationsUtils.ts Outdated Show resolved Hide resolved
@pac-guerreiro pac-guerreiro requested a review from cead22 June 7, 2024 17:14
Copy link
Contributor

@cead22 cead22 left a comment

Choose a reason for hiding this comment

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

@hoangzinh can you give it another quick review and test please? If everything looks good, I'll merge it

@hoangzinh
Copy link
Contributor

Looks good, tested again on Web & IOS

Screenshots/Videos

iOS: Native
Screen.Recording.2024-06-10.at.13.50.47.ios.mov
MacOS: Chrome / Safari
Screen.Recording.2024-06-10.at.13.29.30.web.mp4

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/cead22 in version: 1.4.82-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.82-4 🚀

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

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

Successfully merging this pull request may close these issues.

6 participants