Fix: Workspace member has option to edit categories #43975

daledah · 2024-06-19T04:47:44Z

Details

Fixed Issues

$ #43623
PROPOSAL: #43623 (comment)

Tests

Precondition: User should have an workspace with all categories Disabled:

Go to FAB > Track expense.
Track a manual expense.
In self-DM Click Categorize it from the actionable whisper.
Verify that: the workspace without categories isn't an option

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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.

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

…re page

melvin-bot · 2024-06-19T08:50:16Z

@dannymcclain @allgandalf One of you needs to 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]

allgandalf · 2024-06-19T11:11:37Z

src/languages/es.ts

+                memberTitle: (workspaceName: string) => `${workspaceName} no tiene ninguna categoría activada.`,
+                otherWorkspace: 'Categorice este gasto eligiendo un espacio de trabajo diferente, o ',
+                askYourAdmin: 'pida a su administrador',
+                enableForThisWorkspace: ' que habilite categorías para este espacio de trabajo.',


Were these spanish translations approved in the slack channel @daledah ?

I'm applying to join the general Slack channel. @allgandalf, can you help me post a thread to approve these Spanish translations?

@daledah , we are planning to go the other way with this PR of not displaying the workspace with no categories, I will update you over this PR about the new expected result by EOD today

allgandalf · 2024-06-20T20:17:47Z

Important

@daledah, the new expected result from this PR is as follows:
not show workspaces that don't have any categories enabled in the list of workspaces when you select Categorize from Concierge's suggested actions

Slack link

allgandalf · 2024-06-21T17:37:38Z

friendly bump @daledah

daledah · 2024-06-24T02:34:14Z

i'll update today

…o not here page" This reverts commit d164b7a.

daledah · 2024-06-24T08:32:28Z

@allgandalf i updated, please check again with my solution

allgandalf · 2024-06-25T09:56:53Z

@daledah can you update the Videos on all platforms, they still seem to be on the old logic

daledah · 2024-06-28T09:55:52Z

Sorry for delay, I'll update today

daledah · 2024-06-28T10:35:10Z

@allgandalf i updated, please check again 🙏

allgandalf

Small improvement

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

Co-authored-by: Gandalf <[email protected]>

daledah · 2024-07-01T14:25:45Z

@allgandalf i updated

allgandalf · 2024-07-01T18:39:39Z

Thanks for updating i will review this tomorrow, working on other high priority PR's today

allgandalf · 2024-07-03T18:10:05Z

This has conflicts @daledah

neil-marcellini

Looks good pending C+ review. I left a few optional improvement ideas. Also, could you please update the test steps to expect that the workspace without categories isn't an option?

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

src/libs/OptionsListUtils.ts

allgandalf · 2024-07-04T17:50:56Z

@daledah friendly bump

neil-marcellini

Looks good, but please update the test steps.

could you please update the test steps to expect that the workspace without categories isn't an option?

daledah · 2024-07-09T03:24:40Z

@neil-marcellini i updated

allgandalf

Left some comments...

src/libs/OptionsListUtils.ts

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

neil-marcellini · 2024-07-09T16:34:48Z

@allgandalf since your comments don't relate to the functionality of the code, would you please also test now and hopefully we can get this merged soon? We can fix small things in a follow up if needed.

allgandalf · 2024-07-09T16:43:24Z

works for me, starting review now

allgandalf · 2024-07-09T16:44:39Z

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

Screen.Recording.2024-07-15.at.5.54.58.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-07-15.at.5.57.14.PM.mov

iOS: Native

Screen.Recording.2024-07-15.at.5.49.48.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-07-15.at.5.51.01.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-15.at.5.34.37.PM.mov

MacOS: Desktop

Screen.Recording.2024-07-15.at.5.42.07.PM.mov

allgandalf · 2024-07-09T16:50:13Z

@neil-marcellini , i guess you have the access to edit the PR description, can you please update the QA steps to:

Precondition: User should have an workspace with all categories Disabled:

Go to FAB > Track expense.
Track a manual expense.
In self-DMClick Categorize it from the actionable whisper.
Verify that: the workspace without categories isn't an option

allgandalf · 2024-07-09T16:51:19Z

Bug

Workspaces with enabled categories are seen twice:

daledah · 2024-07-09T23:07:07Z

@allgandalf I can't reproduce this bug. Please add detailed steps.

Screen.Recording.2024-07-10.at.06.02.33.mov

allgandalf · 2024-07-10T08:21:40Z

Steps to reproduce:

Login with new account
create new workspace
Disable the categories of the new workspace
Create another workspace
Go to FAB and select track expense
Go to self DM and select the whisper: Categorize it
Observe that you see the same workspaces with enabled categories appear twice

Screen.Recording.2024-07-10.at.1.44.58.PM.mov

daledah · 2024-07-11T15:12:19Z

Bug

Workspaces with enabled categories are seen twice:

@allgandalf This bug also appears in main, it seems unrelated to my PR. Looks like after creating a new workspace, all channels are duplicated, so the suggestions are also duplicated.

Screen.Recording.2024-07-11.at.21.54.32.mp4

allgandalf · 2024-07-11T19:24:53Z

@allgandalf This bug also appears in main, it seems unrelated to my PR. Looks like after creating a new workspace, all channels are duplicated, so the suggestions are also duplicated.

