[Wave Collect][Xero] Import tracking categories #41441

mananjadhav · 2024-05-01T19:20:21Z

Details

Fixed Issues

$ #39732
PROPOSAL:

Tests

Pre-requisite:

Xero account setup in an existing workspace.
You need to have 2 tracking categories named "Region" and "Cost centers", to set their mapping.
On your Xero account, select the Demo company organization.
Go to Accounting > Advanced, select "Tracking categories".
You should see something named "Region", in reality it can be any name that's why you must show/hide the option depending on the name of the tracking category.
Add a new tracking category named "Cost centers".

xero-tracking-categories-setup.mov

Steps

Login with a user who already has the Xero account setup.
Go to Workspace having Xero connection -> Accounting -> Import.
Click on Tracking Categories
Verify that you're able to see Import toggle switch.
If the import toggle is off, then you shouldn't see any other option in the page.
Switch the Import to On, in the data you can verify that policy_<policyID>.connections.xero.config.importTrackingCategories is set to true. On switching off, it is set to false.
Once turned on you should see two items Map Xero cost centers to and Map Xero regions to.
Click on each of the menu items and perform the following steps:
a. You should see the title of the page as the Map Xero <fieldname> to.
b. You should see two options Xero contact default and Tags as two menu items.
c. On selecting any one of the options, you should be redirected back to the tracking categories page, and the selected option should show up against each field title.
d. In policy_<policyID>.connections.xero.mappings.trackingCategory_<trackingCategoryId> you should see the selected value , ie, DEFAULT for Xero contact default and TAG for Tags.
e. The trackingCategoryId should be based on the id field of policy_<policyID>.connections.xero.trackingCategories.name matched to cost centers and regions respectively.

For all the data verification related info, go to Chrom Dev Tools -> Application -> Storage -> OnyxDB -> Search for your policy_. Check out the data in the connections object as shown in the screenshot below.

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

android-xero-tracking-categories.mov

Android: mWeb Chrome

mweb-chrome-xero-tracking-categories.mov

iOS: Native

ios-xero-tracking-categories.mov

iOS: mWeb Safari

mweb-safari-xero-tracking-categories.mov

MacOS: Chrome / Safari

web-xero-tracking-categories.mov

MacOS: Desktop

desktop-xero-tracking-categories.mov

…tegories

src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx

…tegories

shawnborton · 2024-05-06T11:54:17Z

Design-wise this looks good to me.

rushatgabhane

Bug: Category is not mapped properly

In Old dot, go to the connection > Coding
Map Xero regions to - "Report Field (header level)"

This is because the category options are hardcoded to Tags and Default. But I selected Report Field

rushatgabhane · 2024-05-06T12:02:54Z

src/CONST.ts

