[CRITICAL] Adjust <WorkspaceWorkflowsApprovalsApproverPage /> for Approver Selection by blazejkustra · Pull Request #46510 · Expensify/App

blazejkustra · 2024-07-30T15:45:47Z

Details

UI changes

WorkspaceWorkflowsApprovalsApproverPage is split into two components:

WorkspaceWorkflowsApprovalsApproverPageNew - The new refreshed UI with logic changes, this variant is displayed only when canUseWorkflowsAdvancedApproval beta is turned on + approverIndex screen param has to be provided.
WorkspaceWorkflowsApprovalsApproverPageOld - The old screen left for backward compatibility, it will be displayed for the old flow:

Onyx actions:

Clicking on an approver will set the approver with setApprovalWorkflowApprover action (more info in the Onyx setup section) and navigate to the ‘Create approval’ page (‘settings/workspaces/:policyID/workflows/approvals/new’) or ‘Edit approval’ page (‘settings/workspaces/:policyID/workflows/approvals/:firstApproverEmail/edit’) based on isBeingEdited property in Onyx.

Fixed Issues

$ #45955
PROPOSAL: N/A

Tests

Open Workflows page (it has to be turned on in More features settings page)
Locally edit canUseWorkflowsAdvancedApproval function to return true (or use canUseWorkflowsAdvancedApproval beta)
Click on the 'Add approval workflow' button, it should navigate to 'Expenses from' page, select some users and go to the next step
Verify that Approver page is displayed
- "Find a member" input should filter users
- You can select and deselect an approver
Next button should navigate to the create new workflow page

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

android.webm

Android: mWeb Chrome

android-web.webm

iOS: Native

ios.mp4

iOS: mWeb Safari

ios-web.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-08-02.at.09.09.38.mov

MacOS: Desktop

desktop.mov

…ws/approver

melvin-bot · 2024-08-01T07:19:33Z

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

blazejkustra · 2024-08-01T07:21:06Z

To push things forward I opened the PR without videos, I'm sick and will add them later. @suneox please have a look at the PR 😄

suneox · 2024-08-01T07:25:37Z

To push things forward I opened the PR without videos, I'm sick and will add them later. @suneox please have a look at the PR 😄

@blazejkustra Sure, how can I access the document to get more context? I’ve requested access docs via email ptcong411@gmail.com.

blazejkustra · 2024-08-01T07:28:37Z

To push things forward I opened the PR without videos, I'm sick and will add them later. @suneox please have a look at the PR 😄

@blazejkustra Sure, how can I access the document to get more context? I’ve requested access via email ptcong411@gmail.com.

I shared it with you 🚀

suneox · 2024-08-01T15:25:36Z

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-08-02.at.22.18.09.mp4

Android: mWeb Chrome

Screen.Recording.2024-08-02.at.22.16.48.mp4

iOS: Native

Screen.Recording.2024-08-02.at.22.06.49.mp4

iOS: mWeb Safari

Screen.Recording.2024-08-02.at.22.00.31.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-08-02.at.21.56.00.mp4

MacOS: Desktop

Screen.Recording.2024-08-02.at.22.04.15.mp4

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx

… screen

suneox

Works as expected on all platforms, and the change set LGTM

tgolen · 2024-08-02T15:45:27Z

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx

