#45951 & #45958: Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals #46562

Guccio163 · 2024-07-31T09:27:23Z

Details

This PR adds a view of more than the default approval workflows; The buttons should be presable, but their functionalities are yet to be implemented. This PR is UI-focused.

UI with enabled canUseWorkflowsAdvancedApproval should look like this:

Meanwhile, account without canUseWorkflowsAdvancedApproval permission should remain unchanged:

Fixed Issues

$ #45951
$ #45958
PROPOSAL:

Tests

Right now, canUseWorkflowsAdvancedApproval permission is switched off, to see the new layout, make function src/libs/Permissions.tsx/canUseWorkflowsAdvancedApproval return true.
Open WorkspaceWorkflowPage.tsx and check if page looks like this:

Check if every section redirects to ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EDIT
Add approvals button's update involved only UI, it's functionality will be added in [CRITICAL] [Advanced Approval Workflows] Implement <WorkspaceWorkflowsApprovalsCreatePage /> for Workflow Creation #45954

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

N/A

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

mWeb-android.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mWeb-ios.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

…e-mansion-labs/expensify-app-fork into Guccio163/45951_implementApprovalWorkflowSection

…-fork into Guccio163/45951_implementApprovalWorkflowSection

src/components/Temp.tsx

src/components/ApprovalWorkflowSection.tsx

…1_implementApprovalWorkflowSection

…-fork into Guccio163/45951_implementApprovalWorkflowSection

Guccio163 · 2024-07-31T14:01:35Z

In videos you can see that all approvers are with their order prefix, even if there is only 1 approver; I just fixed it, just didn't update the videos:

Guccio163 · 2024-07-31T14:10:18Z

PR is ready for review from C+; I'm OOO until the end of the week, so any change before that will be handled by @blazejkustra, good luck!👋

melvin-bot · 2024-07-31T14:18:14Z

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

shubham1206agra · 2024-07-31T14:29:41Z

@blazejkustra @Guccio163 One question.

Does #45892 help improve this PR in some way?

Guccio163 · 2024-07-31T14:54:41Z

@shubham1206agra function from #45892 is directly used by this PR, we decided to link them together to speed up the process and not to block the #45951

shubham1206agra · 2024-08-01T16:51:23Z

assets/images/user-check.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"


Hmm. This looks wrong.

What exactly? @shubham1206agra

I used what @shawnborton sent here

Try this one, that's my fault: user-check 2.svg.zip

Thanks! It's changed @shubham1206agra

…tion

blazejkustra · 2024-08-02T07:30:33Z

@shubham1206agra I merged the newest main for you 🚀

shubham1206agra · 2024-08-02T15:47:41Z

@blazejkustra I am getting this error on toggling Approval section.

{
    "jsonCode": 404,
    "message": "404 Account not found",
    "onyxData": [],
    "requestID": "8acf33b07bc959b2-DEL"
}

shubham1206agra · 2024-08-02T15:54:10Z

src/components/ApprovalWorkflowSection.tsx

