#26793: Edit a tag in a money request #27950

BeeMargarida · 2023-09-21T14:20:53Z

Details

Adds support for editing a tag on a money request.

Note: There's no backend support yet for editing a tag or the recently used tags. This requires permissions for tags, mock data setup (see setup below) and the editing won't be saved, just using optimistic data.

Mock data

Go to a workspace page
Copy the workspace/policyID in the URL
In AuthScreens add the following code to the componentDidMount:

Onyx.set('policyTags_<POLICY ID>', {
    Department: {
        name: "Department",
        tags: {
            Accounting: {name: 'Accounting', enabled: true},
            Engineering: {name: 'Engineering', enabled: true},
            HR: {name: 'HR', enabled: true},
            Marketing: {name: 'Marketing', enabled: true},
        }
    }
});
Onyx.set('policyRecentlyUsedTags_<POLICY ID>', {
    "Department": []
});

Fixed Issues

$ #26793

Tests

These tests have prerequisites:

Have the newDotTags beta
Have tags on the policy used to test

Create a money request or use on previously created
Open the money request
Check that you can see the tag there (should contain the tag name, ex: Department)
Click on the tag entry
Should see a picker for tags, pick a new one
Should navigate back and see the new tag value, as well as a message of update below

Create a money request or use on previously created
Open the money request
Check that you can see the tag there (should contain the tag name, ex: Department)
Click on the tag entry
Click on the already selected tag
Should navigate back and see an empty tag field, and an update message of deselect
Click on the tag entry again
Click on a tag
Should navigate back and see the updated tag field, and an update message of select

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

These tests have prerequisites:

Have the newDotTags beta
Have tags on the policy used to test

Create a money request or use on previously created
Open the money request
Check that you can see the tag there (should contain the tag name, ex: Department)
Click on the tag entry
Should see a picker for tags, pick a new one
Should navigate back and see the new tag value, as well as a message of update below

Create a money request or use on previously created
Open the money request
Check that you can see the tag there (should contain the tag name, ex: Department)
Click on the tag entry
Click on the already selected tag
Should navigate back and see an empty tag field, and an update message of deselect
Click on the tag entry again
Click on a tag
Should navigate back and see the updated tag field, and an update message of select

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

ws_t.mp4

w_t.mp4

Mobile Web - Chrome

mc_t.mp4

Mobile Web - Safari

ms_t.mp4

Desktop

desk_t.mp4

iOS

ios_t.mp4

Android

android_t.mp4

rezkiy37

Left a few comments. In general LGTM.

src/components/ReportActionItem/MoneyRequestView.js

src/libs/PolicyUtils.js

src/libs/TransactionUtils.js

src/pages/EditRequestPage.js

melvin-bot · 2023-09-21T20:10:25Z

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

jjcoffee · 2023-09-22T11:20:44Z

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

chrome-desktop-2023-09-22_15.01.48.mp4

Mobile Web - Chrome

android-chrome.mp4

Mobile Web - Safari

ios-safari-2023-09-22_15.46.46.mp4

Desktop

mac-desktop-2023-09-22_16.01.18.mp4

iOS

ios-native-2023-09-22_15.50.17.mp4

Android

android-native.mp4

jjcoffee · 2023-09-22T14:19:21Z

Tests well, I'm only seeing a small issue so far on mWeb where after refreshing on the edit tag page (or accessing via deeplink) and then selecting a tag, the app navigates back to the home screen (the tag does get set though!):

android-chrome-deeplink.mp4

jjcoffee · 2023-09-22T16:01:25Z

No other issues have come up in testing and code LGTM so happy for this to be merged without me once the above is addressed!

amyevans

Looking super solid! Just a few minor comments

src/components/ReportActionItem/MoneyRequestView.js

src/libs/PolicyUtils.js

src/libs/ReportUtils.js

amyevans · 2023-09-25T07:14:27Z

Oh and one more thing - let's update the QA steps to indicate there are pre-reqs (be on the newDotTags beta and have tags on your policy)

BeeMargarida · 2023-09-25T08:53:09Z

Tests well, I'm only seeing a small issue so far on mWeb where after refreshing on the edit tag page (or accessing via deeplink) and then selecting a tag, the app navigates back to the home screen (the tag does get set though!):

Checking this now

BeeMargarida · 2023-09-25T09:44:56Z

Tests well, I'm only seeing a small issue so far on mWeb where after refreshing on the edit tag page (or accessing via deeplink) and then selecting a tag, the app navigates back to the home screen (the tag does get set though!):

Fixed 👍 This bug was also present in the categories, so now it should be fixed in both places.
@amyevans Ready for another review!