This bug doesn't appear on main @daledah , the video which you attached is on local dev environment, I tested on staging and production the reported bug doesn't appear there:

Screen.Recording.2024-07-12.at.12.51.44.AM.mov

So i guess the bug which is mentioned here is indeed a regression of our PR, can you please take a look at this @daledah 🙏

c.c. @neil-marcellini

daledah · 2024-07-12T07:33:38Z

@allgandalf can you check with your latest main on local dev environment
This video below is from my latest main and we have a bug when creating a new workspace
I think our PR code changes aren't related to this bug
cc @neil-marcellini

web-resize.mp4

allgandalf

LGTM

OSBotify · 2024-07-15T18:29:01Z

✋ 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-07-15T21:04:05Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.0.7-3 🚀

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

OSBotify · 2024-07-15T22:12:49Z

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 9.0.7-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-17T00:18:19Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀

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

OSBotify · 2024-07-18T13:49:17Z

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

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

daledah added 2 commits June 19, 2024 11:46

Workspace member has option to edit categories, which leads to not he…

d164b7a

…re page

add link ask to admin

e40ee9b

daledah marked this pull request as ready for review June 19, 2024 08:50

daledah requested a review from a team as a code owner June 19, 2024 08:50

melvin-bot bot requested review from allgandalf and dannymcclain and removed request for a team June 19, 2024 08:50

daledah mentioned this pull request Jun 19, 2024

[HOLD for payment 2024-07-24] [$250] Categorizing - Workspace member has option to edit categories, which leads to not here page #43623

Closed

6 tasks

allgandalf reviewed Jun 19, 2024

View reviewed changes

daledah added 5 commits June 24, 2024 14:57

revert link ask to admin

4add17c

Revert "Workspace member has option to edit categories, which leads t…

80bf947

…o not here page" This reverts commit d164b7a.

filter policy don't have any enabled categories

d4f52c5

merge main

5ed33a1

fix lint

0f9ca5e

Merge branch 'main' into fix/43623

910c882

allgandalf reviewed Jun 28, 2024

View reviewed changes

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx Outdated Show resolved Hide resolved

Update src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

c60d9af

Co-authored-by: Gandalf <[email protected]>

neil-marcellini requested changes Jul 3, 2024

View reviewed changes

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx Outdated Show resolved Hide resolved

src/libs/OptionsListUtils.ts Outdated Show resolved Hide resolved

neil-marcellini previously approved these changes Jul 8, 2024

View reviewed changes

allgandalf reviewed Jul 9, 2024

View reviewed changes

neil-marcellini requested a review from allgandalf July 9, 2024 16:34

daledah added 2 commits July 10, 2024 05:56

Merge branch 'main' into fix/43623

9dec5fa

fix lint

10d0e5d

daledah dismissed neil-marcellini’s stale review via 10d0e5d July 9, 2024 23:01

fix lint

dcb160f

Merge branch 'Expensify:main' into fix/43623

4c80b47

allgandalf approved these changes Jul 15, 2024

View reviewed changes

melvin-bot bot requested a review from neil-marcellini July 15, 2024 12:29

neil-marcellini approved these changes Jul 15, 2024

View reviewed changes

neil-marcellini merged commit c7af580 into Expensify:main Jul 15, 2024
15 checks passed

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

Deploy Checklist: New Expensify 2024-07-15 #45421

Closed

arosiclair mentioned this pull request Jul 16, 2024

Categorize -Blank workspace selection page when existing workspace has disabled all categories #45478

Closed

6 tasks

Fix: Workspace member has option to edit categories #43975

Fix: Workspace member has option to edit categories #43975

Conversation

daledah commented Jun 19, 2024 • edited by neil-marcellini Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 19, 2024

allgandalf Jun 19, 2024

Choose a reason for hiding this comment

daledah Jun 20, 2024

Choose a reason for hiding this comment

allgandalf Jun 20, 2024

Choose a reason for hiding this comment

allgandalf commented Jun 20, 2024

allgandalf commented Jun 21, 2024

daledah commented Jun 24, 2024

daledah commented Jun 24, 2024

allgandalf commented Jun 25, 2024

daledah commented Jun 28, 2024 • edited Loading

daledah commented Jun 28, 2024

allgandalf left a comment

Choose a reason for hiding this comment

daledah commented Jul 1, 2024

allgandalf commented Jul 1, 2024

allgandalf commented Jul 3, 2024

neil-marcellini left a comment

Choose a reason for hiding this comment

allgandalf commented Jul 4, 2024

neil-marcellini left a comment

Choose a reason for hiding this comment

daledah commented Jul 9, 2024

allgandalf left a comment

Choose a reason for hiding this comment

neil-marcellini commented Jul 9, 2024

allgandalf commented Jul 9, 2024

allgandalf commented Jul 9, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf commented Jul 9, 2024

allgandalf commented Jul 9, 2024

Bug

daledah commented Jul 9, 2024

allgandalf commented Jul 10, 2024

daledah commented Jul 11, 2024

Bug

allgandalf commented Jul 11, 2024 • edited Loading

daledah commented Jul 12, 2024

allgandalf left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

OSBotify commented Jul 18, 2024

daledah commented Jun 19, 2024 •

edited by neil-marcellini

Loading

daledah commented Jun 28, 2024 •

edited

Loading

allgandalf commented Jul 9, 2024 •

edited

Loading

allgandalf commented Jul 11, 2024 •

edited

Loading