+
+                {approvalWorkflow.approvers.map((approver, index) => (
+                    <View key={approver.email}>
+                        <View style={{height: 16, width: 1, backgroundColor: theme.border, marginLeft: 19}} />


@blazejkustra Can you please explain me the choice of style here (especially marginLeft)? And can we use styles here.

These are the styles for the vertical line from the screenshot:

I moved the styles as requested 👌

marginLeft is set to 19 to match the designs @shubham1206agra:

blazejkustra · 2024-08-02T16:14:24Z

@blazejkustra I am getting this error on toggling Approval section.
{
    "jsonCode": 404,
    "message": "404 Account not found",
    "onyxData": [],
    "requestID": "8acf33b07bc959b2-DEL"
}

Is this connected to this PR? 🤔

shawnborton · 2024-08-02T17:51:26Z

It looks like we aren't using a selected BG color for the selected approver. Is that something we are working on in this PR? Or should we handle that elsewhere?

shawnborton · 2024-08-02T17:56:18Z

This is generally feeling good. cc @Expensify/design - I added you both to the beta in case you want to test the adhoc build above. You might need to clear cache from Settings > Troubleshoot.

Just confirming, do we want to truncate after two lines here? cc @JmillsExpensify

…tion

blazejkustra · 2024-08-05T07:34:05Z

It looks like we aren't using a selected BG color for the selected approver. Is that something we are working on in this PR? Or should we handle that elsewhere?

The screen you are seeing is still the old Approver screen, meaning it will be handled in a future PR. Although, I thought it should be highligthed only when hovering over the item like in other selection lists in the app:

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

Is using a selected BG color for the selected approver a novelty in the app or is it used somewhere? @shawnborton

…-fork into Guccio163/45951_implementApprovalWorkflowSection

shubham1206agra · 2024-08-05T09:58:03Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

tgolen · 2024-08-05T14:22:36Z

src/components/ApprovalWorkflowSection.tsx

+import Text from './Text';
+
+type ApprovalWorkflowSectionProps = {
+    approvalWorkflow: ApprovalWorkflow;


Please add /** */ style comments to each prop

Just added, please take a quick look if they're okay :)

tgolen

Thank you!

OSBotify · 2024-08-05T15:27:06Z

✋ 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:44Z

🚀 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:34Z

🚀 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:54:11Z

🚀 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:35Z

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

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

blazejkustra and others added 6 commits July 27, 2024 12:19

Update readme

517bf4d

wip

650eda9

Merge branch 'Guccio163/45949-divide_workflows' of github.com:softwar…

9e72afd

…e-mansion-labs/expensify-app-fork into Guccio163/45951_implementApprovalWorkflowSection

section ready, subsections not working

c91b34a

useMemo and ts fix

dd28d1b

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

581997b

…-fork into Guccio163/45951_implementApprovalWorkflowSection

blazejkustra suggested changes Jul 31, 2024

View reviewed changes

src/components/Temp.tsx Outdated Show resolved Hide resolved

src/components/ApprovalWorkflowSection.tsx Outdated Show resolved Hide resolved

src/components/ApprovalWorkflowSection.tsx Outdated Show resolved Hide resolved

Guccio163 added 9 commits July 31, 2024 12:15

add navigation to approval edit

27cebe1

approverName and menuItem propagation problem

822b5c5

Merge branch 'approval-workflows/toLocaleOrdinal' into Guccio163/4595…

c83040a

…1_implementApprovalWorkflowSection

toLocaleOrdinal fix, linking to approval section

ab4c82f

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

3df09af

…-fork into Guccio163/45951_implementApprovalWorkflowSection

Temp deleted, sections' props added

7d6b856

undo react-native.d.ts change

42c370f

undo package.json

d8291fd

toLocale fix2, updates

9659c61

Guccio163 changed the title ~~#45951 Implement <ApprovalWorkflowSection /> component~~ #45951 Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals Jul 31, 2024

Guccio163 changed the title ~~#45951 Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals~~ #45951 & #45958: Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals Jul 31, 2024

Guccio163 added 2 commits July 31, 2024 15:42

unclickable MenuItem fixed

741cd37

approver naming fixed

ca527d1

Guccio163 marked this pull request as ready for review July 31, 2024 14:18

Guccio163 requested review from a team as code owners July 31, 2024 14:18

melvin-bot bot requested review from shubham1206agra and removed request for a team July 31, 2024 14:18

shubham1206agra reviewed Aug 1, 2024

View reviewed changes

blazejkustra added 2 commits August 1, 2024 20:19

Change the icon to the correct one

22df581

Merge branch 'main' into Guccio163/45951_implementApprovalWorkflowSec…

a639123

…tion

shubham1206agra reviewed Aug 2, 2024

View reviewed changes

Move vertical line styles

fc835a1

Merge branch 'main' into Guccio163/45951_implementApprovalWorkflowSec…

27e14eb

…tion

Guccio163 added 2 commits August 5, 2024 10:35

toLocaleString refactor

04f7776

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

88d6894

…-fork into Guccio163/45951_implementApprovalWorkflowSection

shubham1206agra approved these changes Aug 5, 2024

View reviewed changes

melvin-bot bot requested a review from tgolen August 5, 2024 09:58

safeguard approvers' keys

5478c6e

tgolen requested changes Aug 5, 2024

View reviewed changes

props annotations

6fb0b6e

tgolen approved these changes Aug 5, 2024

View reviewed changes

tgolen merged commit 02d0d61 into Expensify:main Aug 5, 2024
15 checks passed

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

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

Closed

83 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#45951 & #45958: Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals #46562

#45951 & #45958: Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals #46562

Guccio163 commented Jul 31, 2024 •

edited

Loading

Guccio163 commented Jul 31, 2024

Guccio163 commented Jul 31, 2024

melvin-bot bot commented Jul 31, 2024

shubham1206agra commented Jul 31, 2024

Guccio163 commented Jul 31, 2024

shubham1206agra Aug 1, 2024

blazejkustra Aug 1, 2024

blazejkustra Aug 1, 2024

shawnborton Aug 1, 2024

blazejkustra Aug 1, 2024

blazejkustra commented Aug 2, 2024

shubham1206agra commented Aug 2, 2024

shubham1206agra Aug 2, 2024 •

edited

Loading

blazejkustra Aug 2, 2024

blazejkustra Aug 2, 2024 •

edited

Loading

blazejkustra commented Aug 2, 2024

shawnborton commented Aug 2, 2024

shawnborton commented Aug 2, 2024

blazejkustra commented Aug 5, 2024

shubham1206agra commented Aug 5, 2024

tgolen Aug 5, 2024

Guccio163 Aug 5, 2024

tgolen left a comment

OSBotify commented Aug 5, 2024

OSBotify commented Aug 6, 2024

OSBotify commented Aug 7, 2024

OSBotify commented Aug 8, 2024

OSBotify commented Aug 8, 2024

		@@ -0,0 +1,10 @@
		<?xml version="1.0" encoding="utf-8"?>
		<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

#45951 & #45958: Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals #46562

#45951 & #45958: Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals #46562

Conversation

Guccio163 commented Jul 31, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Guccio163 commented Jul 31, 2024

Guccio163 commented Jul 31, 2024

melvin-bot bot commented Jul 31, 2024

shubham1206agra commented Jul 31, 2024

Guccio163 commented Jul 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blazejkustra commented Aug 2, 2024

shubham1206agra commented Aug 2, 2024

shubham1206agra Aug 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blazejkustra Aug 2, 2024 • edited Loading

Choose a reason for hiding this comment

blazejkustra commented Aug 2, 2024

shawnborton commented Aug 2, 2024

shawnborton commented Aug 2, 2024

blazejkustra commented Aug 5, 2024

shubham1206agra commented Aug 5, 2024

Reviewer Checklist

Screenshots/Videos

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tgolen left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 5, 2024

OSBotify commented Aug 6, 2024

OSBotify commented Aug 7, 2024

OSBotify commented Aug 8, 2024

OSBotify commented Aug 8, 2024

Guccio163 commented Jul 31, 2024 •

edited

Loading

shubham1206agra Aug 2, 2024 •

edited

Loading

blazejkustra Aug 2, 2024 •

edited

Loading