Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Categories & Tags - Row is not grayed out entirely when disabled offline. #38443

Merged
merged 6 commits into from
Mar 25, 2024

Conversation

Krishna2323
Copy link
Contributor

@Krishna2323 Krishna2323 commented Mar 16, 2024

Details

Fixed Issues

$ #38262
PROPOSAL: #38262 (comment)

Tests

  1. Log in as an admin of a paid policy group and open the workspace categories settings.
  2. Go Offline
  3. Click on any category.
  4. Toggle the Enable category switch.
  5. Verify that the updated category is greyed out
  6. Open the workspace tags settings of the same policy or any paid policy group.
  7. Go Offline
  8. Click on any tag.
  9. Toggle the Enable tag switch.
  10. Verify that the updated tag is greyed out
  • Verify that no errors appear in the JS console

Offline tests

  1. Log in as an admin of a paid policy group and open the workspace categories settings.
  2. Go Offline
  3. Click on any category.
  4. Toggle the Enable category switch.
  5. Verify that the updated category is greyed out
  6. Open the workspace tags settings of the same policy or any paid policy group.
  7. Go Offline
  8. Click on any tag.
  9. Toggle the Enable tag switch.
  10. Verify that the updated tag is greyed out

QA Steps

  1. Log in as an admin of a paid policy group and open the workspace categories settings.
  2. Go Offline
  3. Click on any category.
  4. Toggle the Enable category switch.
  5. Verify that the updated category is greyed out
  6. Open the workspace tags settings of the same policy or any paid policy group.
  7. Go Offline
  8. Click on any tag.
  9. Toggle the Enable tag switch.
  10. Verify that the updated tag is greyed out
  • 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_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4

@Krishna2323 Krishna2323 requested a review from a team as a code owner March 16, 2024 20:43
@melvin-bot melvin-bot bot removed the request for review from a team March 16, 2024 20:43
Copy link

melvin-bot bot commented Mar 16, 2024

@cubuspl42 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 melvin-bot bot requested a review from cubuspl42 March 16, 2024 20:43
@allroundexperts
Copy link
Contributor

Tags have already been fixed. @Krishna2323 you might want to update the PR title.

@Krishna2323
Copy link
Contributor Author

@allroundexperts, do you have link which pr/commit fixed it? I don't think it has been fixed.

@allroundexperts
Copy link
Contributor

#38332

@Krishna2323
Copy link
Contributor Author

Krishna2323 commented Mar 17, 2024

@cubuspl42, do you prefer adding pendingAction field or should we do it like Object.values(value.pendingFields ?? {}).length > 0. I asked because we can update multiple things in tag/category and pendingFields is always updated, we might miss pendingAction when we update other thing in tag/category.

Edit: we can use Object.values(value.pendingFields ?? {}).length > 0 with || condition. I think thats a better option.

pendingAction: value.pendingAction || Object.values(value.pendingFields ?? {}).length > 0

@Krishna2323
Copy link
Contributor Author

@allroundexperts, I think you misunderstood this issue, its about the tags/categories not being greyed out when updated.

@allroundexperts
Copy link
Contributor

Ah gotcha. False ⏰

@cubuspl42
Copy link
Contributor

@cubuspl42, do you prefer adding pendingAction field or should we do it like Object.values(value.pendingFields ?? {}).length > 0. I asked because we can update multiple things in tag/category and pendingFields is always updated, we might miss pendingAction when we update other thing in tag/category.

Edit: we can use Object.values(value.pendingFields ?? {}).length > 0 with || condition. I think thats a better option.

pendingAction: value.pendingAction || Object.values(value.pendingFields ?? {}).length > 0

Uuhh, I'm... not sure. Are you saying you found a bug/undesired behavior in your solution? Or are you asking me to confirm whether the scenario is actually a bug?

If you are sure that you found a bug/undesired behavior, fix it. It's easiest to discuss the code in the "Files changed" view, after it's actually written.

If you're unsure about how to classify this scenario and ask for help in this aspect, please provide more specific reproduction steps, similarly as we do in the "Tests" steps.

@Krishna2323
Copy link
Contributor Author

sorry @cubuspl42, I asked this question in #38443 (comment), you can ignore.

src={Expensicons.ArrowRight}
fill={theme.icon}
/>
Object.values(policyTagList.tags || []).map((value) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know we only update this function, but as we touch these lines, let's change the name value to tag or policyTag

@cubuspl42
Copy link
Contributor

@Krishna2323

could you however align the tags behaviour with categories in your PR please? Thank you

Is this request done?

@cubuspl42
Copy link
Contributor

Is this request done?

Bump on the question 🙂 I just want to confirm whether what Vit asked for is already taken care of.

@Krishna2323
Copy link
Contributor Author

@cubuspl42, sorry for delay, I'm currently looking at that, it seems like it has been fixed on the main. We can just move forward with what we currently have. I'm adding recordings.

@Krishna2323
Copy link
Contributor Author

@cubuspl42, I'm facing a weird issue on android simulator, it always stays offline. Do you have any suggestions? I tried creating different versions/models.
android

@cubuspl42
Copy link
Contributor

Cold booting sometimes helps, but if freshly created virtual devices are offline, then I'm not sure 🤔

@Krishna2323
Copy link
Contributor Author

@cubuspl42, thanks for looking into that, seems like there was an issue with the hotel's wifi, it got fixed when I connected to my mobile's wifi.

@Krishna2323
Copy link
Contributor Author

@cubuspl42 recordings added.

@cubuspl42
Copy link
Contributor

cubuspl42 commented Mar 21, 2024

Is it expected that I can't open the category/tag details while the UI element is grayed out?

Edit: Not expected.

@Krishna2323
Copy link
Contributor Author

@cubuspl42, can you pls review if you have sometime, we don't need to make any further changes? Thanks

@cubuspl42
Copy link
Contributor

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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
categories-gray-out-android-compressed.mp4
Android: mWeb Chrome
categories-gray-out-android-web-compressed.mp4
iOS: Native
categories-gray-out-ios-compressed.mp4
iOS: mWeb Safari
categories-gray-out-ios-web-compressed.mp4
MacOS: Chrome / Safari
categories-gray-out-web-converted.mp4
MacOS: Desktop

@melvin-bot melvin-bot bot requested a review from mountiny March 25, 2024 15:56
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mountiny mountiny merged commit 1b0fe6d into Expensify:main Mar 25, 2024
16 of 17 checks passed
@OSBotify
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants