Skip to content

Task Share Destination Fixes #24019

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

Merged
merged 17 commits into from
Aug 3, 2023
Merged

Task Share Destination Fixes #24019

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a262192
Task Share Destination Fixes
Thanos30 Aug 1, 2023
8c98c9a
Apply options discussed in issue
Thanos30 Aug 1, 2023
b670ed5
remove not needed parameter
Thanos30 Aug 1, 2023
c3591e5
Update test to match new functionality
Thanos30 Aug 1, 2023
603b305
prettify code and correct test to exclude archived rooms
Thanos30 Aug 1, 2023
3dd5301
add fic on workspace reports
Thanos30 Aug 1, 2023
157f56d
make name more obvious
Thanos30 Aug 2, 2023
b778073
Merge remote-tracking branch 'upstream/main' into fix/task-share-dest…
Thanos30 Aug 2, 2023
e938e74
exclude Archived Rooms
Thanos30 Aug 3, 2023
1308dfd
exclude expensify accounts
Thanos30 Aug 3, 2023
a21355e
Use common function to determine if we can share a task in a report
Thanos30 Aug 3, 2023
c703f7d
prettify
Thanos30 Aug 3, 2023
6bac6dc
fix name accuracy
Thanos30 Aug 3, 2023
de39deb
remove unneeded parameter
Thanos30 Aug 3, 2023
b9cc192
update function's docs and name
Thanos30 Aug 3, 2023
ce779cc
remove unneeded space
Thanos30 Aug 3, 2023
18daf91
remove space
Thanos30 Aug 3, 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
9 changes: 8 additions & 1 deletion src/pages/tasks/TaskShareDestinationSelectorModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-disable es/no-optional-chaining */
import React, {useState, useEffect, useMemo, useCallback} from 'react';
import _ from 'underscore';
import lodashGet from 'lodash/get';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import {withOnyx} from 'react-native-onyx';
Expand Down Expand Up @@ -49,7 +50,13 @@ function TaskShareDestinationSelectorModal(props) {
const filteredReports = useMemo(() => {
const reports = {};
_.keys(props.reports).forEach((reportKey) => {
if (!ReportUtils.isAllowedToComment(props.reports[reportKey]) || ReportUtils.isArchivedRoom(props.reports[reportKey])) {
console.log('reportKey', props);
if (
!ReportUtils.isAllowedToComment(props.reports[reportKey]) ||
ReportUtils.isArchivedRoom(props.reports[reportKey]) ||
(lodashGet(props.reports[reportKey], 'participantAccountIDs', []).length === 1 &&
_.some(props.reports[reportKey].participantAccountIDs, (accountID) => _.contains(CONST.EXPENSIFY_ACCOUNT_IDS, accountID)))
Copy link
Contributor

Choose a reason for hiding this comment

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

Make common function in ReportUtils similar to isConciergeChatReport and use it both here and ReportActionCompose.
We avoid duplicated 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.

Roger that

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@situchan Thank you for your feedback. Let me know what you think of the changes 🙏

) {
return;
}
reports[reportKey] = props.reports[reportKey];
Expand Down