Prevent the user from requiring tags when there is no active tag #42004

hayata-suenaga · 2024-05-10T19:59:18Z

…gs in the workspace

Details

$ #41309
PROPOSAL: #41309 (comment)

Tests / QA Steps

Create a workspace
Enable the tags feature on the More Features page of the workspace editor
Create several tags manually on the Tags page
Click the Settings button on the Tags page and confirm that you can toggle on and off the Members must tag all spend toggle button
Disable all tags
Click the Settings button on the Tags page and confirm that the Members must tag all spend toggle button is off and locked.
Go back to More Features page and enable the Accounting feature
On the Accounting page, connect to QBO.
Go to the Tags page again
Check that classes and customers/projects are imported from QBO as tags and there are enabled
Click the Settings button on the Tags page and confirm that you can toggle on and off the Members must tag all spend toggle button
Disable all tags
Click the Settings button on the Tags page and confirm that the Members must tag all spend toggle button is off and locked.

Offline tests

N/A

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…gs in the workspace

hayata-suenaga · 2024-05-10T20:00:50Z

To disable all tags, this App PR might be needed

melvin-bot · 2024-05-10T21:06:18Z

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

rushatgabhane · 2024-05-13T10:42:41Z

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-05-24.at.03.49.53.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

https://github.com/Expensify/App/assets/29673073/d2d5216f-cb71-4fba-ad88-24417a7e28ca

MacOS: Chrome / Safari

Screen.Recording.2024-05-24.at.03.42.50.mov

Screen.Recording.2024-05-24.at.03.48.25.mov

MacOS: Desktop

rushatgabhane · 2024-05-13T11:06:41Z

Hold can be removed.

@hayata-suenaga please remove the console.log

hayata-suenaga · 2024-05-13T15:35:04Z

@rushatgabhane, I forgot to push this commit 😓

Now this PR is ready for review 😄

…s-when-there-is-no-active-tags

hayata-suenaga · 2024-05-16T17:36:38Z

Because there was a recent change to support multi-level tags on New Expensify and we don't yet support disabling tags when the tags are imported as multi-level, we need to wait for that work to be done to test changes in this PR.

We can actually test for cases other than multi-tag.

hayata-suenaga · 2024-05-17T06:10:42Z

@rushatgabhane, while we're waiting for the merge freeze to be lifted, could you review and complete the checklist, please?

rushatgabhane · 2024-05-20T21:44:36Z

sure thing!

hayata-suenaga · 2024-05-20T23:33:20Z

I changed the base branch to use the branch for testing all QBO related changes while we have merge freeze against the main branch.

rushatgabhane · 2024-05-21T06:15:46Z

@hayata-suenaga it doesn't test well

Disable all tags
On the Accounting page, connect to QBO.
Go to the Tags page again
The tags are still disabled
Click the Settings button on the Tags page
I cannot toggle on and off the Members must tag all spend toggle button

Screen.Recording.2024-05-21.at.11.43.43.mov

hayata-suenaga · 2024-05-21T20:55:19Z

This should be a multi-level tags list. I can test this locally to see what's going on or if I'm forgetting something 🤔

hayata-suenaga · 2024-05-22T17:47:08Z

@rushatgabhane, I tested this locally but I couldn't reproduce the issue you're facing

Screen.Recording.2024-05-22.at.10.41.12.AM.mov

Also, I have a question about the screen recordings you provided. Where did you get the tags being shown? 🤔 If you're importing Classes and Customers/Projects from QBO, you should be seeing the multi-level tags as captured in the screenshot -> #42004 (comment)

hayata-suenaga · 2024-05-23T19:46:22Z

@rushatgabhane, please retest this when you have time 🙇 This has an external deadline

rushatgabhane

LGTM

melvin-bot · 2024-05-23T22:22:38Z

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

melvin-bot · 2024-05-23T22:22:40Z

🎯 @rushatgabhane, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #42564.

trjExpensify · 2024-05-24T00:58:39Z

Shall we remove the hold from this PR as we'll merge it into the freeze branch?

OSBotify · 2024-06-06T12:33:58Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.79-11 🚀

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

ZhenjaHorbach · 2024-07-17T16:17:32Z

src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx

@@ -32,7 +33,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
    const styles = useThemeStyles();
    const {translate} = useLocalize();
    const [policyTagLists, isMultiLevelTags] = useMemo(() => [PolicyUtils.getTagLists(policyTags), PolicyUtils.isMultiLevelTags(policyTags)], [policyTags]);
-
+    const hasEnabledOptions = OptionsListUtils.hasEnabledOptions(Object.values(policyTags ?? {}).flatMap(({tags}) => Object.values(tags)));


these changes are partly the cause of this issue
But root cause related with this PR and these changes

Since in this PR we pass errors separately from tag objects, we can't retrieve tags from the error object

Hayata Suenaga added 2 commits May 10, 2024 12:50

fix: when there is no active tags, prevent the user from requiring ta…

5b420eb

…gs in the workspace

fix: delete the log statement

790466c

hayata-suenaga self-assigned this May 10, 2024

hayata-suenaga marked this pull request as ready for review May 10, 2024 21:05

hayata-suenaga requested a review from a team as a code owner May 10, 2024 21:05

melvin-bot bot requested review from marcochavezf and removed request for a team May 10, 2024 21:06

