[CP Staging][CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow #47249

blazejkustra · 2024-08-12T17:11:27Z

Details

Link to the doc.

UI changes

Fixed Issues

$ #45953
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, and add an approval workflow (or more)
After creating one or more workflows click on the approval workflow section to edit an existing workflow
- You should be able to change members, update approvers and remove workflows
- Make sure to test circular references (one workflow: A - > B, second workflow B -> A), approvers assigned to multiple workflows

Offline tests

While offline make sure Offline Pattern B is used, approval workflow sections should be greyed out after removing/updating a workflow.

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

web.mov

MacOS: Desktop

desktop.mov

…rkflows/edit-screen

melvin-bot · 2024-08-12T17:11:32Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

…rkflows/edit-screen

DylanDylann · 2024-08-14T07:00:21Z

The strange bug: Not found page when removing the first approver and add another approver again

Uploading Screen Recording 2024-08-14 at 13.55.40.mov…

Resend video to Slack

DylanDylann · 2024-08-14T08:01:10Z

src/libs/actions/Workflow.ts

@@ -169,7 +170,13 @@ function updateApprovalWorkflow(policyID: string, approvalWorkflow: ApprovalWork
        },
    ];

-    const parameters: UpdateWorkspaceApprovalParams = {policyID, authToken, employees: JSON.stringify(Object.values(updatedEmployees))};
+    // const newDefaultApprover = approvalWorkflow.isDefault ? approvalWorkflow.approvers[0].email : undefined;


@blazejkustra What problem here?

This 😢 #47344 (comment)

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

DylanDylann · 2024-08-14T08:42:49Z

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.

I can't upload video to GH today

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Uploading Screen Recording 2024-08-14 at 16.06.47.mov…

MacOS: Desktop

Uploading Screen Recording 2024-08-14 at 16.07.17.mov…

rlinoz · 2024-08-14T11:33:49Z

Asked for CP here: https://expensify.slack.com/archives/C07J32337/p1723635196903979

