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

Fix/37847 - Show the tags in the first policyTagLists #38759

Merged
merged 49 commits into from
Apr 17, 2024

Conversation

Tony-MK
Copy link
Contributor

@Tony-MK Tony-MK commented Mar 21, 2024

Details

Fixed Issues

$ #37847
$ #38683
PROPOSAL: #37847 (comment)

Tests

Prerequisite

On Old Dot, enable multiple levels of tags. Then create a CSV of tags so that:

It includes multiple levels of tags
In the first tag list (or first level of tags), add a special tag name that has the pattern "Parent: Child"

and import that CSV

  1. Go to Collect Workspace.
  2. Tap the Tags on the menu.
  3. Verify it only displays tag names of the first tag list
  4. Verify it displays as "Parent: Child" for the special tag name above
  5. Tap on that special tag name to open the Tag Settings page
  6. Verify it displays as "Parent: Child"
  7. Click to edit tag name
  8. Verify it displays as "Parent: Child"
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Go to Collect Workspace.
  2. Tap the Tags on the menu.
  3. Verify it only displays tag names of the first tag list
  4. Verify it displays as "Parent: Child" for the special tag name above
  5. Tap on that special tag name to open the Tag Settings page
  6. Verify it displays as "Parent: Child"
  7. Click to edit tag name
  8. Verify it displays as "Parent: Child"
  • 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 - Native

Android: mWeb Chrome

Android - mWeb

iOS: Native

ios - Native

iOS: mWeb Safari

ios - mWeb

MacOS: Chrome / Safari
macOS.-.Chrome.mov
MacOS: Desktop
Screen.Recording.2024-04-16.at.06.24.28.mov

@Tony-MK Tony-MK requested a review from a team as a code owner March 21, 2024 18:17
@melvin-bot melvin-bot bot removed the request for review from a team March 21, 2024 18:17
Copy link

melvin-bot bot commented Mar 21, 2024

@allroundexperts 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
luacmartins previously approved these changes Mar 22, 2024
@allroundexperts
Copy link
Contributor

@Tony-MK Can you please add test steps?

@allroundexperts
Copy link
Contributor

@Tony-MK I can still see different tag lists being displayed even after this change.

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Mar 24, 2024

@Tony-MK I can still see different tag lists being displayed even after this change.

Could you show me a screenshot?

@luacmartins
Copy link
Contributor

@Tony-MK @allroundexperts any updates here?

@luacmartins
Copy link
Contributor

Added #38683 to the list of fixed issues here

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Mar 25, 2024

@Tony-MK I can still see different tag lists being displayed even after this change.

Could you show me a screenshot?

@allroundexperts, Could you show me an example of this happening?

I tried checking again but it worked fine.

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Mar 25, 2024

@Tony-MK @allroundexperts any updates here?

Waiting for @allroundexperts response's.

@allroundexperts
Copy link
Contributor

{
    "Region": {
        "name": "Region",
        "orderWeight": 1,
        "tags": {
            "North+test": {
                "enabled": true,
                "name": "North+test"
            },
            "South": {
                "enabled": true,
                "name": "South"
            }
        }
    },
    "State": {
        "name": "State",
        "orderWeight": 0,
        "required": true,
        "tags": {
            "California": {
                "enabled": true,
                "name": "California"
            },
            "North+test": {
                "enabled": false,
                "name": "North+test"
            }
        }
    }
}
Screenshot 2024-03-26 at 5 22 13 PM

@Tony-MK As you can see from the data stored in onyx, we want to show only one of the Taglist. Currently, we do not support multi tag lists.

@luacmartins
Copy link
Contributor

@Tony-MK did the comment above help?

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Mar 26, 2024

@Tony-MK As you can see from the data stored in onyx, we want to show only one of the Taglist. Currently, we do not support multi tag lists.

Hey @luacmartins and @allroundexperts,

According to the bug description, #37847 (comment) and #37847 (comment), I think we are supposed to hide the Parent: Child tags and display the root level for now.

Right?

@hoangzinh
Copy link
Contributor

@luacmartins are you on the latest commit of this PR? I can see it only displays the tag list with orderWeight = 0
Screenshot 2024-04-15 at 23 57 29

@hoangzinh
Copy link
Contributor

@Tony-MK The edit page still displays incorrectly for Parent: Child

Screenshot 2024-04-15 at 23 58 42

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Apr 16, 2024

The PR is ready for review.

@hoangzinh
Copy link
Contributor

@Tony-MK have you tested this comment #38759 (comment)

luacmartins
luacmartins previously approved these changes Apr 16, 2024
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

LGTM and tested well

@luacmartins
Copy link
Contributor

All yours @hoangzinh

@trjExpensify
Copy link
Contributor

Ruh-roh, conflicts again @Tony-MK! 😅

@hoangzinh
Copy link
Contributor

@Tony-MK Beside that, could you take a look at my comment here #38759 (comment)? I think it's the last thing we need to resolve in this PR.

@hoangzinh
Copy link
Contributor

hoangzinh commented Apr 16, 2024

Oh the test steps look incorrect:

Screenshot 2024-04-17 at 02 46 56

Verify the :/ string is present.

Is it a bug that we're trying to fix in this PR?


I think it should be something like:

On Old Dot, enable multiple levels of tags. Then create a CSV of tags so that:

  • It includes multiple levels of tags
  • In the first tag list (or first level of tags), add a special tag name that has the pattern "Parent: Child"

and import that CSV

  1. Go to Collect Workspace.
  2. Tap the Tags on the menu.
  3. Verify it only displays tag names of the first tag list
  4. Verify it displays as "Parent: Child" for the special tag name above
  5. Tap on that special tag name to open the Tag Settings page
  6. Verify it displays as "Parent: Child"
  7. Click to edit tag name
  8. Verify it displays as "Parent: Child"

@trjExpensify
Copy link
Contributor

@Tony-MK can you address that comment and the conflicts, so we can get this one merged? Thanks!

@Tony-MK
Copy link
Contributor Author

Tony-MK commented Apr 17, 2024

I resolved the comments and conflicts.

@hoangzinh
Copy link
Contributor

@luacmartins
Copy link
Contributor

@hoangzinh I think it's fine to keep that for now. Are you available to complete review?

@hoangzinh
Copy link
Contributor

Sure, doing now

@melvin-bot melvin-bot bot requested a review from luacmartins April 17, 2024 16:08
@Expensify Expensify deleted a comment from allroundexperts Apr 17, 2024
@luacmartins luacmartins merged commit 7a30485 into Expensify:main Apr 17, 2024
16 of 20 checks passed
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.63-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.63-21 🚀

platform result
🤖 android 🤖 success ✅
🖥 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