feat: rename category #37969

ArekChr · 2024-03-08T13:37:52Z

Details

This PR introduces ability to rename categories

Fixed Issues

$ #35707
PROPOSAL:

Tests

As a Collect policy admin, navigate to Settings > Workspace > Categories
Press any category details
Verify the RHP opens up with a name of name
Press the menu item with category name and edit it
Press Save without any name and verify that you see an error
Enter a category name and press Save
Verify that the category is renamed and you can updated name on the list

Verify that no errors appear in the JS console

Offline tests

As a Collect policy admin, navigate to Settings > Workspace > Categories
Go offline
Press any category details and press on name to edit it
Rename a category press Save
Verify that the category is renamed and you can see it in the list with 50% opacity
Go back online
Verify that the category is no longer with 50% opacity

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

chrome.mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios.mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

ArekChr · 2024-03-11T12:30:04Z

@luacmartins I cannot rename category, got error from backend, could you help?

{
    "jsonCode": 0,
    "message": "Illegal offset type in isset or empty",
    "requestID": "862b8c026ba73bc3-WAW",
    "onyxData": []
}

src/libs/actions/Policy.ts

melvin-bot · 2024-03-12T11:11:56Z

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

c3024 · 2024-03-12T16:59:17Z

categoriesBlank.mp4

When changing a category name there appears a blank field among the categories list.

c3024 · 2024-03-12T17:36:30Z

unencodedName is not updated.

src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts

src/pages/workspace/categories/EditCategoryPage.tsx

src/libs/actions/Policy.ts

src/pages/workspace/categories/CategoryForm.tsx

c3024 · 2024-03-14T10:20:57Z

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

categoryAndroid.mp4

Android: mWeb Chrome

categoryAndroidmWeb.mp4

iOS: Native

categoryiOS.mp4

iOS: mWeb Safari

categoryiOSmWeb.mp4

MacOS: Chrome / Safari

categoryChrome.mp4

MacOS: Desktop

categoryDesktop.mp4

c3024 · 2024-03-14T16:11:29Z

src/pages/workspace/categories/EditCategoryPage.tsx

+                >
+                    <HeaderWithBackButton
+                        title={translate('workspace.categories.editCategory')}
+                        onBackButtonPress={Navigation.goBack}


Suggested change

onBackButtonPress={Navigation.goBack}

onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName))}

When visiting EditCategoryPage with deeplink, clicking on the back button dismisses the modal. I think it should go to the CategorySettingsPage.

cc: @luacmartins

^^ @ArekChr

I think we can address that as a follow up. @ArekChr please address this in the next PR.

addressed this bug here: #38379

hey guys 👋 , coming from #50078:

There are chances that we navigate back before the Onyx updates are completed, this will cause previous values to show for a split second and then show new values, we should had waited for the Onyx update to get completed before navigating back.

c3024 · 2024-03-14T16:29:52Z

Tested with commenting this block here

App/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts

Lines 185 to 189 in 9a2796e

    
           // When we open a screen in RHP from FullScreenNavigator, we need to add the appropriate screen in CentralPane. 
        
           // Then, when we close FullScreenNavigator, we will be redirected to the correct page in CentralPane. 
        
           if (matchingRootRoute.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR) { 
        
               routes.push(createCentralPaneNavigator({name: SCREENS.SETTINGS.WORKSPACES})); 
        
           }

Apart from this comment here, everything looks good to me.

luacmartins · 2024-03-14T16:38:08Z

Thanks for the review @c3024. I'll merge this PR to get things moving and unblock other issues. @ArekChr please address this navigation issue in the next PR

luacmartins

LGTM!

OSBotify · 2024-03-14T16:43:33Z

✋ 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-15T10:29:31Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.53-0 🚀

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

OSBotify · 2024-03-18T16:19:09Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.53-2 🚀

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

ShridharGoel · 2024-05-29T06:54:13Z

@luacmartins @c3024 Is unencodedName no longer needed? Context: #42549

luacmartins · 2024-05-29T13:46:31Z

It seems to be unused in the code, so we could remove it

rayane-d · 2024-08-11T12:44:56Z

src/libs/actions/Policy.ts

+                        ...policyCategoryToUpdate,
+                        name: policyCategory.newName,
+                        unencodedName: decodeURIComponent(policyCategory.newName),
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,


FYI, This PR missed spreading existing pendingFields of the policy category to update, This discards GL code and Payroll code pendingFields and caused #45755. More info in this proposal: #45755 (comment)

ArekChr added 5 commits March 8, 2024 14:37

init navigation and page

1e3f18e

init onyx action

618511d

add navigation to edit page

f06ab7c

fix: use rename action instead create

c79a384

Merge branch 'main' into feat/edit_category

afeed57

feat: reuseable form for create and edit categories

ce87832

ArekChr changed the title ~~init navigation and page~~ feat: rename category Mar 11, 2024

luacmartins self-requested a review March 11, 2024 16:02

luacmartins requested changes Mar 12, 2024

View reviewed changes

src/libs/actions/Policy.ts Outdated Show resolved Hide resolved

ArekChr added 7 commits March 12, 2024 10:28

Merge branch 'main' into feat/edit_category

3029d92

fix: renamePolicyCategory params

7ce9418

refactor: move keyboard dismiss and handle go back in form

804531c

fix: remove unused imports

ac541ee

fix: close rhp on edit category

c99e646

fix: update optimistic data

611d42d

fix: set all fields

b6e7b2c

