[CP Staging] [FIX] Categories - GL code data disappears after importing same file that does not have GL code #48629

ishpaul777 · 2024-09-05T10:03:06Z

Details

Fixed Issues

Tests

Verify that no errors appear in the JS console

Go to Control workspace settings > Categories.
Click 3-dot menu.
Click Import spreadsheet.
Upload the attached CSV file.
Map Name and Enabled.
Click Import.
Click on any category.
Manually enter GL code and Payroll code.
Click 3-dot menu > Import spreadsheet.
Upload the same file in Step 5, map the fields and import.
Click on the same category that has GL code and Payroll code entered previously in Step 9.

Verify Expected Result:

GL code and Payroll code will remain unchanged after importing the same file that does not have GL code and Payroll code.

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Record_2024-09-05-16-27-33.mp4

Android: mWeb Chrome

Record_2024-09-05-16-22-13.mp4

iOS: Native

trim.75D1600A-1FAE-4F5B-9AB8-EF3A149E6BE3.MOV

iOS: mWeb Safari

ScreenRecording_09-05-2024.16-14-55_1.MP4

MacOS: Chrome / Safari

Screen.Recording.2024-09-05.at.3.38.56.PM.mov

MacOS: Desktop

melvin-bot · 2024-09-05T10:07:39Z

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

mountiny · 2024-09-05T10:24:28Z

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

Screen.Recording.2024-09-05.at.12.22.28.mp4

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

mountiny

Thanks, works really well!

rushatgabhane · 2024-09-05T10:29:23Z

small conflict here. @ishpaul777

ishpaul777 · 2024-09-05T10:35:20Z

fixed

github-actions · 2024-09-05T10:39:47Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/48629/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/48629/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/48629/NewExpensify.dmg	https://48629.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

mountiny · 2024-09-05T10:41:38Z

@ishpaul777 the checklist is not completed in case you missed it 🙌

ishpaul777 · 2024-09-05T10:42:36Z

I was just waiting on adhoc build, completing videos

mountiny

Thanks!

ishpaul777 · 2024-09-05T10:55:14Z

ready to go

…egory-imoort [CP Staging] [FIX] Categories - GL code data disappears after importing same file that does not have GL code (cherry picked from commit e0b72a1) (CP triggered by mountiny)

OSBotify · 2024-09-05T11:08:45Z

✋ 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-09-05T11:38:25Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.29-9 🚀

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-09-05T19:18:44Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.29-12 🚀

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

fixes the issue

5050319

mountiny added the Ready To Build label Sep 5, 2024

mountiny assigned ishpaul777 Sep 5, 2024

mountiny changed the title ~~[FIX] Categories - GL code data disappears after importing same file that does not have GL code~~ [CP Staging] [FIX] Categories - GL code data disappears after importing same file that does not have GL code Sep 5, 2024

mountiny requested a review from rushatgabhane September 5, 2024 10:07

ishpaul777 marked this pull request as ready for review September 5, 2024 10:07

ishpaul777 requested a review from a team as a code owner September 5, 2024 10:07

melvin-bot bot requested a review from mountiny September 5, 2024 10:07

melvin-bot bot removed the request for review from a team September 5, 2024 10:07

mountiny previously approved these changes Sep 5, 2024

View reviewed changes

Merge branch 'main' into fix/gl-code-override-in-category-imoort

2e8724e

ishpaul777 dismissed mountiny’s stale review via 2e8724e September 5, 2024 10:34

mountiny approved these changes Sep 5, 2024

View reviewed changes

mountiny merged commit e0b72a1 into Expensify:main Sep 5, 2024
18 of 30 checks passed

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Sep 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] [FIX] Categories - GL code data disappears after importing same file that does not have GL code #48629

[CP Staging] [FIX] Categories - GL code data disappears after importing same file that does not have GL code #48629

ishpaul777 commented Sep 5, 2024 •

edited

Loading

melvin-bot bot commented Sep 5, 2024

mountiny commented Sep 5, 2024 •

edited

Loading

mountiny left a comment

rushatgabhane commented Sep 5, 2024

ishpaul777 commented Sep 5, 2024

github-actions bot commented Sep 5, 2024

mountiny commented Sep 5, 2024

ishpaul777 commented Sep 5, 2024

mountiny left a comment

ishpaul777 commented Sep 5, 2024

OSBotify commented Sep 5, 2024

OSBotify commented Sep 5, 2024

OSBotify commented Sep 5, 2024

[CP Staging] [FIX] Categories - GL code data disappears after importing same file that does not have GL code #48629

[CP Staging] [FIX] Categories - GL code data disappears after importing same file that does not have GL code #48629

Conversation

ishpaul777 commented Sep 5, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 5, 2024

mountiny commented Sep 5, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

rushatgabhane commented Sep 5, 2024

ishpaul777 commented Sep 5, 2024

github-actions bot commented Sep 5, 2024

mountiny commented Sep 5, 2024

ishpaul777 commented Sep 5, 2024

mountiny left a comment

Choose a reason for hiding this comment

ishpaul777 commented Sep 5, 2024

OSBotify commented Sep 5, 2024

OSBotify commented Sep 5, 2024

OSBotify commented Sep 5, 2024

ishpaul777 commented Sep 5, 2024 •

edited

Loading

mountiny commented Sep 5, 2024 •

edited

Loading