+            COST_CENTERS: 'cost centers',
+            REGION: 'region',
+        },
+        TRACKING_CATEGORY_OPTIONS: {


These shouldn't be hardcoded, right?

@lakchote I had asked if these will be hardcoded. Thread here.

These will be hardcoded yes.

mananjadhav · 2024-05-06T16:04:22Z

This is because the category options are hardcoded to Tags and Default. But I selected Report Field

Got it. We'll be adding this in future. But at the moment I think it should show blank here then? @trjExpensify @lakchote ?

rushatgabhane · 2024-05-06T19:35:29Z

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: mWeb Chrome

iOS: Native

Screen.Recording.2024-05-07.at.01.14.59.mov

iOS: mWeb Safari

Screen.Recording.2024-05-07.at.01.08.21.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-07.at.01.04.23.mov

MacOS: Desktop

rushatgabhane

@lakchote LGTM if you agree with #41441 (comment)

…tegories

lakchote · 2024-05-07T07:17:33Z

@lakchote I didn't understand what you meant? The link also doesn't take me to any specific thread. I already added the pre-requisite on how to add them based on your instructions in slack. Is there anything else that's expected from me?

It was meant for @rushatgabhane to help him enable mapping options.

This is because the category options are hardcoded to Tags and Default. But I selected Report Field

Got it. We'll be adding this in future. But at the moment I think it should show blank here then? @trjExpensify @lakchote ?

Report field will be added once we'll port Control workspaces to NewDot. It's a Control feature.

I'd move in favour of showing blank there in the meantime.

mananjadhav · 2024-05-07T07:19:35Z

Thanks for the comment @lakchote. I'll push an update in a while for the Report field.

…tegories

mananjadhav · 2024-05-07T16:23:25Z

@rushatgabhane @lakchote Added a fix to show blank for the report field. I didn't refactor too much because we are anyway going remove it later.

OSBotify · 2024-05-08T06:48:19Z

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

lakchote · 2024-05-08T07:38:10Z

I have merged by mistake (since we're on merge freeze). Since it's behind beta, and it should not influence any user behaviour we don't need to revert it.

I've created a new xero-merge-freeze branch for the next Xero PRs, people will need to use it as a base instead of main in the meantime to not block progress.

OSBotify · 2024-05-09T02:37:34Z

🚀 Deployed to staging by https://github.com/lakchote in version: 1.4.72-0 🚀

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

lanitochka17 · 2024-05-09T14:22:14Z

Tell us about PR Pre-props:
step 4 cannot be completed because we do not see "Tracking categories"
Go to Accounting > Advanced, select Tracking Categories.
How do we set up an account to complete these steps?
thank you in advance

bandicam.2024-05-09.14-15-22-495.mp4

mananjadhav · 2024-05-09T14:34:20Z

@lanitochka17 Did you try the steps mentioned in the pre-requisites? Please find attached video on navigating through Xero. You should see Demo Company when you create a new account on Xero, and use that for syncing when you test it.

xero-tracking-categories-setup.mov

m-natarajan · 2024-05-09T15:58:14Z

@mananjadhav Thanks for sharing the video again. I have a question, How to verify the PR step 6 and 8.d and e? Is this can only be done internally?

mananjadhav · 2024-05-09T16:08:58Z

You should be able to view this in the application data onyxdb in Chrom Dev tools. I've added a note in the steps along with the screenshot.

OSBotify · 2024-05-13T08:20:46Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.72-1 🚀

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

mananjadhav added 4 commits May 1, 2024 20:18

feat: basic screens and navigation setup

7938e75

feat: added more config pages

5a12e04

refactor: update the regions to page

605912d

refactor: update translations

7e4f15c

mananjadhav changed the title ~~Xero import categories~~ Xero import tracking categories May 1, 2024

lakchote added Waiting for copy User facing verbiage needs polishing and removed Waiting for copy User facing verbiage needs polishing labels May 2, 2024

mananjadhav added 8 commits May 2, 2024 22:25

Merge branch 'main' of github.com:mananjadhav/App into xero-import-ca…

ee9beed

…tegories

fix: added fields

d20d27d

Merge branch 'main' of github.com:mananjadhav/App into xero-import-ca…

7596517

…tegories

feat: added tracking categories logic

9bf90d6

feat: create views for cost centers and region

0872f9c

refactor: update category fetching logic

1627c56

feat: update mapping

f1e8dbc

feat: added api for regions

b24e875

mananjadhav changed the title ~~Xero import tracking categories~~ [Wave Collect][Xero] Import tracking categories May 3, 2024

style: lint fixes

5c7ef82

rushatgabhane suggested changes May 3, 2024

View reviewed changes

src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx Outdated Show resolved Hide resolved

mananjadhav added 12 commits May 3, 2024 11:46

style: lint fixes

3bd9023

refactor: use connection layout

422eb13

refactor: use connection layout

01eda9e

Merge branch 'main' of github.com:mananjadhav/App into xero-import-ca…

91c0e39

…tegories

refactor: remove unused importants

b012ed6

Merge branch 'main' of github.com:mananjadhav/App into xero-import-ca…

8c410b9

…tegories

fix: update routes

aed9941

refactor: rename keys

1b58ea4

style: lint fixes

d01ecf7

fix: typo in url

ffd6e3c

refactor: move api call to useCallback

2fefa85

Merge branch 'main' of github.com:mananjadhav/App into xero-import-ca…

29014fe

…tegories

rushatgabhane suggested changes May 6, 2024

View reviewed changes

rushatgabhane reviewed May 6, 2024

View reviewed changes

fix: added flex1 to container

dd86c65

mananjadhav requested review from rushatgabhane and lakchote May 6, 2024 18:48

rushatgabhane approved these changes May 6, 2024

View reviewed changes

Merge branch 'main' of github.com:mananjadhav/App into xero-import-ca…

0f386d4

…tegories

fix: use view for map field

b118e8c

mananjadhav added 3 commits May 7, 2024 21:30

Merge branch 'main' of github.com:mananjadhav/App into xero-import-ca…

fd5ccd6

…tegories

fix: added isValidOption

22527c7

refactor: prettier fix

3dc105d

lakchote approved these changes May 8, 2024

View reviewed changes

lakchote merged commit e0b6a06 into Expensify:main May 8, 2024
15 checks passed

lakchote mentioned this pull request May 8, 2024

Revert "[Wave Collect][Xero] Import tracking categories" #41822

Closed

github-actions bot mentioned this pull request May 9, 2024

Deploy Checklist: New Expensify 2024-05-09 #41874

Closed

37 tasks

lakchote mentioned this pull request May 9, 2024

[HOLD for payment 2024-06-11] [HOLD for payment 2024-05-20] [Wave Collect] [Xero] [Import Flow] Create the Tracking Categories Page #39732

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Wave Collect][Xero] Import tracking categories #41441

[Wave Collect][Xero] Import tracking categories #41441

mananjadhav commented May 1, 2024 •

edited

Loading

shawnborton commented May 6, 2024

rushatgabhane left a comment •

edited

Loading

rushatgabhane May 6, 2024

mananjadhav May 6, 2024

lakchote May 7, 2024

mananjadhav commented May 6, 2024

rushatgabhane commented May 6, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

lakchote commented May 7, 2024 •

edited

Loading

mananjadhav commented May 7, 2024

mananjadhav commented May 7, 2024

OSBotify commented May 8, 2024

lakchote commented May 8, 2024

OSBotify commented May 9, 2024

lanitochka17 commented May 9, 2024

mananjadhav commented May 9, 2024

m-natarajan commented May 9, 2024

mananjadhav commented May 9, 2024

OSBotify commented May 13, 2024

[Wave Collect][Xero] Import tracking categories #41441

[Wave Collect][Xero] Import tracking categories #41441

Conversation

mananjadhav commented May 1, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

shawnborton commented May 6, 2024

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

rushatgabhane May 6, 2024

Choose a reason for hiding this comment

mananjadhav May 6, 2024

Choose a reason for hiding this comment

lakchote May 7, 2024

Choose a reason for hiding this comment

mananjadhav commented May 6, 2024

rushatgabhane commented May 6, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane left a comment • edited Loading

Choose a reason for hiding this comment

lakchote commented May 7, 2024 • edited Loading

mananjadhav commented May 7, 2024

mananjadhav commented May 7, 2024

OSBotify commented May 8, 2024

lakchote commented May 8, 2024

OSBotify commented May 9, 2024

lanitochka17 commented May 9, 2024

mananjadhav commented May 9, 2024

m-natarajan commented May 9, 2024

mananjadhav commented May 9, 2024

OSBotify commented May 13, 2024

mananjadhav commented May 1, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

rushatgabhane commented May 6, 2024 •

edited

Loading

rushatgabhane left a comment •

edited

Loading

lakchote commented May 7, 2024 •

edited

Loading