ArekChr marked this pull request as ready for review March 12, 2024 11:11

ArekChr requested a review from a team as a code owner March 12, 2024 11:11

melvin-bot bot removed the request for review from a team March 12, 2024 11:11

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

ArekChr requested a review from luacmartins March 12, 2024 11:12

c3024 suggested changes Mar 12, 2024

View reviewed changes

src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts Outdated Show resolved Hide resolved

src/pages/workspace/categories/EditCategoryPage.tsx Outdated Show resolved Hide resolved

src/libs/actions/Policy.ts Outdated Show resolved Hide resolved

luacmartins requested changes Mar 13, 2024

View reviewed changes

src/libs/actions/Policy.ts Outdated Show resolved Hide resolved

c3024 reviewed Mar 13, 2024

View reviewed changes

ArekChr added 2 commits March 13, 2024 11:14

Merge branch 'main' into feat/edit_category

3b02b03

fix: remove unused imports

71eb636

ArekChr added 5 commits March 14, 2024 09:39

fix: add unencodedName

b014a72

refactor: use dismiss modal instead of go back

c4eb117

fix: add shouldEnableMaxHeight in edit category

38476ce

fix: add edit category to rhp mapping

86d2e6a

decode unencodedName

240500a

ArekChr requested review from c3024 and luacmartins March 14, 2024 09:23

luacmartins approved these changes Mar 14, 2024

View reviewed changes

c3024 suggested changes Mar 14, 2024

View reviewed changes

luacmartins requested a review from c3024 March 14, 2024 16:37

luacmartins merged commit 00315b1 into Expensify:main Mar 14, 2024
16 of 22 checks passed

c3024 approved these changes Mar 14, 2024

View reviewed changes

melvin-bot bot requested a review from luacmartins March 14, 2024 16:38

luacmartins reviewed Mar 14, 2024

View reviewed changes

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

Deploy Checklist: New Expensify 2024-03-15 #38382

Closed

35 tasks

ArekChr mentioned this pull request Mar 15, 2024

feat: Delete single category #38379

Merged

49 tasks

situchan mentioned this pull request Mar 15, 2024

[$500] [Categories] Android - Category - Keyboard does not pull up after reopening Add category page #38402

Closed

6 tasks

amyevans mentioned this pull request Mar 15, 2024

[$500] [HOLD for payment 2024-03-26] [Simplified Collect][Categories] - App crashes when selecting categories and editing category name at the same time #38404

Closed

6 tasks

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

[HOLD for payment 2024-03-25] [$500] [Simplified Collect][Categories] WorkspaceEditCategoryPage: full implementation, onyx action #35707

Closed

c3024 mentioned this pull request Mar 22, 2024

fix: allow user to instantly edit created distance rate #38799

Merged

50 tasks

rayane-d reviewed Aug 11, 2024

View reviewed changes

rayane-d mentioned this pull request Aug 11, 2024

[HOLD for payment 2024-08-14] [$250] Categories - Toggle, GL code & Payroll code are no longer grayed out after renaming category #45755

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: rename category #37969

feat: rename category #37969

ArekChr commented Mar 8, 2024 •

edited

Loading

ArekChr commented Mar 11, 2024

melvin-bot bot commented Mar 12, 2024

c3024 commented Mar 12, 2024 •

edited

Loading

c3024 commented Mar 12, 2024 •

edited

Loading

c3024 commented Mar 14, 2024 •

edited

Loading

c3024 Mar 14, 2024

c3024 Mar 14, 2024

luacmartins Mar 14, 2024

ArekChr Mar 15, 2024 •

edited

Loading

allgandalf Dec 27, 2024

c3024 commented Mar 14, 2024

luacmartins commented Mar 14, 2024

luacmartins left a comment

OSBotify commented Mar 14, 2024

OSBotify commented Mar 15, 2024

OSBotify commented Mar 18, 2024

ShridharGoel commented May 29, 2024

luacmartins commented May 29, 2024

rayane-d Aug 11, 2024

	onBackButtonPress={Navigation.goBack}
	onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName))}

feat: rename category #37969

feat: rename category #37969

Conversation

ArekChr commented Mar 8, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

ArekChr commented Mar 11, 2024

melvin-bot bot commented Mar 12, 2024

c3024 commented Mar 12, 2024 • edited Loading

c3024 commented Mar 12, 2024 • edited Loading

c3024 commented Mar 14, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

c3024 Mar 14, 2024

Choose a reason for hiding this comment

c3024 Mar 14, 2024

Choose a reason for hiding this comment

luacmartins Mar 14, 2024

Choose a reason for hiding this comment

ArekChr Mar 15, 2024 • edited Loading

Choose a reason for hiding this comment

allgandalf Dec 27, 2024

Choose a reason for hiding this comment

c3024 commented Mar 14, 2024

luacmartins commented Mar 14, 2024

luacmartins left a comment

Choose a reason for hiding this comment

OSBotify commented Mar 14, 2024

OSBotify commented Mar 15, 2024

OSBotify commented Mar 18, 2024

ShridharGoel commented May 29, 2024

luacmartins commented May 29, 2024

rayane-d Aug 11, 2024

Choose a reason for hiding this comment

ArekChr commented Mar 8, 2024 •

edited

Loading

c3024 commented Mar 12, 2024 •

edited

Loading

c3024 commented Mar 12, 2024 •

edited

Loading

c3024 commented Mar 14, 2024 •

edited

Loading

ArekChr Mar 15, 2024 •

edited

Loading