Chore/52820 workspace cards cleanup #52871

koko57 · 2024-11-21T09:46:52Z

Explanation of Change

Fixed Issues

$ #52820
PROPOSAL:

Tests

PREREQUISITES: ideally 4 workspaces with Company Cards enabled and a feed added
Workspace A - 1 member, multiple cards to assign
Workspace B - several members, 1 card to assign (if you don't have a workspace with only 1 card you can change this code from)

function hasOnlyOneCardToAssign(list: FilteredCardList) {
    return Object.keys(list).length === 1;
}

to

function hasOnlyOneCardToAssign(list: FilteredCardList) {
    return Object.keys(list).length !== 1;
}

Workspace C - 1 member, 1 card to assign
Workspace D - several members, several cards to assign

Workspace A

Go to Workspace A -> Company Cards -> Assign Card
Verify that the Assignee step is skipped, you're on the Card selection step
Go to members -> member details -> New Card
Verify that the Assignee step is skipped, you're on the Card selection step (the behavior was the same before, it should not change)

Workspace B

Go to Workspace B -> Company Cards -> Assign Card
Verify that after choosing Assignee the Card selection step is skipped - you land on the Transaction Start step
Go to members -> member details -> New Card
Verify that the Assignee and Card Selection steps are skipped - you land on the Transaction Start step

Workspace C

Go to Workspace C -> Company Cards -> Assign Card
Verify that the Assignee and Card Selection steps are skipped - you land on the Transaction Start step
Go to members -> member details -> New Card
Verify that the Assignee and Card Selection steps are skipped - you land on the Transaction Start step

Workspace D

Go to Workspace D -> Company Cards -> Assign Card
Verify that you land on the Assignee step like before
Go to members -> member details -> New Card
Verify that only the Assignee is skipped - you land on the Card selection step

Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-11-21.at.17.17.23.mp4

Screen.Recording.2024-11-21.at.17.06.33.mp4

Screen.Recording.2024-11-21.at.17.06.10.mp4

MacOS: Desktop

melvin-bot · 2024-11-21T10:38:20Z

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

DylanDylann · 2024-11-22T02:54:28Z

@koko57 Step 2 on workspace C seems to be confusing to me

Verify that after choosing Assignee the Card selection step is skipped - you land on the Transaction Start step

I think it should be

Verify that the Assignee and Card Selection steps are skipped - you land on the Transaction Start step

koko57 · 2024-11-22T02:56:17Z

@DylanDylann yes, you're right, fixing it

DylanDylann · 2024-11-22T03:10:45Z

@koko57 We don't reset assignCard field on Onyx when starting a new creation flow again

Screen.Recording.2024-11-22.at.10.08.22.mov

My suggestion is that we reset assignCard field on Onyx when users click on Assign card on both Company page and member Detail page

DylanDylann · 2024-11-22T03:14:53Z

src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx

+                data.cardNumber = Object.keys(filteredCardList).at(0);
+                data.encryptedCardNumber = Object.values(filteredCardList).at(0);


@koko57 I believe that the two fields are different

what do you mean?

you have the key - "480801XXXXX2554" for the card name and the value "v11:47A..." for the encryptedCradNumber

@koko57 In your code change, you set two fields to the same value

data.cardNumber = Object.keys(filteredCardList).at(0); data.encryptedCardNumber = Object.values(filteredCardList).at(0);

Object.keys vs Object.values? how they are the same

I'm getting the first key "480801XXXXX2554" and it's value "v11:47A..." f

Sorry, my bad

DylanDylann · 2024-11-22T03:28:40Z

src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

@@ -64,11 +68,19 @@ function WorkspaceMemberNewCardPage({route, personalDetails}: WorkspaceMemberNew
            });
            Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID, ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID)));
        } else {
+            const data: Partial<AssignCardData> = {
+                email: memberLogin,


NAB: Let's add bankName value here

thanks, wouldn't say that is a NAB, I removed setting the feed in the assign card flow

@koko57 It is a NAB because we already saved feed on the route. But I think we still need to fix it

yeah, you're saving the feed on the route but not in the Onyx

@koko57 Let's add cardName along with email

src/libs/CardUtils.ts

DylanDylann · 2024-11-22T03:47:40Z

src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx

+        let currentStep: AssignCardStep = CONST.COMPANY_CARD.STEP.ASSIGNEE;
+
+        if (Object.keys(policy?.employeeList ?? {}).length === 1) {
+            data.email = Object.keys(policy?.employeeList ?? {}).at(0);


Let's add cardName along with email

DylanDylann · 2024-11-22T03:47:55Z

src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

@@ -64,11 +68,19 @@ function WorkspaceMemberNewCardPage({route, personalDetails}: WorkspaceMemberNew
            });
            Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID, ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID)));
        } else {
+            const data: Partial<AssignCardData> = {
+                email: memberLogin,


@koko57 Let's add cardName along with email

DylanDylann · 2024-11-22T04:35:37Z

src/pages/workspace/companyCards/WorkspaceCompanyCardsListHeaderButtons.tsx

+        if (Object.keys(policy?.employeeList ?? {}).length === 1) {
+            const userEmail = Object.keys(policy?.employeeList ?? {}).at(0) ?? '';
+            data.email = userEmail;
+            const personalDetails = PersonalDetailsUtils.getPersonalDetailByEmail(userEmail);


@koko57 NAB Let's create a util function to get card member name

It'll be done in my other PR #52735 - if it's a NAB here I will improve it in the other PR after this one is merged

DylanDylann · 2024-11-22T04:41:59Z

src/pages/workspace/members/WorkspaceMemberNewCardPage.tsx

-                    email: memberLogin,
-                },
+                currentStep,
+                data,
                isEditing: false,
            });
            Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS_ASSIGN_CARD.getRoute(policyID, selectedFeed, ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID)));


