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(task-pages): Force task page editions only for task reports #26924

Merged
merged 3 commits into from
Sep 11, 2023
Merged

fix(task-pages): Force task page editions only for task reports #26924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1125ae9
fix(task-pages): Force task page editions only for task reports
daordonez11 Sep 7, 2023
60646e9
fix: avoid dismissModal when creating new task
daordonez11 Sep 7, 2023
d45118b
fix: Include report id to ensure navigation to report in mobile
daordonez11 Sep 7, 2023
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
8 changes: 7 additions & 1 deletion src/pages/tasks/TaskAssigneeSelectorModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import compose from '../../libs/compose';
import personalDetailsPropType from '../personalDetailsPropType';
import reportPropTypes from '../reportPropTypes';
import ROUTES from '../../ROUTES';

import * as ReportUtils from '../../libs/ReportUtils';
import * as Task from '../../libs/actions/Task';

const propTypes = {
Expand Down Expand Up @@ -124,6 +124,12 @@ function TaskAssigneeSelectorModal(props) {
return props.reports[`${ONYXKEYS.COLLECTION.REPORT}${props.route.params.reportID}`];
}, [props.reports, props.route.params]);

if (report && !ReportUtils.isTaskReport(report)) {
Navigation.isNavigationReady().then(() => {
Navigation.dismissModal(report.reportID);
});
}

const sections = useMemo(() => {
const sectionsList = [];
let indexOffset = 0;
Expand Down
7 changes: 7 additions & 0 deletions src/pages/tasks/TaskDescriptionPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import * as Task from '../../libs/actions/Task';
import CONST from '../../CONST';
import focusAndUpdateMultilineInputRange from '../../libs/focusAndUpdateMultilineInputRange';
import * as Browser from '../../libs/Browser';
import * as ReportUtils from '../../libs/ReportUtils';
import Navigation from '../../libs/Navigation/Navigation';

const propTypes = {
/** Current user session */
Expand Down Expand Up @@ -46,6 +48,11 @@ function TaskDescriptionPage(props) {
[props],
);

if (!ReportUtils.isTaskReport(props.report)) {
Navigation.isNavigationReady().then(() => {
Navigation.dismissModal(props.report.reportID);
});
}
const inputRef = useRef(null);

return (
Expand Down
8 changes: 8 additions & 0 deletions src/pages/tasks/TaskTitlePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import reportPropTypes from '../reportPropTypes';
import compose from '../../libs/compose';
import * as Task from '../../libs/actions/Task';
import CONST from '../../CONST';
import * as ReportUtils from '../../libs/ReportUtils';
import Navigation from '../../libs/Navigation/Navigation';

const propTypes = {
/** The report currently being looked at */
Expand Down Expand Up @@ -58,6 +60,12 @@ function TaskTitlePage(props) {
[props],
);

if (!ReportUtils.isTaskReport(props.report)) {
Navigation.isNavigationReady().then(() => {
Navigation.dismissModal(props.report.reportID);
});
}

const inputRef = useRef(null);

return (
Expand Down