amyevans

Nice! 🚀

OSBotify · 2023-09-25T10:02:26Z

✋ 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 · 2023-09-28T19:21:03Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.75-0 🚀

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

OSBotify · 2023-10-02T17:24:59Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.75-12 🚀

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

OSBotify · 2023-10-02T17:53:40Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.3.76-0 🚀

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

OSBotify · 2023-10-03T15:54:37Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.76-6 🚀

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

rushatgabhane · 2023-12-05T10:55:47Z

src/pages/EditRequestTagPage.js

+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={tagName || translate('common.tag')}


Hi, we should have set the tag name here too -

App/src/libs/ReportUtils.js

Line 1776 in 27e2efb

return getProperSchemaForModifiedExpenseMessage(reportActionOriginalMessage.tag, reportActionOriginalMessage.oldTag, Localize.translateLocal('common.tag'), true);

it would have prevented issue #30377 (comment)

BeeMargarida added 3 commits September 21, 2023 12:30

feat: support for editing a tag of a money request

fee898e

feat: pass tag list name to the modified expense message

cdb89ea

feat: update recently used tags on edit money request

8735f71

rezkiy37 suggested changes Sep 21, 2023

View reviewed changes

fix: better prop types and small fixes

063244a

rezkiy37 approved these changes Sep 21, 2023

View reviewed changes

BeeMargarida marked this pull request as ready for review September 21, 2023 20:10

BeeMargarida requested a review from a team as a code owner September 21, 2023 20:10

melvin-bot bot requested review from jjcoffee and removed request for a team September 21, 2023 20:10

amyevans requested changes Sep 25, 2023

View reviewed changes

src/components/ReportActionItem/MoneyRequestView.js Outdated Show resolved Hide resolved

src/libs/PolicyUtils.js Outdated Show resolved Hide resolved

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

BeeMargarida added 2 commits September 25, 2023 09:13

Merge branch 'main' into feat/26793-edit-money-request-tag

fe8a736

fix: small review fixes

61bc84a

BeeMargarida added 2 commits September 25, 2023 10:41

fix: navigation back when reloading on the edit page

472eabc

revert: log

02c218f

amyevans approved these changes Sep 25, 2023

View reviewed changes

amyevans merged commit f0c9bbe into Expensify:main Sep 25, 2023
11 checks passed

jjcoffee mentioned this pull request Sep 27, 2023

[HOLD for payment 2023-10-09] [Wave 6: Tags] CRITICAL - Frontend: editing a tag and billable flag #26793

Closed

4 tasks

OSBotify mentioned this pull request Sep 28, 2023

Deploy Checklist: New Expensify 2023-09-28 #28412

Closed

OSBotify mentioned this pull request Oct 2, 2023

Deploy Checklist: New Expensify 2023-10-02 #28635

Closed

rushatgabhane reviewed Dec 5, 2023

View reviewed changes

rushatgabhane mentioned this pull request Dec 5, 2023

[HOLD for payment 2023-11-29] [HOLD for payment 2023-11-22] [$500] [Wave 6: Tags] - System message displays 'tag' when a custom name is set for Tag #30377

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#26793: Edit a tag in a money request #27950

#26793: Edit a tag in a money request #27950

BeeMargarida commented Sep 21, 2023 •

edited

Loading

rezkiy37 left a comment

melvin-bot bot commented Sep 21, 2023

jjcoffee commented Sep 22, 2023 •

edited

Loading

jjcoffee commented Sep 22, 2023 •

edited

Loading

jjcoffee commented Sep 22, 2023

amyevans left a comment

amyevans commented Sep 25, 2023

BeeMargarida commented Sep 25, 2023

BeeMargarida commented Sep 25, 2023

amyevans left a comment

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

rushatgabhane Dec 5, 2023

#26793: Edit a tag in a money request #27950

#26793: Edit a tag in a money request #27950

Conversation

BeeMargarida commented Sep 21, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

rezkiy37 left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Sep 21, 2023

jjcoffee commented Sep 22, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

jjcoffee commented Sep 22, 2023 • edited Loading

jjcoffee commented Sep 22, 2023

amyevans left a comment

Choose a reason for hiding this comment

amyevans commented Sep 25, 2023

BeeMargarida commented Sep 25, 2023

BeeMargarida commented Sep 25, 2023

amyevans left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

rushatgabhane Dec 5, 2023

Choose a reason for hiding this comment

BeeMargarida commented Sep 21, 2023 •

edited

Loading

jjcoffee commented Sep 22, 2023 •

edited

Loading

jjcoffee commented Sep 22, 2023 •

edited

Loading