@koko57 The App displays the asignee step a moment before moving to the correct page. I think we need to wait for Onyx.update before navigating (maybe use setNavigationActionToMicrotaskQueue)

Screen.Recording.2024-11-22.at.11.39.33.mov

DylanDylann · 2024-11-22T04:43:40Z

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-11-22.at.11.39.33.mov

Android: mWeb Chrome

Screen.Recording.2024-11-22.at.11.38.39.mov

iOS: Native

Screen.Recording.2024-11-22.at.11.37.46.mov

iOS: mWeb Safari

Screen.Recording.2024-11-22.at.11.38.10.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-22.at.11.34.00.mov

MacOS: Desktop

Screen.Recording.2024-11-22.at.11.36.35.mov

mountiny

Thanks!

mountiny · 2024-11-22T12:17:53Z

src/libs/CardUtils.ts

@@ -352,6 +353,16 @@ function getSelectedFeed(lastSelectedFeed: OnyxEntry<CompanyCardFeed>, cardFeeds
    return lastSelectedFeed ?? defaultFeed;
 }

+function getFilteredCardList(list?: WorkspaceCardsList) {
+    const {cardList, ...cards} = list ?? {};
+    // We need to filter out cards which already has been assigned


Suggested change

// We need to filter out cards which already has been assigned

// We need to filter out cards which already has been assigned

OSBotify · 2024-11-22T12:36:16Z

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

github-actions · 2024-11-22T20:32:39Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.66-0 🚀

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

joekaufmanexpensify · 2024-11-25T15:59:42Z

Workspace A - 1 member, multiple cards to assign

Tested and this case passed!

Workspace B - several members, 1 card to assign

This worked for custom feeds but not direct feeds.

Workspace C - 1 member, 1 card to assign

This worked with custom feeds but not direct feeds.

Workspace D - several members, several cards to assign

All good!

joekaufmanexpensify · 2024-11-25T16:00:13Z

I don't think the cases not working are blockers, so checking off and flagging in slack.

joekaufmanexpensify · 2024-11-25T16:02:54Z

Discussing

mountiny · 2024-11-25T16:03:27Z

Agree not a blocker, thanks!

github-actions · 2024-11-26T16:14:04Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.66-8 🚀

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

koko57 added 8 commits November 21, 2024 15:23

fix: remove unreachable return

fd029a8

feat: skip assignee step when only one workspace member

1cd6d19

feat: skip the card selection step if only one card available

2396fc0

feat: skip card selection step when only one card

d1b6ef5

chore: code cleanup

47a9f12

feat: create util functions

6ee3551

fix: minor fix

824ad5b

fix: minor fix

d71e7f1

koko57 marked this pull request as ready for review November 21, 2024 10:38

koko57 requested a review from a team as a code owner November 21, 2024 10:38

melvin-bot bot requested review from DylanDylann and removed request for a team November 21, 2024 10:38

koko57 mentioned this pull request Nov 21, 2024

[HOLD for payment 2024-12-16] [$250] [HOLD for payment 2024-12-07] [HOLD for payment 2024-12-03] Clean up card assignment when only one member and/or card #52820

Open

mountiny assigned koko57 Nov 21, 2024

mountiny self-requested a review November 21, 2024 18:00

DylanDylann reviewed Nov 22, 2024

View reviewed changes

fix: clear the data when closing the flow

5c82d2c

koko57 requested a review from DylanDylann November 22, 2024 03:24

DylanDylann reviewed Nov 22, 2024

View reviewed changes

fix: add missing bank name

d9dd7a3

DylanDylann reviewed Nov 22, 2024

View reviewed changes

fix: add card name

4137f2f

DylanDylann reviewed Nov 22, 2024

View reviewed changes

fix: delay navigation

2570632

DylanDylann approved these changes Nov 22, 2024

View reviewed changes

mountiny added the InternalQA This pull request required internal QA label Nov 22, 2024

mountiny approved these changes Nov 22, 2024

View reviewed changes

mountiny merged commit b3c8b56 into Expensify:main Nov 22, 2024
20 checks passed

github-actions bot mentioned this pull request Nov 22, 2024

Deploy Checklist: New Expensify 2024-11-22 #52978

Closed

75 tasks

VickyStash mentioned this pull request Nov 27, 2024

Follow-up: Improve getFilteredCardList function #53200

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chore/52820 workspace cards cleanup #52871

Chore/52820 workspace cards cleanup #52871

koko57 commented Nov 21, 2024 •

edited

Loading

melvin-bot bot commented Nov 21, 2024

DylanDylann commented Nov 22, 2024 •

edited

Loading

koko57 commented Nov 22, 2024

DylanDylann commented Nov 22, 2024

DylanDylann Nov 22, 2024

koko57 Nov 22, 2024

koko57 Nov 22, 2024

DylanDylann Nov 22, 2024

koko57 Nov 22, 2024

koko57 Nov 22, 2024

DylanDylann Nov 22, 2024

DylanDylann Nov 22, 2024

DylanDylann Nov 22, 2024

koko57 Nov 22, 2024

DylanDylann Nov 22, 2024

koko57 Nov 22, 2024

DylanDylann Nov 22, 2024

DylanDylann Nov 22, 2024

DylanDylann Nov 22, 2024

DylanDylann Nov 22, 2024 •

edited

Loading

koko57 Nov 22, 2024

DylanDylann Nov 22, 2024

koko57 Nov 22, 2024

DylanDylann commented Nov 22, 2024

mountiny left a comment

mountiny Nov 22, 2024

OSBotify commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

joekaufmanexpensify commented Nov 25, 2024 •

edited

Loading

joekaufmanexpensify commented Nov 25, 2024

joekaufmanexpensify commented Nov 25, 2024

mountiny commented Nov 25, 2024

github-actions bot commented Nov 26, 2024

		data.cardNumber = Object.keys(filteredCardList).at(0);
		data.encryptedCardNumber = Object.values(filteredCardList).at(0);

	// We need to filter out cards which already has been assigned

	// We need to filter out cards which already has been assigned

Chore/52820 workspace cards cleanup #52871

Chore/52820 workspace cards cleanup #52871

Conversation

koko57 commented Nov 21, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 21, 2024

DylanDylann commented Nov 22, 2024 • edited Loading

koko57 commented Nov 22, 2024

DylanDylann commented Nov 22, 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

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

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

DylanDylann Nov 22, 2024 • edited Loading

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

DylanDylann commented Nov 22, 2024

Reviewer Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OSBotify commented Nov 22, 2024

github-actions bot commented Nov 22, 2024

joekaufmanexpensify commented Nov 25, 2024 • edited Loading

joekaufmanexpensify commented Nov 25, 2024

joekaufmanexpensify commented Nov 25, 2024

mountiny commented Nov 25, 2024

github-actions bot commented Nov 26, 2024

koko57 commented Nov 21, 2024 •

edited

Loading

DylanDylann commented Nov 22, 2024 •

edited

Loading

DylanDylann Nov 22, 2024 •

edited

Loading

joekaufmanexpensify commented Nov 25, 2024 •

edited

Loading