Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: tapping assignee and mark as complete quickly navigates to not found page #41667

Merged
merged 12 commits into from
Jul 10, 2024
Merged

fix: tapping assignee and mark as complete quickly navigates to not found page #41667

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3f01909
fix: tapping assignee and mark as complete quickly navigates to not f…
tienifr May 6, 2024
35e7a98
Merge branch 'main' of https://github.com/tienifr/App into fix/38577-…
tienifr Jun 14, 2024
10a282f
Merge branch 'main' of https://github.com/tienifr/App into fix/38577-…
tienifr Jun 19, 2024
9b6b699
revert singleExecution approach
tienifr Jun 19, 2024
3c1d2ca
Merge branch 'main' of https://github.com/tienifr/App into fix/38577-…
tienifr Jun 19, 2024
dcdff40
Merge branch 'main' of https://github.com/tienifr/App into fix/38577-…
tienifr Jun 20, 2024
6d91057
check active route approach
tienifr Jun 20, 2024
0308f12
remove redundant changes
tienifr Jun 20, 2024
34ce439
Merge branch 'main' of https://github.com/tienifr/App into fix/38577-…
tienifr Jul 8, 2024
8dc6389
add explanative comments
tienifr Jul 8, 2024
b6cc4bd
Merge branch 'main' of https://github.com/tienifr/App into fix/38577-…
tienifr Jul 10, 2024
9b7af88
include task title route
tienifr Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/components/ReportActionItem/TaskView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ function TaskView({report, ...props}: TaskViewProps) {
<View style={[styles.flexRow, styles.flex1]}>
<Checkbox
onPress={Session.checkIfActionIsAllowed(() => {
if (
Navigation.isActiveRoute(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID)) ||
Navigation.isActiveRoute(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID))
) {
return;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tienifr I mean comment in the code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Updated.

}
if (isCompleted) {
Task.reopenTask(report);
} else {
Expand Down
13 changes: 12 additions & 1 deletion src/components/TaskHeaderActionButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import type {OnyxEntry} from 'react-native-onyx';
import {withOnyx} from 'react-native-onyx';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import * as ReportUtils from '@libs/ReportUtils';
import * as Session from '@userActions/Session';
import * as Task from '@userActions/Task';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type * as OnyxTypes from '@src/types/onyx';
import Button from './Button';

Expand Down Expand Up @@ -36,7 +38,16 @@ function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps)
isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1)}
medium
text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
onPress={Session.checkIfActionIsAllowed(() => (ReportUtils.isCompletedTaskReport(report) ? Task.reopenTask(report) : Task.completeTask(report)))}
onPress={Session.checkIfActionIsAllowed(() => {
if (Navigation.isActiveRoute(ROUTES.TASK_ASSIGNEE.getRoute(report.reportID)) || Navigation.isActiveRoute(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID))) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have to add the TASK_TITLE route here as well, only click I am getting the 404 now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please trigger another build so we can retest it.

return;
}
if (ReportUtils.isCompletedTaskReport(report)) {
Task.reopenTask(report);
} else {
Task.completeTask(report);
}
})}
style={styles.flex1}
/>
</View>
Expand Down
Loading