[CP Staging]Always sorting tags by orderWeight #37681

rlinoz · 2024-03-04T15:19:19Z

Details

Fixed Issues

$ #37658
PROPOSAL:

Tests

Preconditions:
In OldDot under admin, create a Collect group policy

Enable tags and multiple level of tags under Settings -> Workspace -> Tags
Upload dependent tags to the policy - File can be found here https://drive.google.com/file/d/1MZ2-8EC7z632cvpZHXch0MHXZMpFgYWS/view?usp=drive_link
Run the following script:

p = Policy.getCurrent();
p.policy.isPolicyExpenseChatEnabled = "true";
p.save();

Add an employee to the policy.

Multi level test

Open NewDot
Log in to the employee's account
Tap on the green plus button (FAB)
Select Request money
Select any currency and amount
Click next
Choose a group policy room
Click on "Show more"
Enter all required fields
Complete the IOU request
Navigate to the details of the created IOU
Click on the Region or State field
Verify that Region is showing only the correct options
Verify that State is showing only the correct options

Single tag test

Open OldDot as the admin
Disable multiple level tags
Add some tags
Open NewDot with the employee
Create a NewMoney request with a tag
Navigate to the details of the IOU
Verify that the tag is correct
Click on the Tag
Verify that you can modify the tag and the options available are correct

Verify that no errors appear in the JS console

Offline tests

QA Steps

Preconditions:
In OldDot under admin, create a Collect group policy

Enable tags and multiple level of tags under Settings -> Workspace -> Tags
Upload dependent tags to the policy - File can be found here https://drive.google.com/file/d/1MZ2-8EC7z632cvpZHXch0MHXZMpFgYWS/view?usp=drive_link
Run the following script:

p = Policy.getCurrent();
p.policy.isPolicyExpenseChatEnabled = "true";
p.save();

Add an employee to the policy.

Multi level test

Open NewDot
Log in to the employee's account
Tap on the green plus button (FAB)
Select Request money
Select any currency and amount
Click next
Choose a group policy room
Click on "Show more"
Enter all required fields
Complete the IOU request
Navigate to the details of the created IOU
Click on the Region or State field
Verify that Region is showing only the correct options
Verify that State is showing only the correct options

Single tag test

Open OldDot as the admin
Disable multiple level tags
Add some tags
Open NewDot with the employee
Create a NewMoney request with a tag
Navigate to the details of the IOU
Verify that the tag is correct
Click on the Tag
Verify that you can modify the tag and the options available are correct

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Uploading Screen Recording 2024-03-04 at 12.54.15.mov…

MacOS: Desktop

melvin-bot · 2024-03-04T15:36:22Z

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

getusha · 2024-03-04T15:56: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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

Screen.Recording.2024-03-04.at.8.03.15.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-03-04.at.7.40.51.PM.mov

iOS: Native

Screen.Recording.2024-03-04.at.8.07.03.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-03-04.at.7.23.07.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-04.at.7.14.18.PM.mov

MacOS: Desktop

Screen.Recording.2024-03-04.at.8.11.52.PM.mov

getusha · 2024-03-04T17:16:51Z

@rlinoz options switch places after selection, is this intentional i don't see this behavior other places.

Screen.Recording.2024-03-04.at.8.15.48.PM.mov

rlinoz · 2024-03-04T17:47:04Z

I believe it is intentional as it has the same behavior when selecting categories.

If you have enough tags/categories there will a recents section, and the selected one will be on top, so I think that is where this comes from.

Also, if you have less categories it will behave the same way.

getusha

Looks good works well.

melvin-bot · 2024-03-04T18:10:02Z

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

melvin-bot · 2024-03-04T18:10:46Z

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

getusha · 2024-03-04T18:12:51Z

@grgia @cristipaval already completed the checklist #37681 (comment) not sure what melvin wants 😕

rlinoz · 2024-03-04T18:19:48Z

Melvin had a rough weekend I think 😂

OSBotify · 2024-03-04T18:27:15Z

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

Always sorting tags by orderWeight (cherry picked from commit 4d4eaad)

OSBotify · 2024-03-04T18:51:22Z

🚀 Cherry-picked to staging by https://github.com/roryabraham in version: 1.4.46-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-03-04T20:26:18Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.4.46-2 🚀

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