+    return <WorkspaceWorkflowsApprovalsApproverPageOld {...props} />;
+}
+
+function WorkspaceWorkflowsApprovalsApproverPageNew({policy, personalDetails, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsApproverPageProps) {


Would you mind changing the name of this component to WorkspaceWorkflowsApprovalsApproverPageBeta and I would just keep the name of the "old" component the way it was before. The only reason is that "new" and "old" hold no meaning once this PR is merged.

tgolen

Thanks!

OSBotify · 2024-08-02T18:05:43Z

✋ 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-08-06T04:28:32Z

🚀 Deployed to staging by https://github.com/tgolen in version: 9.0.17-0 🚀

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

OSBotify · 2024-08-07T22:04:22Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

OSBotify · 2024-08-08T04:53:59Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

OSBotify · 2024-08-08T20:05:23Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

tgolen · 2024-08-30T14:19:08Z

@suneox Did you ever get paid for your C+ review of this PR? If not, I think we need to handle that in #45956 before the issue can be closed out.

suneox · 2024-08-30T16:47:28Z

@suneox Did you ever get paid for your C+ review of this PR? If not, I think we need to handle that in #45956 before the issue can be closed out.

Thank you, I've received the payment in #45955

blazejkustra added 3 commits July 30, 2024 17:23

Implement selection list for selecting approver

14266a2

Fix couple of bugs

7d3b2fe

Merge branch 'approval-workflows/expenses-from' into approval-workflo…

bab3060

…ws/approver

blazejkustra changed the title ~~Approval workflows/approver~~ [CRITICAL] Adjust <WorkspaceWorkflowsApprovalsApproverPage /> for Approver Selection Jul 30, 2024

blazejkustra mentioned this pull request Jul 31, 2024

[CRITICAL] Implement <WorkspaceWorkflowsApprovalsExpensesFromPage /> for Member Selection #46484

Merged

53 tasks

blazejkustra added 3 commits July 31, 2024 11:10

Remove can select multiple flag

1504f23

Fix TS

33f65cf

Merge branch 'main' into approval-workflows/approver

edd1b48

blazejkustra marked this pull request as ready for review August 1, 2024 07:19

blazejkustra requested a review from a team as a code owner August 1, 2024 07:19

melvin-bot bot requested review from suneox and removed request for a team August 1, 2024 07:19

suneox reviewed Aug 1, 2024

View reviewed changes

src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx Show resolved Hide resolved

blazejkustra added 3 commits August 2, 2024 08:56

Merge branch 'main' into approval-workflows/approver

271d31d

Fix that wrong approver was selected when going back to expenses from…

6d6a4a6

… screen

Fix typecheck

78ce265

blazejkustra requested a review from suneox August 2, 2024 14:25

suneox approved these changes Aug 2, 2024

View reviewed changes

melvin-bot bot requested a review from tgolen August 2, 2024 15:33

tgolen requested changes Aug 2, 2024

View reviewed changes

Change names of components

d933469

tgolen approved these changes Aug 2, 2024

View reviewed changes

tgolen merged commit 13c0ef7 into Expensify:main Aug 2, 2024

github-actions bot mentioned this pull request Aug 6, 2024

Deploy Checklist: New Expensify 2024-08-06 #46849

Closed

83 tasks

melvin-bot bot mentioned this pull request Aug 7, 2024

[PAID] [CRITICAL] [Advanced Approval Workflows] Implement <WorkspaceWorkflowsApprovalsExpensesFromPage /> for Member Selection #45955

Closed

blazejkustra mentioned this pull request Aug 27, 2024

Advanced approval - Approver is no longer after coming from "Expenses from" page #48084

Closed

6 tasks

tgolen mentioned this pull request Sep 27, 2024

[CRITICAL] [Advanced Approval Workflows] Adjust <WorkspaceWorkflowsApprovalsApproverPage /> for Approver Selection #45956

Closed

rafecolton mentioned this pull request Jun 18, 2025

Incorrect Labeling of Workspace Owner in Approval Workflow #63060

Merged

51 tasks

Conversation

blazejkustra commented Jul 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

UI changes

Onyx actions:

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Aug 1, 2024

Uh oh!

blazejkustra commented Aug 1, 2024

Uh oh!

suneox commented Aug 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blazejkustra commented Aug 1, 2024

Uh oh!

suneox commented Aug 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

suneox left a comment

Choose a reason for hiding this comment

Uh oh!

tgolen Aug 2, 2024

Choose a reason for hiding this comment

Uh oh!

tgolen left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Aug 2, 2024

Uh oh!

OSBotify commented Aug 6, 2024

Uh oh!

OSBotify commented Aug 7, 2024

Uh oh!

OSBotify commented Aug 8, 2024

Uh oh!

OSBotify commented Aug 8, 2024

Uh oh!

tgolen commented Aug 30, 2024

Uh oh!

suneox commented Aug 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

blazejkustra commented Jul 30, 2024 •

edited

Loading

suneox commented Aug 1, 2024 •

edited

Loading

suneox commented Aug 1, 2024 •

edited

Loading