hayata-suenaga changed the title ~~Prevent the user from requiring tags when there is no active tag~~ [HOLD App PR #41351]Prevent the user from requiring tags when there is no active tag May 10, 2024

hayata-suenaga requested a review from rushatgabhane May 10, 2024 21:08

hayata-suenaga mentioned this pull request May 10, 2024

[QBO] [$250] Workspace settings – “Members must tag all spend” is enabled when all tags are disabled #41309

Closed

6 tasks

hayata-suenaga changed the title ~~[HOLD App PR #41351]Prevent the user from requiring tags when there is no active tag~~ Prevent the user from requiring tags when there is no active tag May 13, 2024

Hayata Suenaga added 2 commits May 13, 2024 08:37

Merge branch 'main' into hayata-do-not-allow-users-from-requiring-tag…

68c786b

…s-when-there-is-no-active-tags

fix: duplicate declarations

a6a3c05

marcochavezf previously approved these changes May 13, 2024

View reviewed changes

marcochavezf self-requested a review May 13, 2024 18:39

Merge branch 'main' into hayata-do-not-allow-users-from-requiring-tag…

cf290b1

…s-when-there-is-no-active-tags

hayata-suenaga dismissed marcochavezf’s stale review via cf290b1 May 16, 2024 17:17

hayata-suenaga changed the title ~~Prevent the user from requiring tags when there is no active tag~~ [HOLD Merge Freeze] Prevent the user from requiring tags when there is no active tag May 16, 2024

hayata-suenaga changed the base branch from main to qbo-freeze-branch May 20, 2024 23:32

rushatgabhane approved these changes May 23, 2024

View reviewed changes

melvin-bot bot requested a review from Beamanator May 23, 2024 22:22

melvin-bot bot mentioned this pull request May 23, 2024

[Payment requested] Payment issue for E/App PR#42004 #42564

Closed

hayata-suenaga changed the title ~~[HOLD Merge Freeze] Prevent the user from requiring tags when there is no active tag~~ Prevent the user from requiring tags when there is no active tag May 24, 2024

hayata-suenaga merged commit b9da7f7 into qbo-freeze-branch May 24, 2024
19 checks passed

hayata-suenaga deleted the hayata-do-not-allow-users-from-requiring-tags-when-there-is-no-active-tags branch May 24, 2024 17:53

hayata-suenaga mentioned this pull request May 31, 2024

QBO freeze branch #42543

Merged

49 tasks

github-actions bot mentioned this pull request Jun 4, 2024

Deploy Checklist: New Expensify 2024-06-04 #43037

Closed

ZhenjaHorbach reviewed Jul 17, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevent the user from requiring tags when there is no active tag #42004

Prevent the user from requiring tags when there is no active tag #42004

hayata-suenaga commented May 10, 2024 •

edited

Loading

hayata-suenaga commented May 10, 2024

melvin-bot bot commented May 10, 2024

rushatgabhane commented May 13, 2024 •

edited

Loading

rushatgabhane commented May 13, 2024 •

edited

Loading

hayata-suenaga commented May 13, 2024

hayata-suenaga commented May 16, 2024 •

edited

Loading

hayata-suenaga commented May 17, 2024

rushatgabhane commented May 20, 2024

hayata-suenaga commented May 20, 2024

rushatgabhane commented May 21, 2024

hayata-suenaga commented May 21, 2024

hayata-suenaga commented May 22, 2024

hayata-suenaga commented May 23, 2024

rushatgabhane left a comment

melvin-bot bot commented May 23, 2024

melvin-bot bot commented May 23, 2024

trjExpensify commented May 24, 2024

OSBotify commented Jun 6, 2024

ZhenjaHorbach Jul 17, 2024 •

edited

Loading

Prevent the user from requiring tags when there is no active tag #42004

Prevent the user from requiring tags when there is no active tag #42004

Conversation

hayata-suenaga commented May 10, 2024 • edited Loading

Details

Tests / QA Steps

Offline tests

PR Author Checklist

Screenshots/Videos

hayata-suenaga commented May 10, 2024

melvin-bot bot commented May 10, 2024

rushatgabhane commented May 13, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rushatgabhane commented May 13, 2024 • edited Loading

hayata-suenaga commented May 13, 2024

hayata-suenaga commented May 16, 2024 • edited Loading

hayata-suenaga commented May 17, 2024

rushatgabhane commented May 20, 2024

hayata-suenaga commented May 20, 2024

rushatgabhane commented May 21, 2024

hayata-suenaga commented May 21, 2024

hayata-suenaga commented May 22, 2024

hayata-suenaga commented May 23, 2024

rushatgabhane left a comment

Choose a reason for hiding this comment

melvin-bot bot commented May 23, 2024

melvin-bot bot commented May 23, 2024

trjExpensify commented May 24, 2024

OSBotify commented Jun 6, 2024

ZhenjaHorbach Jul 17, 2024 • edited Loading

Choose a reason for hiding this comment

hayata-suenaga commented May 10, 2024 •

edited

Loading

rushatgabhane commented May 13, 2024 •

edited

Loading

rushatgabhane commented May 13, 2024 •

edited

Loading

hayata-suenaga commented May 16, 2024 •

edited

Loading

ZhenjaHorbach Jul 17, 2024 •

edited

Loading