Make sort tag consistent with oldDot #38949

wildan-m · 2024-03-25T17:05:02Z

@situchan @madmax330

Details

The PR will ensure tags sorted consistently between newDot and oldDot (ascending)

Fixed Issues

$ #33650
PROPOSAL: #33650 (comment)

Tests

Preconditions:

Add the employee account to the collection policy
Navigate to the workspace tag settings
Enable the tag
Upload the following tag list CSV. Only upload one file per test:
tag-case-1.csv
test-case-2.csv
test-case-3.csv
Be sure to select that the first row includes headers and to select Name on the mapping

Tip

Before moving on to the next text file, rather than deleting each tag manually, we can clean all tags by toggling the 'Use multiple levels of tags' option on and off.

Important

When switching test files on mobile, the tags might not be reloaded if we stay at tag list, do two steps back/recreate the money request to ensure the tag list is updated.

Steps:

Log in as the employee account in NewDot
Navigate to the workspace chat of the collect policy
Start a Manual IOU request on the workspace chat
Enter an amount and continue
Click on "Show More"
Click on the tag field
Verify the order of of tags between oldDot and newDot consistent for all cases.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-03-25.at.23.17.16.mp4

Android: mWeb Chrome

Screen.Recording.2024-03-25.at.23.24.07.mp4

iOS: Native

Screen.Recording.2024-03-25.at.22.33.27.mp4

iOS: mWeb Safari

Screen.Recording.2024-03-25.at.22.50.41.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-03-25.at.22.10.32.mp4

MacOS: Desktop

Screen.Recording.2024-03-25.at.23.00.35.mp4

…x/33650-implement-sortBy-tag

melvin-bot · 2024-03-25T17:05:08Z

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

…x/33650-implement-sortBy-tag

situchan · 2024-03-25T17:11:48Z

src/pages/workspace/tags/WorkspaceTagsPage.tsx

-                                            fill={theme.icon}
-                                        />
-                                    </View>
+                    lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => ({


Why not re-use OptionsListUtils.sortTags?

@situchan they have different types; one is Tag and the other one is PolicyTag

…x/33650-implement-sortBy-tag

situchan · 2024-03-26T11:52:27Z

src/pages/workspace/tags/WorkspaceTagsPage.tsx

-                    Object.values(policyTagList.tags || [])
-                        .sort((a, b) => localeCompare(a.name, b.name))
+                    lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare)
+                        .filter((value): value is OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag> => typeof value === 'object' && value !== null)


NAB: I don't see this pattern throughout the app. No other way?

I've resolved new conflict and replaced the pattern as well:

.map((policyTagList) => lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => { const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;

situchan · 2024-03-26T12:05:30Z

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

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

…x/33650-implement-sortBy-tag

melvin-bot · 2024-03-28T11:41:04Z

@madmax330 looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

madmax330 · 2024-03-28T11:42:42Z

Tests were passing

OSBotify · 2024-03-28T11:47:09Z

✋ 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-03-29T02:27:56Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 1.4.58-0 🚀

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

OSBotify · 2024-04-02T11:04:12Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.58-8 🚀

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

wildan-m added 6 commits March 23, 2024 12:59

Implement underscore's sort for tag, ensure consistent with oldDot

cf7a891

Include localeCompare

3265380

fix sort tags, remove localCompate

8a3ea16

Add unit test of sortTags

4f910e8

adjust test case

4578af6

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

a9763a5

…x/33650-implement-sortBy-tag

wildan-m requested a review from a team as a code owner March 25, 2024 17:05

melvin-bot bot requested review from situchan and removed request for a team March 25, 2024 17:05

wildan-m mentioned this pull request Mar 25, 2024

[HOLD for payment 2024-04-09] [$500] [MEDIUM] Tag - The list of tags consisting of numbers is not ordered in ascending order. #33650

Closed

6 tasks

wildan-m added 2 commits March 26, 2024 00:07

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

a8af8e8

…x/33650-implement-sortBy-tag

run prettier

448f6b4

situchan reviewed Mar 25, 2024

View reviewed changes

wildan-m added 4 commits March 26, 2024 00:54

fix policytag type guard

8e017ba

Handle weird ts error in github action

872e99b

fix typecheck error

12b1050

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

8f82d7f

…x/33650-implement-sortBy-tag

situchan reviewed Mar 26, 2024

View reviewed changes

situchan approved these changes Mar 26, 2024

View reviewed changes

melvin-bot bot requested a review from madmax330 March 26, 2024 12:11

wildan-m added 2 commits March 27, 2024 07:38

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

c54dc0b

…x/33650-implement-sortBy-tag

change typescript type pattern

c870552

madmax330 approved these changes Mar 28, 2024

View reviewed changes

madmax330 merged commit 469b112 into Expensify:main Mar 28, 2024
16 checks passed

melvin-bot bot added the Emergency label Mar 28, 2024

madmax330 removed the Emergency label Mar 28, 2024

github-actions bot mentioned this pull request Mar 29, 2024

Deploy Checklist: New Expensify 2024-03-29 #39222

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make sort tag consistent with oldDot #38949

Make sort tag consistent with oldDot #38949

wildan-m commented Mar 25, 2024

melvin-bot bot commented Mar 25, 2024

situchan Mar 25, 2024

wildan-m Mar 25, 2024

situchan Mar 26, 2024 •

edited

Loading

wildan-m Mar 27, 2024

situchan commented Mar 26, 2024

melvin-bot bot commented Mar 28, 2024

madmax330 commented Mar 28, 2024

OSBotify commented Mar 28, 2024

OSBotify commented Mar 29, 2024

OSBotify commented Apr 2, 2024

Make sort tag consistent with oldDot #38949

Make sort tag consistent with oldDot #38949

Conversation

wildan-m commented Mar 25, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 25, 2024

situchan Mar 25, 2024

Choose a reason for hiding this comment

wildan-m Mar 25, 2024

Choose a reason for hiding this comment

situchan Mar 26, 2024 • edited Loading

Choose a reason for hiding this comment

wildan-m Mar 27, 2024

Choose a reason for hiding this comment

situchan commented Mar 26, 2024

Reviewer Checklist

Screenshots/Videos

melvin-bot bot commented Mar 28, 2024

madmax330 commented Mar 28, 2024

OSBotify commented Mar 28, 2024

OSBotify commented Mar 29, 2024

OSBotify commented Apr 2, 2024

situchan Mar 26, 2024 •

edited

Loading