…ws/edit-screen [CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow (cherry picked from commit 5cd5c16) (CP triggered by mountiny)

OSBotify · 2024-08-14T11:48:00Z

✋ 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-14T12:10:49Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.20-2 🚀

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

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

lanitochka17 · 2024-08-16T14:46:01Z

Approve button not displayed for updated approver

Reproducible in production:

Yes

Expected Result:

The approve button is displayed for the updated approver

Actual Result:

There is no approve button for the updated approver, and the expense preview is empty

Actions Performed:

precondition: as admin create an workspace, invite a submitter and approver, and set an approval workflow

Log in as submitter and submit some expenses

Log in as admin

Navigate to the workspace settings and invite another approver

Change the approver to the newly invited one in the approval workflow

Log in as the updated approver

Workaround:

Unknown

Notes/Images/Video:

Bug6572030_1723643861881.Recording__681.mp4

rlinoz · 2024-08-16T17:59:58Z

Is the above not happening anymore? 🤔

Beamanator · 2024-08-16T19:55:22Z

FYI I believe this was deployed to prod yesterday, from this checklist - #47356

blazejkustra added 4 commits August 12, 2024 13:48

Start working on edit screen

d51a8da

Merge branch 'approval-workflows/create-edit-screen' into approval-wo…

2438780

…rkflows/edit-screen

Bring back old canUseAllBetas

3ed8226

Improve edit logic

25d6df7

blazejkustra added 16 commits August 12, 2024 19:28

Merge branch 'approval-workflows/create-edit-screen' into approval-wo…

546a644

…rkflows/edit-screen

Merge branch 'approval-workflows/create-edit-screen' into approval-wo…

4501ced

…rkflows/edit-screen

Rename flow to action

aca6ce4

Add missing translations

92ddb88

Fix the logic behind updating employees

dc013da

Use new names for variables

bd6e8c0

Start testing removal flow

7439819

Merge branch 'approval-workflows/create-edit-screen' into approval-wo…

8b71e1a

…rkflows/edit-screen

Change what validation function returns

1ef7ad2

Parse email param

368109e

Clean the logic for opening edit screen

90a83e2

Hide header on edit screens

db71a31

Attach the update and remove commands to edit screen

2560c8e

Adjust the logic on create screen for better clarity

2588c7c

Adjust tests to newer convertApprovalWorkflowToPolicyEmployees logic

6a85197

Fix navigation bug when going back from after removal

b3f6d4c

blazejkustra changed the title ~~Approval workflows/edit screen~~ [CRITICAL] [Advanced Approval Workflows] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow Aug 13, 2024

blazejkustra added 2 commits August 13, 2024 13:47

Merge branch 'approval-workflows/create-edit-screen' into approval-wo…

669e3c0

…rkflows/edit-screen

Fix opening edit page with an url

7cc82a4

blazejkustra changed the title ~~[CRITICAL] [Advanced Approval Workflows] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow~~ [CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow Aug 13, 2024

blazejkustra added 4 commits August 13, 2024 15:21

Fix crash on ios

f5e26de

Fix removing members

04a1f3d

Merge branch 'main' into approval-workflows/edit-screen

d0e1875

Improve the comment

48f2ac8

blazejkustra marked this pull request as ready for review August 13, 2024 15:12

blazejkustra added 2 commits August 14, 2024 07:51

Fix a bug that approvalWorkflow wasn't updated in some cases

5328303

Show not found page instead of going back

00868ec

blazejkustra requested review from DylanDylann and tgolen August 14, 2024 06:00

blazejkustra added 2 commits August 14, 2024 08:17

Remove unused import

99938ed

Merge branch 'main' into approval-workflows/edit-screen

2c2b20e

Fix Not found page when removing the first approver

f76850a

DylanDylann reviewed Aug 14, 2024

View reviewed changes

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

DylanDylann reviewed Aug 14, 2024

View reviewed changes

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

DylanDylann approved these changes Aug 14, 2024

View reviewed changes

blazejkustra added 3 commits August 14, 2024 12:43

Uncomment changing the default approver

d4d225d

Enable button when offline

30b99d2

Update default approver in optimisticData

d18d2f0

rlinoz approved these changes Aug 14, 2024

View reviewed changes

rlinoz merged commit 5cd5c16 into Expensify:main Aug 14, 2024
15 checks passed

rlinoz changed the title ~~[CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow~~ [CP Staging][CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow Aug 14, 2024

mountiny assigned blazejkustra Aug 14, 2024

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Aug 14, 2024

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

Deploy Checklist: New Expensify 2024-08-13 #47356

Closed

72 tasks

DylanDylann mentioned this pull request Aug 21, 2024

[CRITICAL] [Advanced Approval Workflows] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow #45953

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging][CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow #47249

[CP Staging][CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow #47249

blazejkustra commented Aug 12, 2024 •

edited

Loading

melvin-bot bot commented Aug 12, 2024

DylanDylann commented Aug 14, 2024 •

edited

Loading

DylanDylann Aug 14, 2024

blazejkustra Aug 14, 2024

DylanDylann commented Aug 14, 2024 •

edited

Loading

rlinoz commented Aug 14, 2024

OSBotify commented Aug 14, 2024

OSBotify commented Aug 14, 2024

lanitochka17 commented Aug 16, 2024

Approve button not displayed for updated approver

Reproducible in production:

Expected Result:

Actual Result:

Actions Performed:

Workaround:

Notes/Images/Video:

rlinoz commented Aug 16, 2024

Beamanator commented Aug 16, 2024

[CP Staging][CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow #47249

[CP Staging][CRITICAL] Implement <WorkspaceWorkflowsApprovalsEditPage /> for Editing Workflow #47249

Conversation

blazejkustra commented Aug 12, 2024 • edited Loading

Details

UI changes

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 12, 2024

DylanDylann commented Aug 14, 2024 • edited Loading

DylanDylann Aug 14, 2024

Choose a reason for hiding this comment

blazejkustra Aug 14, 2024

Choose a reason for hiding this comment

DylanDylann commented Aug 14, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rlinoz commented Aug 14, 2024

OSBotify commented Aug 14, 2024

OSBotify commented Aug 14, 2024

lanitochka17 commented Aug 16, 2024

Approve button not displayed for updated approver

Reproducible in production:

Expected Result:

Actual Result:

Actions Performed:

Workaround:

Notes/Images/Video:

rlinoz commented Aug 16, 2024

Beamanator commented Aug 16, 2024

blazejkustra commented Aug 12, 2024 •

edited

Loading

DylanDylann commented Aug 14, 2024 •

edited

Loading

DylanDylann commented Aug 14, 2024 •

edited

Loading