fix: task not working in self dm through shortcut #39107

nexarvo · 2024-03-27T21:09:40Z

Details

Fixed Issues

$#39049
PROPOSAL: #39049 (comment)

Tests

Go to self-DM
Create a task and assigned to self
Go to FAB
Click Assign task shortcut
Create another task which is assigned to self
Verify that no error appears in self DM report for creating second task

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to self-DM
Create a task and assigned to self
Go to FAB
Click Assign task shortcut
Create another task which is assigned to self
Verify that no error appears for creating second task

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 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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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.js 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.
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

WhatsApp.Video.2024-03-28.at.12.47.03.AM.mp4

Android: mWeb Chrome

WhatsApp.Video.2024-03-28.at.12.47.05.AM.mp4

iOS: Native

ios-3.mp4

iOS: mWeb Safari

ios-3-web.mp4

MacOS: Chrome / Safari

2f93d786-c077-4943-a9b7-00433e040ee6.mp4

MacOS: Desktop

d2854dfd-f72e-407a-b7c0-8a9489909b44.mp4

melvin-bot · 2024-03-27T21:09:45Z

@Santhosh-Sellavel 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]

iwiznia · 2024-03-27T21:19:45Z

src/libs/ReportUtils.ts

+    return (
+        Object.values(reports ?? {}).find((report) => {
+            return report?.reportID === reportID;
+        }) ?? null


I am very confused by this... I think it's doing nothing? ie: if it is null then default to null

why not allReports[${ONYXKEYS.COLLECTION.REPORT}${reportID}] ?

return ( allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]

If it sends null then the existing behaviour create new optimistic report which is expected because there is no report found with that reportID

@ishpaul777 changing it to your suggestion as it returns in O(1) and works as expected also

I am just curious, why do we need a reports param 🤔

I copied the above function and forgot to remove the reports param 😅

Actually we already have this utility

https://github.com/Expensify/App/blob/e542ba7c2d9e216c2cd401de0de8ed225fff4a7b/src/libs/ReportUtils.ts#L532C10-L532C19

@ishpaul777 I tested every case where we create task. And in one case the shareToReportID is empty:

App/src/libs/actions/Task.ts

Line 652 in b68937c

function setAssigneeValue(assigneeEmail: string, assigneeAccountID: number, shareToReportID: string, isCurrentUser = false): OnyxEntry<OnyxTypes.Report> {

In that case we can use the old existing behaviour. And if shareToReportID is available we will get report directly by ID using utility function which is the cases we are solving i.e. selfDM

The code:

App/src/libs/actions/Task.ts

Line 659 in e542ba7

chatReport = ReportUtils.getChatByParticipants([assigneeAccountID]);

will become:

iwiznia · 2024-03-27T21:20:45Z

src/libs/actions/Task.ts

@@ -653,7 +653,8 @@ function setAssigneeValue(assigneeEmail: string, assigneeAccountID: number, shar
    let chatReport: OnyxEntry<OnyxTypes.Report> = null;

    if (!isCurrentUser) {
-        chatReport = ReportUtils.getChatByParticipants([assigneeAccountID]);
+        const reportID = shareDestination;


The param name shareDestination is a reportID? If so, can we rename this to something like shareToReportID?

Yes, it's reportID. Changing that to shareToReportID

iwiznia

Looks good but there's a lint error

nexarvo · 2024-03-27T21:50:24Z

Testing other task use cases to make sure everything is working as expected.

iwiznia

Actually now that I am thinking about this more... I think this might be wrong.

Nothing ensures that the report is loaded here, so we should not assume it is.

Also, we already have the report object in the (all?) callers of setAssigneeValue, so instead of what we did here, we should change setAssigneeValue to receive the full report object directly from its callers. No?

ishpaul777 · 2024-03-27T22:07:19Z

src/libs/actions/Task.ts

    let chatReport: OnyxEntry<OnyxTypes.Report> = null;

    if (!isCurrentUser) {
-        chatReport = ReportUtils.getChatByParticipants([assigneeAccountID]);
+        const reportID = shareToReportID;
+        chatReport = ReportUtils.getChatByReportID(reportID);


orrr we already load allReports in actions/Task we can just use it here

Suggested change

chatReport = ReportUtils.getChatByReportID(reportID);

chatReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]

nexarvo · 2024-03-27T22:13:11Z

@iwiznia I have tested all conditions for task and for some case we have shareToReportID in setAssigneeValue as empty. In that case we can use the existing behaviour and If shareToReportID is available then we can directly get report from the ID instead of comparing the participantIDs as we are doing in ReportUtils.getChatByParticipants This way the old behaviour still exist and the condition specific to selfDM will be added too.

nexarvo · 2024-03-27T22:53:35Z

we already have the report object in the (all?) callers of setAssigneeValue

Actually we don't have report available at some places and we are passing task?.shareDestination for that like:

App/src/pages/tasks/TaskAssigneeSelectorModal.tsx

Lines 177 to 200 in b68937c

    
               if (report) { 
        
                   if (option.accountID !== report.managerID) { 
        
                       const assigneeChatReport = TaskActions.setAssigneeValue( 
        
                           option?.login ?? '', 
        
                           option?.accountID ?? -1, 
        
                           report.reportID, 
        
                           OptionsListUtils.isCurrentUser({...option, accountID: option?.accountID ?? -1, login: option?.login ?? ''}), 
        
                       ); 
        
                       // Pass through the selected assignee 
        
                       TaskActions.editTaskAssignee(report, session?.accountID ?? 0, option?.login ?? '', option?.accountID, assigneeChatReport); 
        
                   } 
        
                   Navigation.dismissModal(report.reportID); 
        
                   // If there's no report, we're creating a new task 
        
               } else if (option.accountID) { 
        
                   TaskActions.setAssigneeValue( 
        
                       option?.login ?? '', 
        
                       option.accountID, 
        
                       task?.shareDestination ?? '', 
        
                       OptionsListUtils.isCurrentUser({...option, accountID: option?.accountID ?? -1, login: option?.login ?? undefined}), 
        
                   ); 
        
                   Navigation.goBack(ROUTES.NEW_TASK); 
        
               } 
        
           },

iwiznia · 2024-03-28T14:47:00Z

Actually we don't have report available at some places and we are passing task?.shareDestination for that like:

Yeah and isn't that a problem? Your code assumes the report will be loaded, but nothing is ensuring that, so the users of this component need to ensure we are loading the needed reports... no?

nexarvo · 2024-03-28T16:24:11Z

@iwiznia I have just updated setAssigneeValue to take report as param. Please take a look and let me know.

iwiznia · 2024-03-28T16:35:36Z

src/libs/actions/Task.ts

@@ -652,11 +652,16 @@ function setAssigneeChatReport(chatReport: OnyxTypes.Report) {
 * If there is no existing chat, it creates an optimistic chat report
 * It also sets the shareDestination as that chat report if a share destination isn't already set
 */
-function setAssigneeValue(assigneeEmail: string, assigneeAccountID: number, shareDestination: string, isCurrentUser = false): OnyxEntry<OnyxTypes.Report> {
+function setAssigneeValue(assigneeEmail: string, assigneeAccountID: number, shareToReportID: string, isCurrentUser = false, report: OnyxEntry<OnyxTypes.Report>): OnyxEntry<OnyxTypes.Report> {


Suggested change

function setAssigneeValue(assigneeEmail: string, assigneeAccountID: number, shareToReportID: string, isCurrentUser = false, report: OnyxEntry<OnyxTypes.Report>): OnyxEntry<OnyxTypes.Report> {

function setAssigneeValue(assigneeEmail: string, assigneeAccountID: number, shareToReportID: string, isCurrentUser = false, chatReport: OnyxEntry<OnyxTypes.Report>): OnyxEntry<OnyxTypes.Report> {

iwiznia · 2024-03-28T16:36:03Z

src/libs/actions/Task.ts

+            chatReport = report;
+        }
+        else {
+            chatReport = ReportUtils.getChatByParticipants([assigneeAccountID]);


Not sure how I feel about this. Is this correct in any real cases or is this always going to be wrong?

There is one case where report is not available like in this cases:

App/src/pages/tasks/TaskAssigneeSelectorModal.tsx

Lines 177 to 200 in b68937c

if (report) {

if (option.accountID !== report.managerID) {

const assigneeChatReport = TaskActions.setAssigneeValue(

option?.login ?? '',

option?.accountID ?? -1,

report.reportID,

OptionsListUtils.isCurrentUser({...option, accountID: option?.accountID ?? -1, login: option?.login ?? ''}),

);

// Pass through the selected assignee

TaskActions.editTaskAssignee(report, session?.accountID ?? 0, option?.login ?? '', option?.accountID, assigneeChatReport);

}

Navigation.dismissModal(report.reportID);

// If there's no report, we're creating a new task

} else if (option.accountID) {

TaskActions.setAssigneeValue(

option?.login ?? '',

option.accountID,

task?.shareDestination ?? '',

OptionsListUtils.isCurrentUser({...option, accountID: option?.accountID ?? -1, login: option?.login ?? undefined}),

);

Navigation.goBack(ROUTES.NEW_TASK);

}

},

We are getting the report from route.param and they are null here:

App/src/pages/tasks/TaskAssigneeSelectorModal.tsx

Lines 105 to 115 in b68937c

const report: OnyxEntry<Report> = useMemo(() => {

if (!route.params?.reportID) {

return null;

}

if (report && !ReportUtils.isTaskReport(report)) {

Navigation.isNavigationReady().then(() => {

Navigation.dismissModal(report.reportID);

});

}

return reports?.[`${ONYXKEYS.COLLECTION.REPORT}${route.params?.reportID}`] ?? null;

}, [reports, route]);

Example

In this example the above else condition is triggered. If we don't have this else condition then, it will assume that no report exists for this participant and it will create new optimistic report, which is wrong.

nexarvo · 2024-03-28T21:40:17Z

Closing this PR due to signed commits issue. This will be handled in #39215

fix: task not working in self dm through shortcut

44d2e1c

nexarvo requested a review from a team as a code owner March 27, 2024 21:09

melvin-bot bot requested review from Santhosh-Sellavel and removed request for a team March 27, 2024 21:09

nexarvo mentioned this pull request Mar 27, 2024

[HOLD for payment 2024-04-09] [HOLD for payment 2024-04-05] [$500] Shortcut - Error shows up when creating second self-assigned task via Assign task shortcut #39049

Closed

6 tasks

fix: lint issue

a748fbc

iwiznia requested changes Mar 27, 2024

View reviewed changes

nexarvo added 2 commits March 28, 2024 02:42

change paramter name

e4cd5d2

use key to get report

b68937c

iwiznia approved these changes Mar 27, 2024

View reviewed changes

iwiznia requested changes Mar 27, 2024

View reviewed changes

ishpaul777 reviewed Mar 27, 2024

View reviewed changes

Merge branch 'main' into fix/39049-self-dm-task-shortcut

aeeb77b

pass report to setAssigneeValue from components itself

6e12a35

remove getChatByReportID as it is not needed

3cf9606

iwiznia reviewed Mar 28, 2024

View reviewed changes

iwiznia requested a review from Gonals March 28, 2024 16:36

nexarvo added 3 commits March 29, 2024 00:39

update conditions if chat report not available

45d8dd9

fix: prettier and lint issues

cdc9371

fix: lint

282cd58

nexarvo closed this Mar 28, 2024

nexarvo deleted the fix/39049-self-dm-task-shortcut branch March 28, 2024 21:40

nexarvo mentioned this pull request Mar 28, 2024

Fix/39049 shortcut self dm task #39215

Merged

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: task not working in self dm through shortcut #39107

fix: task not working in self dm through shortcut #39107

nexarvo commented Mar 27, 2024

melvin-bot bot commented Mar 27, 2024

iwiznia Mar 27, 2024

ishpaul777 Mar 27, 2024 •

edited

Loading

nexarvo Mar 27, 2024

nexarvo Mar 27, 2024

ishpaul777 Mar 27, 2024

nexarvo Mar 27, 2024

ishpaul777 Mar 27, 2024 •

edited

Loading

nexarvo Mar 27, 2024

iwiznia Mar 27, 2024

nexarvo Mar 27, 2024 •

edited

Loading

iwiznia left a comment

nexarvo commented Mar 27, 2024

iwiznia left a comment

ishpaul777 Mar 27, 2024 •

edited

Loading

nexarvo commented Mar 27, 2024 •

edited

Loading

nexarvo commented Mar 27, 2024

iwiznia commented Mar 28, 2024

nexarvo commented Mar 28, 2024

iwiznia Mar 28, 2024

iwiznia Mar 28, 2024

nexarvo Mar 28, 2024

nexarvo commented Mar 28, 2024

	chatReport = ReportUtils.getChatByReportID(reportID);
	chatReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]

	function setAssigneeValue(assigneeEmail: string, assigneeAccountID: number, shareToReportID: string, isCurrentUser = false, report: OnyxEntry<OnyxTypes.Report>): OnyxEntry<OnyxTypes.Report> {
	function setAssigneeValue(assigneeEmail: string, assigneeAccountID: number, shareToReportID: string, isCurrentUser = false, chatReport: OnyxEntry<OnyxTypes.Report>): OnyxEntry<OnyxTypes.Report> {

	if (report) {
	if (option.accountID !== report.managerID) {
	const assigneeChatReport = TaskActions.setAssigneeValue(
	option?.login ?? '',
	option?.accountID ?? -1,
	report.reportID,
	OptionsListUtils.isCurrentUser({...option, accountID: option?.accountID ?? -1, login: option?.login ?? ''}),
	);

	// Pass through the selected assignee
	TaskActions.editTaskAssignee(report, session?.accountID ?? 0, option?.login ?? '', option?.accountID, assigneeChatReport);
	}
	Navigation.dismissModal(report.reportID);
	// If there's no report, we're creating a new task
	} else if (option.accountID) {
	TaskActions.setAssigneeValue(
	option?.login ?? '',
	option.accountID,
	task?.shareDestination ?? '',
	OptionsListUtils.isCurrentUser({...option, accountID: option?.accountID ?? -1, login: option?.login ?? undefined}),
	);
	Navigation.goBack(ROUTES.NEW_TASK);
	}
	},

	const report: OnyxEntry<Report> = useMemo(() => {
	if (!route.params?.reportID) {
	return null;
	}
	if (report && !ReportUtils.isTaskReport(report)) {
	Navigation.isNavigationReady().then(() => {
	Navigation.dismissModal(report.reportID);
	});
	}
	return reports?.[`${ONYXKEYS.COLLECTION.REPORT}${route.params?.reportID}`] ?? null;
	}, [reports, route]);

fix: task not working in self dm through shortcut #39107

fix: task not working in self dm through shortcut #39107

Conversation

nexarvo commented Mar 27, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 27, 2024

Choose a reason for hiding this comment

ishpaul777 Mar 27, 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

Choose a reason for hiding this comment

ishpaul777 Mar 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nexarvo Mar 27, 2024 • edited Loading

Choose a reason for hiding this comment

iwiznia left a comment

Choose a reason for hiding this comment

nexarvo commented Mar 27, 2024

iwiznia left a comment

Choose a reason for hiding this comment

ishpaul777 Mar 27, 2024 • edited Loading

Choose a reason for hiding this comment

nexarvo commented Mar 27, 2024 • edited Loading

nexarvo commented Mar 27, 2024

iwiznia commented Mar 28, 2024

nexarvo commented Mar 28, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nexarvo commented Mar 28, 2024

ishpaul777 Mar 27, 2024 •

edited

Loading

ishpaul777 Mar 27, 2024 •

edited

Loading

nexarvo Mar 27, 2024 •

edited

Loading

ishpaul777 Mar 27, 2024 •

edited

Loading

nexarvo commented Mar 27, 2024 •

edited

Loading