ntdiary · 2024-05-15T12:17:24Z

src/libs/PolicyUtils.ts

-    return Object.values(policyTagList).filter((policyTagListValue) => policyTagListValue !== null);
+    return Object.values(policyTagList)
+        .filter((policyTagListValue) => policyTagListValue !== null)
+        .sort((tagA, tagB) => tagA.orderWeight - tagB.orderWeight);


Coming from #37783.
The index produced by orderWeight here may be inconsistent with the index produced by Object.keys in getTagListName. Therefore, we have also changed the latter to orderWeight. :)

always sort tags by orderWeight

761d0c6

rlinoz self-assigned this Mar 4, 2024

prettier

49582a5

rlinoz marked this pull request as ready for review March 4, 2024 15:36

rlinoz requested a review from a team as a code owner March 4, 2024 15:36

melvin-bot bot requested review from getusha and removed request for a team March 4, 2024 15:36

rlinoz requested review from allroundexperts and getusha and removed request for getusha and allroundexperts March 4, 2024 15:52

roryabraham mentioned this pull request Mar 4, 2024

Deploy Checklist: New Expensify 2024-02-29 #37578

Closed

36 tasks

getusha approved these changes Mar 4, 2024

View reviewed changes

melvin-bot bot requested a review from cristipaval March 4, 2024 18:10

getusha approved these changes Mar 4, 2024

View reviewed changes

melvin-bot bot requested a review from grgia March 4, 2024 18:10

roryabraham approved these changes Mar 4, 2024

View reviewed changes

roryabraham merged commit 4d4eaad into main Mar 4, 2024
17 of 18 checks passed

roryabraham deleted the rodrigo-fix-multilevel-tag-list branch March 4, 2024 18:21

rlinoz changed the title ~~Always sorting tags by orderWeight~~ [CP Staging]Always sorting tags by orderWeight Mar 4, 2024

OSBotify pushed a commit that referenced this pull request Mar 4, 2024

Merge pull request #37681 from Expensify/rodrigo-fix-multilevel-tag-list

40d9cbd

Always sorting tags by orderWeight (cherry picked from commit 4d4eaad)

melvin-bot bot mentioned this pull request Mar 4, 2024

[HOLD for payment 2024-03-13] [HOLD for payment 2024-03-11] IOU - Multilevel Tags Dependent are not displayed correctly in the created IOU #37658

Closed

6 tasks

ntdiary reviewed May 15, 2024

View reviewed changes

ntdiary mentioned this pull request May 15, 2024

[Pay when ntdiary is setup for NewDot payments][$500] Multilevel tag - Tag name in RHP is not the same as the tag being clicked on #37783

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging]Always sorting tags by orderWeight #37681

[CP Staging]Always sorting tags by orderWeight #37681

rlinoz commented Mar 4, 2024 •

edited

Loading

melvin-bot bot commented Mar 4, 2024

getusha commented Mar 4, 2024 •

edited

Loading

getusha commented Mar 4, 2024

rlinoz commented Mar 4, 2024

getusha left a comment

melvin-bot bot commented Mar 4, 2024

melvin-bot bot commented Mar 4, 2024

getusha commented Mar 4, 2024

rlinoz commented Mar 4, 2024

OSBotify commented Mar 4, 2024

OSBotify commented Mar 4, 2024

OSBotify commented Mar 4, 2024

ntdiary May 15, 2024

[CP Staging]Always sorting tags by orderWeight #37681

[CP Staging]Always sorting tags by orderWeight #37681

Conversation

rlinoz commented Mar 4, 2024 • edited Loading

Details

Fixed Issues

Tests

Multi level test

Single tag test

Offline tests

QA Steps

Multi level test

Single tag test

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 4, 2024

getusha commented Mar 4, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

getusha commented Mar 4, 2024

rlinoz commented Mar 4, 2024

getusha left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Mar 4, 2024

melvin-bot bot commented Mar 4, 2024

getusha commented Mar 4, 2024

rlinoz commented Mar 4, 2024

OSBotify commented Mar 4, 2024

OSBotify commented Mar 4, 2024

OSBotify commented Mar 4, 2024

ntdiary May 15, 2024

Choose a reason for hiding this comment

rlinoz commented Mar 4, 2024 •

edited

Loading

getusha commented Mar 4, 2024 •

edited

Loading