Optimistic report previews #21578
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -89,7 +89,6 @@ function buildOnyxDataForMoneyRequest( | |
| reportPreviewAction, | ||
| isNewChatReport, | ||
| isNewIOUReport, | ||
| ) { | ||
| const optimisticData = [ | ||
| { | ||
|
|
@@ -124,9 +123,7 @@ function buildOnyxDataForMoneyRequest( | |
| key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, | ||
| value: { | ||
| ...(isNewChatReport ? {[chatCreatedAction.reportActionID]: chatCreatedAction} : {}), | ||
| [reportPreviewAction.reportActionID]: reportPreviewAction, | ||
Julesssss marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }, | ||
| }, | ||
| { | ||
|
|
@@ -189,13 +186,9 @@ function buildOnyxDataForMoneyRequest( | |
| }, | ||
| } | ||
| : {}), | ||
| [reportPreviewAction.reportActionID]: { | ||
| pendingAction: null, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
|
|
@@ -387,11 +380,14 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part | |
| }, | ||
| }; | ||
|
|
||
| let reportPreviewAction = isNewIOUReport ? null : ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID); | ||
| if (reportPreviewAction) { | ||
| reportPreviewAction.created = DateUtils.getDBTime(); | ||
| const message = ReportUtils.getReportPreviewMessage(iouReport, reportPreviewAction); | ||
|
There was a problem hiding this comment. Hi we missed an edge case - 1:1 DM disappears after opening IOU report page when Scan IOU is created offline More details here |
||
| reportPreviewAction.message[0].html = message; | ||
| reportPreviewAction.message[0].text = message; | ||
|
Comment on lines
+385
to
+388
There was a problem hiding this comment. NAB we can do this in a follow up, but I see this logic is duplicated in a few places, so maybe we can create a function There was a problem hiding this comment. I'll do it in a follow up PR 👍 |
||
| } else { | ||
| reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, iouReport); | ||
| } | ||
|
|
||
| // STEP 5: Build Onyx Data | ||
|
|
@@ -406,7 +402,6 @@ function requestMoney(report, amount, currency, payeeEmail, payeeAccountID, part | |
| reportPreviewAction, | ||
| isNewChatReport, | ||
| isNewIOUReport, | ||
| ); | ||
|
|
||
| // STEP 6: Make the request | ||
|
|
@@ -649,11 +644,14 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco | |
| }, | ||
| }; | ||
|
|
||
| let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID); | ||
| if (oneOnOneReportPreviewAction) { | ||
| oneOnOneReportPreviewAction.created = DateUtils.getDBTime(); | ||
| const message = ReportUtils.getReportPreviewMessage(oneOnOneIOUReport, oneOnOneReportPreviewAction); | ||
| oneOnOneReportPreviewAction.message[0].html = message; | ||
| oneOnOneReportPreviewAction.message[0].text = message; | ||
| } else { | ||
| oneOnOneReportPreviewAction = ReportUtils.buildOptimisticReportPreview(oneOnOneChatReport, oneOnOneIOUReport); | ||
| } | ||
|
|
||
| // STEP 5: Build Onyx Data | ||
|
|
@@ -668,7 +666,6 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco | |
| oneOnOneReportPreviewAction, | ||
| isNewOneOnOneChatReport, | ||
| isNewOneOnOneIOUReport, | ||
| ); | ||
|
|
||
| const splitData = { | ||
|
|
@@ -944,14 +941,16 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType | |
| true, | ||
| ); | ||
|
|
||
| const reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, optimisticIOUReport); | ||
|
|
||
| // First, add data that will be used in all cases | ||
| const optimisticChatReportData = { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`, | ||
| value: { | ||
| ...chatReport, | ||
| lastReadTime: DateUtils.getDBTime(), | ||
| lastVisibleActionCreated: reportPreviewAction.created, | ||
| }, | ||
| }; | ||
| const optimisticIOUReportData = { | ||
|
|
@@ -963,7 +962,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType | |
| lastMessageHtml: optimisticIOUReportAction.message[0].html, | ||
| }, | ||
| }; | ||
| const optimisticIOUReportActionsData = { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticIOUReport.reportID}`, | ||
| value: { | ||
|
|
@@ -973,6 +972,13 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType | |
| }, | ||
| }, | ||
| }; | ||
| const optimisticChatReportActionsData = { | ||
| onyxMethod: Onyx.METHOD.SET, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, | ||
| value: { | ||
| [reportPreviewAction.reportActionID]: reportPreviewAction, | ||
| }, | ||
| }; | ||
|
|
||
| const successData = [ | ||
| { | ||
|
|
@@ -989,6 +995,15 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType | |
| key: `${ONYXKEYS.COLLECTION.TRANSACTION}${optimisticTransaction.transactionID}`, | ||
| value: {pendingAction: null}, | ||
| }, | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, | ||
| value: { | ||
| [reportPreviewAction.reportActionID]: { | ||
| pendingAction: null, | ||
| }, | ||
| }, | ||
| }, | ||
| ]; | ||
|
|
||
| const failureData = [ | ||
|
|
@@ -1008,7 +1023,6 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType | |
| // Change the method to set for new reports because it doesn't exist yet, is faster, | ||
| // and we need the data to be available when we navigate to the chat page | ||
| optimisticChatReportData.onyxMethod = Onyx.METHOD.SET; | ||
| optimisticIOUReportData.onyxMethod = Onyx.METHOD.SET; | ||
|
|
||
| // Set and clear pending fields on the chat report | ||
|
|
@@ -1053,8 +1067,8 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType | |
| }, | ||
| }; | ||
|
|
||
| // Add an optimistic created action to the optimistic chat reportActions data | ||
| optimisticChatReportActionsData.value[optimisticCreatedAction.reportActionID] = optimisticCreatedAction; | ||
| } else { | ||
| failureData.push({ | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
|
|
@@ -1067,7 +1081,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType | |
| }); | ||
| } | ||
|
|
||
| const optimisticData = [optimisticChatReportData, optimisticIOUReportData, optimisticChatReportActionsData, optimisticIOUReportActionsData, optimisticTransactionData]; | ||
| if (!_.isEmpty(optimisticPersonalDetailListData)) { | ||
| optimisticData.push(optimisticPersonalDetailListData); | ||
| } | ||
|
|
@@ -1081,6 +1095,7 @@ function getSendMoneyParams(report, amount, currency, comment, paymentMethodType | |
| transactionID: optimisticTransaction.transactionID, | ||
| newIOUReportDetails, | ||
| createdReportActionID: isNewChat ? optimisticCreatedAction.reportActionID : 0, | ||
| reportPreviewReportActionID: reportPreviewAction.reportActionID, | ||
| }, | ||
| optimisticData, | ||
| successData, | ||
|
|
@@ -1115,6 +1130,12 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho | |
| login: recipient.login, | ||
| }; | ||
|
|
||
| const optimisticReportPreviewAction = ReportActionsUtils.getReportPreviewAction(chatReport.reportID, iouReport.reportID); | ||
| optimisticReportPreviewAction.created = DateUtils.getDBTime(); | ||
| const message = ReportUtils.getReportPreviewMessage(iouReport, optimisticReportPreviewAction); | ||
| optimisticReportPreviewAction.message[0].html = message; | ||
| optimisticReportPreviewAction.message[0].text = message; | ||
|
|
||
| const optimisticData = [ | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
|
|
@@ -1139,6 +1160,13 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho | |
| }, | ||
| }, | ||
| }, | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, | ||
| value: { | ||
| [optimisticReportPreviewAction.reportActionID]: optimisticReportPreviewAction, | ||
| }, | ||
| }, | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, | ||
|
|
@@ -1196,6 +1224,15 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho | |
| }, | ||
| }, | ||
| }, | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, | ||
| value: { | ||
| [optimisticReportPreviewAction.reportActionID]: { | ||
| created: optimisticReportPreviewAction.created, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| onyxMethod: Onyx.METHOD.MERGE, | ||
| key: `${ONYXKEYS.COLLECTION.TRANSACTION}${optimisticTransaction.transactionID}`, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be the same? Also, should we be using 0 as the default for IDs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For when the action is created other request or send money the actor acountID will be the person creating it so that should be correct.
As far as it goes for the default I am not sure what else we should use here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's expected to be 0 for the default, and it happens the case when the workspace owes money. The workspace doesn't have an
accountIDand we have logic that shows the workspace as the actor for the report preview when theaccountIDis 0.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good to know. Thanks.