Fix - Domain Card - User can edit the date in expenses related to the assigned domain card #39244
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
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
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 |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ import useLocalize from '@hooks/useLocalize'; | |
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import * as IOUUtils from '@libs/IOUUtils'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import * as ReportUtils from '@libs/ReportUtils'; | ||
| import * as TransactionUtils from '@libs/TransactionUtils'; | ||
| import * as IOU from '@userActions/IOU'; | ||
| import CONST from '@src/CONST'; | ||
|
|
@@ -26,6 +27,12 @@ type IOURequestStepDateOnyxProps = { | |
| /** The draft transaction that holds data to be persisted on the current transaction */ | ||
| splitDraftTransaction: OnyxEntry<OnyxTypes.Transaction>; | ||
|
|
||
| /** The actions from the parent report */ | ||
| reportActions: OnyxEntry<OnyxTypes.ReportActions>; | ||
|
|
||
| /** Session info for the currently logged in user. */ | ||
| session: OnyxEntry<OnyxTypes.Session>; | ||
|
|
||
| /** The policy of the report */ | ||
| policy: OnyxEntry<OnyxTypes.Policy>; | ||
|
|
||
|
|
@@ -37,27 +44,39 @@ type IOURequestStepDateOnyxProps = { | |
| }; | ||
|
|
||
| type IOURequestStepDateProps = IOURequestStepDateOnyxProps & | ||
| WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_DATE> & { | ||
| /** Holds data related to Money Request view state, rather than the underlying Money Request data. */ | ||
| transaction: OnyxEntry<OnyxTypes.Transaction>; | ||
|
|
||
| /** The report linked to the transaction */ | ||
| report: OnyxEntry<Report>; | ||
| }; | ||
|
|
||
| function IOURequestStepDate({ | ||
| route: { | ||
| params: {action, iouType, reportID, backTo, reportActionID}, | ||
| }, | ||
| transaction, | ||
| splitDraftTransaction, | ||
| policy, | ||
| policyTags, | ||
| policyCategories, | ||
| reportActions, | ||
| report, | ||
| session, | ||
| }: IOURequestStepDateProps) { | ||
| const styles = useThemeStyles(); | ||
| const {translate} = useLocalize(); | ||
| const isEditing = action === CONST.IOU.ACTION.EDIT; | ||
| // In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value | ||
| const isEditingSplitBill = iouType === CONST.IOU.TYPE.SPLIT && isEditing; | ||
| const currentCreated = isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? TransactionUtils.getCreated(splitDraftTransaction) : TransactionUtils.getCreated(transaction); | ||
| const parentReportAction = reportActions?.[(isEditingSplitBill ? reportActionID : report?.parentReportActionID) ?? 0]; | ||
| const canEditingSplitBill = | ||
| isEditingSplitBill && session && parentReportAction && session.accountID === parentReportAction.actorAccountID && TransactionUtils.areRequiredFieldsEmpty(transaction); | ||
| const canEditMoneyRequest = isEditing && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction ?? null, CONST.EDIT_REQUEST_FIELD.DATE); | ||
| // eslint-disable-next-line rulesdir/no-negated-variables | ||
| const shouldShowNotFound = !IOUUtils.isValidMoneyRequestType(iouType) || (isEditing && !canEditMoneyRequest && !canEditingSplitBill); | ||
|
Comment on lines
+74
to
+79
There was a problem hiding this comment. Why is this change required @FitseTLT? I think this is getting way too complicated. There was a problem hiding this comment. Yeah I know. But we need to do it if we want to fix deep link access u mentioned. This is what we did to tag and category pages. It is basically displaying not found page when users are not allowed to edit the date and the logic for permission to edit the field, I took it the logic we use to enable the clicking of the date field in the money request view. App/src/components/ReportActionItem/MoneyRequestView.tsx Lines 143 to 144 in 20be55b But an additional case we need to consider is for SplitBillDetailsPage (When we create split request with receipt), and for that the logic is taken from App/src/pages/iou/SplitBillDetailsPage.tsx Lines 79 to 80 in 20be55b There was a problem hiding this comment. @FitseTLT Isn't There was a problem hiding this comment. App/src/pages/iou/request/step/IOURequestStepTag.tsx Lines 70 to 84 in 63223bc There was a problem hiding this comment.
Can you please answer above? There was a problem hiding this comment. Nope it is not enough because we have to include the case of split detail page that is what I have included and I have given you a perfect similar example done for tag. |
||
|
|
||
| const navigateBack = () => { | ||
| Navigation.goBack(backTo); | ||
|
|
@@ -94,7 +113,7 @@ function IOURequestStepDate({ | |
| <StepScreenWrapper | ||
| headerTitle={translate('common.date')} | ||
| onBackButtonPress={navigateBack} | ||
| shouldShowNotFoundPage={shouldShowNotFound} | ||
| shouldShowWrapper | ||
| testID={IOURequestStepDate.displayName} | ||
| > | ||
|
|
@@ -127,6 +146,20 @@ const IOURequestStepDateWithOnyx = withOnyx<IOURequestStepDateProps, IOURequestS | |
| return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`; | ||
| }, | ||
| }, | ||
| reportActions: { | ||
| key: ({ | ||
| route: { | ||
| params: {action, iouType}, | ||
| }, | ||
| report, | ||
| }) => { | ||
| let reportID; | ||
| if (action === CONST.IOU.ACTION.EDIT) { | ||
| reportID = iouType === CONST.IOU.TYPE.SPLIT ? report?.reportID : report?.parentReportID; | ||
| } | ||
| return `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID ?? '0'}`; | ||
| }, | ||
| }, | ||
| policy: { | ||
| key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`, | ||
| }, | ||
|
|
@@ -136,6 +169,9 @@ const IOURequestStepDateWithOnyx = withOnyx<IOURequestStepDateProps, IOURequestS | |
| policyTags: { | ||
| key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`, | ||
| }, | ||
| session: { | ||
| key: ONYXKEYS.SESSION, | ||
| }, | ||
| })(IOURequestStepDate); | ||
|
|
||
| // eslint-disable-next-line rulesdir/no-negated-variables | ||
|
|
||
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
Oops, something went wrong.
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.
Why do we need to change this condition @FitseTLT?
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.
This was taken from here
App/src/libs/ReportUtils.ts
Lines 2623 to 2624 in 004b3af
As we took this
App/src/libs/ReportUtils.ts
Lines 2619 to 2621 in 004b3af
out of its code block
I had to centralize the condition in one if