fix: Make all task titles/descriptions read-only to all but the author/assignee. #53749
+58
−42
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -365,8 +365,8 @@ function getOutstandingChildTask(taskReport: OnyxEntry<OnyxTypes.Report>) { | |||||
| /** | ||||||
| * Complete a task | ||||||
| */ | ||||||
| function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>, reportIDFromAction?: string) { | ||||||
| const taskReportID = taskReport?.reportID ?? reportIDFromAction ?? '-1'; | ||||||
| const message = `marked as complete`; | ||||||
| const completedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED, message); | ||||||
| const parentReport = getParentReport(taskReport); | ||||||
|
|
@@ -450,8 +450,8 @@ function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>) { | |||||
| /** | ||||||
| * Reopen a closed task | ||||||
| */ | ||||||
| function reopenTask(taskReport: OnyxEntry<OnyxTypes.Report>, reportIDFromAction?: string) { | ||||||
| const taskReportID = taskReport?.reportID ?? reportIDFromAction ?? '-1'; | ||||||
| const message = `marked as incomplete`; | ||||||
| const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASK_REOPENED, message); | ||||||
| const parentReport = getParentReport(taskReport); | ||||||
|
|
@@ -1216,7 +1216,19 @@ function getTaskOwnerAccountID(taskReport: OnyxEntry<OnyxTypes.Report>): number | |||||
| /** | ||||||
| * Check if you're allowed to modify the task - anyone that has write access to the report can modify the task, except auditor | ||||||
| */ | ||||||
| function canModifyTask( | ||||||
| taskReport: OnyxEntry<OnyxTypes.Report>, | ||||||
| sessionAccountID: number, | ||||||
| allowEditingConciergeTask?: boolean, | ||||||
| taskOwnerAccountID?: number, | ||||||
| taskAssigneeAccountID?: number, | ||||||
|
Comment on lines
+1223
to
+1224
There was a problem hiding this comment.
Suggested change
Do we have a use case that requires using this parameter? If the change comes from a previous update, I think we can consider remove this prop. (the same with the canActionTask function) |
||||||
| ): boolean { | ||||||
| const ownerAccountID = getTaskOwnerAccountID(taskReport) ?? taskOwnerAccountID; | ||||||
| const assigneeAccountID = getTaskAssigneeAccountID(taskReport) ?? taskAssigneeAccountID; | ||||||
| if (ownerAccountID === CONST.ACCOUNT_ID.CONCIERGE && !allowEditingConciergeTask) { | ||||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| if (ReportUtils.isCanceledTaskReport(taskReport)) { | ||||||
| return false; | ||||||
| } | ||||||
|
|
@@ -1227,7 +1239,7 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID | |||||
| return false; | ||||||
| } | ||||||
|
|
||||||
| if (sessionAccountID === ownerAccountID || sessionAccountID === assigneeAccountID) { | ||||||
| return true; | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -1241,8 +1253,10 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID | |||||
| /** | ||||||
| * Check if you can change the status of the task (mark complete or incomplete). Only the task owner and task assignee can do this. | ||||||
| */ | ||||||
| function canActionTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID: number, taskOwnerAccountID?: number, taskAssigneeAccountID?: number): boolean { | ||||||
| const ownerAccountID = getTaskOwnerAccountID(taskReport) ?? taskOwnerAccountID; | ||||||
| const assigneeAccountID = getTaskAssigneeAccountID(taskReport) ?? taskAssigneeAccountID; | ||||||
| return sessionAccountID === ownerAccountID || sessionAccountID === assigneeAccountID; | ||||||
| } | ||||||
|
|
||||||
| function clearTaskErrors(reportID: string) { | ||||||
|
|
@@ -1286,9 +1300,9 @@ export { | |||||
| getTaskAssigneeAccountID, | ||||||
| clearTaskErrors, | ||||||
| canModifyTask, | ||||||
| setNewOptimisticAssignee, | ||||||
| getNavigationUrlOnTaskDelete, | ||||||
| canActionTask, | ||||||
| }; | ||||||
|
|
||||||
| export type {PolicyValue, Assignee, ShareDestination}; | ||||||
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 | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -20,6 +20,7 @@ import SubscriptAvatar from '@components/SubscriptAvatar'; | |||||||||
| import TaskHeaderActionButton from '@components/TaskHeaderActionButton'; | ||||||||||
| import Text from '@components/Text'; | ||||||||||
| import Tooltip from '@components/Tooltip'; | ||||||||||
| import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; | ||||||||||
| import useLocalize from '@hooks/useLocalize'; | ||||||||||
| import usePolicy from '@hooks/usePolicy'; | ||||||||||
| import useResponsiveLayout from '@hooks/useResponsiveLayout'; | ||||||||||
|
|
@@ -75,6 +76,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto | |||||||||
| const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID || report?.reportID || '-1'}`); | ||||||||||
| const policy = usePolicy(report?.policyID); | ||||||||||
| const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST); | ||||||||||
| const {accountID} = useCurrentUserPersonalDetails(); | ||||||||||
|
|
||||||||||
| const {translate} = useLocalize(); | ||||||||||
| const theme = useTheme(); | ||||||||||
|
|
@@ -288,7 +290,9 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto | |||||||||
| </PressableWithoutFeedback> | ||||||||||
| <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}> | ||||||||||
| {!shouldUseNarrowLayout && isChatUsedForOnboarding && freeTrialButton} | ||||||||||
| {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && Task.canActionTask(report, accountID) && ( | ||||||||||
| <TaskHeaderActionButton report={report} /> | ||||||||||
| )} | ||||||||||
|
Comment on lines
+293
to
+295
There was a problem hiding this comment.
Suggested change
We should revert the condition checking |
||||||||||
| {!isParentReportLoading && canJoin && !shouldUseNarrowLayout && joinButton} | ||||||||||
| </View> | ||||||||||
| {shouldDisplaySearchRouter && <SearchButton style={styles.ml2} />} | ||||||||||
|
|
||||||||||
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.
Do we have a use case that requires using this parameter? If the change comes from a previous update, I think we can consider remove this prop (the same with the reopenTask function)