Skip to content

Fix available workspace logic #60872

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

Merged
merged 23 commits into from
May 7, 2025
Merged

Conversation

luacmartins
Copy link
Contributor

@luacmartins luacmartins commented Apr 24, 2025

Explanation of Change

Simplifies the logic for the Change workspace action and update tests.

Fixed Issues

$ #59876

Tests

Pre-conditions:

  • An employee account
  • An approver account
  • An admin account
  • Workspace with all members above (except for employee)
  • Workflow is configured to Add approvals and approver set to approver account
  1. [Employee] Create an expense to the Admin 1:1 (not via the workspace chat)
  2. [Employee] Click into the Report > More, verify that you don't see the Change workspace option
  3. [Admin] Click into the Report > More, verify that you see the Change workspace option
  4. [Admin] Change the workspace to the workspace created as part of the pre-conditions
  5. [Admin] verify that the report is changed to the workspace and the employee is invited to the workspace
  6. [Employee] Submit an IOU to the Admin 1:1 (not via the workspace chat)
  7. [Employee] Verify that you see the Change workspace option
  8. [Employee] Change the workspace and verify that it works
  9. [Employee] Submit an expense to the workspace
  10. [Employee] Verify that you see the Change workspace option
  11. [Approver] Verify that you see the Change workspace option
  12. [Approver] Approve the report
  13. [Approver] Verify that you don't see the Change workspace option
  14. [Employee] Verify that you don't see the Change workspace option
  15. [Admin] Verify that you see the Change workspace option
  • Verify that no errors appear in the JS console

Offline tests

N/A

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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@luacmartins luacmartins changed the title Fix avaialble workspace logic Fix available workspace logic Apr 25, 2025
@luacmartins luacmartins marked this pull request as ready for review April 30, 2025 21:52
@luacmartins luacmartins requested a review from a team as a code owner April 30, 2025 21:52
@melvin-bot melvin-bot bot requested review from rayane-d and removed request for a team April 30, 2025 21:52
Copy link

melvin-bot bot commented Apr 30, 2025

@rayane-d 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]

@luacmartins
Copy link
Contributor Author

@rayane-d I'll add videos tomorrow. Please start reviewing though

@MelvinBot
Copy link

MelvinBot commented May 1, 2025

🎉 Snyk checks have passed. No issues have been found so far.

security/snyk check is complete. No issues have been found. (View Details)

license/snyk check is complete. No issues have been found. (View Details)

@luacmartins
Copy link
Contributor Author

@rayane-d updated! let's continue review

Copy link
Contributor

@rayane-d rayane-d left a comment

Choose a reason for hiding this comment

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

The test is passing as expected 👍

recording.mov

@rayane-d
Copy link
Contributor

rayane-d commented May 6, 2025

@luacmartins I encountered an issue, possibly not related to the changes in this PR, in step 8: the "changed the workspace to..." report action appears in both the workspace chat and the expense report:

Screenshot 2025-05-06 at 11 29 39 AM Screenshot 2025-05-06 at 11 30 07 AM

@luacmartins
Copy link
Contributor Author

hmm that's weird. Let me take a look

@luacmartins
Copy link
Contributor Author

I fixed that issue, but I see a failing test now and I also saw another issue where the wrong report preview gets updated, so I'll look at that next.

@luacmartins
Copy link
Contributor Author

luacmartins commented May 7, 2025

@rayane-d the other issue I spotted above seems to be a BE issue and I'll address that separately. Please continue reviewing this one.

Copy link
Contributor

@rayane-d rayane-d left a comment

Choose a reason for hiding this comment

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

LGTM and tests well 👍

@melvin-bot melvin-bot bot requested a review from mollfpr May 7, 2025 21:24
Copy link

melvin-bot bot commented May 7, 2025

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

@rayane-d
Copy link
Contributor

rayane-d commented May 7, 2025

@rushatgabhane feel free to continue reviewing it as well

@rushatgabhane
Copy link
Member

@rayane-d does it still need my review? I read the code and done some tests. But it looks like you've completed the checklist so should I further invest my time here?

@luacmartins
Copy link
Contributor Author

Chatted with @rushatgabhane 1:1 and he'll get the next review. Thanks for the effort everyone!

@luacmartins luacmartins removed the request for review from rushatgabhane May 7, 2025 21:46
Copy link
Contributor

@marcochavezf marcochavezf left a comment

Choose a reason for hiding this comment

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

Code LGTM

@luacmartins luacmartins merged commit 2c2af0a into main May 7, 2025
22 checks passed
@luacmartins luacmartins deleted the cmartins-fixAvaialbleWorkspaceLogic branch May 7, 2025 21:53
Copy link
Contributor

github-actions bot commented May 8, 2025

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

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

Copy link
Contributor

github-actions bot commented May 9, 2025

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.1.43-5 🚀

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

Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 9.1.44-8 🚀

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

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.

6 participants