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

Jump to bottom

fix: Deleted room is displayed in the 'Assign task' #51625

Merged
merged 18 commits into from
Nov 15, 2024
+53 −7
Merged

fix: Deleted room is displayed in the 'Assign task' #51625

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0abb380
fix: Deleted room is displayed in the 'Assign task'
nkdengineer Oct 29, 2024
e5c21aa
Merge branch 'main' into fix/50418
nkdengineer Oct 29, 2024
5889c08
fix eslint
nkdengineer Oct 29, 2024
6b83b80
Merge branch 'main' into fix/50418
nkdengineer Oct 30, 2024
8c5dedd
Merge branch 'main' into fix/50418
nkdengineer Nov 1, 2024
83a70f9
fix show QAB subtitle
nkdengineer Nov 1, 2024
0c76e41
resolve conflict
nkdengineer Nov 5, 2024
f4b5456
resolve conflict
nkdengineer Nov 7, 2024
69f1806
fix lint
nkdengineer Nov 7, 2024
4ea4fcd
fix lint
nkdengineer Nov 8, 2024
5dbe5e5
Merge branch 'main' into fix/50418
nkdengineer Nov 11, 2024
bbbcce9
fix: add test for QAB
nkdengineer Nov 12, 2024
5447d04
resolve conflict
nkdengineer Nov 12, 2024
f13f4e3
merge main
nkdengineer Nov 14, 2024
d3c1b99
add comment context
nkdengineer Nov 14, 2024
784ec89
fix test
nkdengineer Nov 14, 2024
76ce7c8
fix lint
nkdengineer Nov 14, 2024
d9a6af7
Merge branch 'main' into fix/50418
nkdengineer Nov 15, 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
25 changes: 25 additions & 0 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7962,6 +7962,30 @@ function getOptimisticDataForParentReportAction(reportID: string, lastVisibleAct
});
}

function getQuickActionDetails(
quickActionReport: Report,
personalDetails: PersonalDetailsList | undefined,
policyChatForActivePolicy: Report | undefined,
reportNameValuePairs: ReportNameValuePairs,
): {quickActionAvatars: Icon[]; hideQABSubtitle: boolean} {
const isValidQuickActionReport = !(isEmptyObject(quickActionReport) || isArchivedRoom(quickActionReport, reportNameValuePairs));
let hideQABSubtitle = false;
let quickActionAvatars: Icon[] = [];
if (isValidQuickActionReport) {
const avatars = getIcons(quickActionReport, personalDetails);
quickActionAvatars = avatars.length <= 1 || isPolicyExpenseChat(quickActionReport) ? avatars : avatars.filter((avatar) => avatar.id !== currentUserAccountID);
} else {
hideQABSubtitle = true;
}
if (!isEmptyObject(policyChatForActivePolicy)) {
quickActionAvatars = getIcons(policyChatForActivePolicy, personalDetails);
}
return {
quickActionAvatars,
hideQABSubtitle,
};
}

function canBeAutoReimbursed(report: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy> | SearchPolicy): boolean {
if (isEmptyObject(policy)) {
return false;
Expand Down Expand Up @@ -8585,6 +8609,7 @@ export {
getInvoicePayerName,
getInvoicesChatName,
getPayeeName,
getQuickActionDetails,
hasActionsWithErrors,
hasAutomatedExpensifyAccountIDs,
hasExpensifyGuidesEmails,
Expand Down
13 changes: 6 additions & 7 deletions src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl

const {canUseSpotnanaTravel, canUseCombinedTrackSubmit} = usePermissions();
const canSendInvoice = useMemo(() => PolicyUtils.canSendInvoice(allPolicies as OnyxCollection<OnyxTypes.Policy>, session?.email), [allPolicies, session?.email]);
const isValidReport = !(isEmptyObject(quickActionReport) || ReportUtils.isArchivedRoom(quickActionReport, reportNameValuePairs));
const {environment} = useEnvironment();
const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
const navatticURL = getNavatticURL(environment, introSelected?.choice);
Expand All @@ -199,7 +200,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
}, [allPolicies]);

const quickActionAvatars = useMemo(() => {
if (quickActionReport) {
if (isValidReport) {
const avatars = ReportUtils.getIcons(quickActionReport, personalDetails);
return avatars.length <= 1 || ReportUtils.isPolicyExpenseChat(quickActionReport) ? avatars : avatars.filter((avatar) => avatar.id !== session?.accountID);
}
Expand Down Expand Up @@ -234,15 +235,15 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
}, [quickAction, translate, quickActionAvatars, quickActionReport]);

const hideQABSubtitle = useMemo(() => {
if (isEmptyObject(quickActionReport)) {
if (!isValidReport) {
return true;
}
if (quickActionAvatars.length === 0) {
return false;
}
const displayName = personalDetails?.[quickActionAvatars.at(0)?.id ?? -1]?.firstName ?? '';
return quickAction?.action === CONST.QUICK_ACTIONS.SEND_MONEY && displayName.length === 0;
}, [personalDetails, quickActionReport, quickAction?.action, quickActionAvatars]);
}, [isValidReport, quickActionAvatars, personalDetails, quickAction?.action]);

const selectOption = useCallback(
(onSelected: () => void, shouldRestrictAction: boolean) => {
Expand All @@ -256,7 +257,6 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
);

const navigateToQuickAction = useCallback(() => {
const isValidReport = !(isEmptyObject(quickActionReport) || ReportUtils.isArchivedRoom(quickActionReport, reportNameValuePairs));
const quickActionReportID = isValidReport ? quickActionReport?.reportID ?? '-1' : ReportUtils.generateReportID();

switch (quickAction?.action) {
Expand Down Expand Up @@ -285,7 +285,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
break;
default:
}
}, [quickAction, quickActionReport, reportNameValuePairs, selectOption]);
}, [isValidReport, quickAction?.action, quickAction?.targetAccountID, quickActionReport?.reportID, selectOption]);

/**
* Check if LHN status changed from active to inactive.
Expand Down Expand Up @@ -473,7 +473,6 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
onSelected: () =>
interceptAnonymousUser(() => {
selectOption(() => {
const isValidReport = !(isEmptyObject(policyChatForActivePolicy) || ReportUtils.isArchivedRoom(policyChatForActivePolicy, reportNameValuePairs));
const quickActionReportID = isValidReport ? policyChatForActivePolicy?.reportID ?? '-1' : ReportUtils.generateReportID();
IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID ?? '-1', CONST.IOU.REQUEST_TYPE.SCAN, true);
}, true);
Expand All @@ -500,7 +499,7 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu}: Fl
quickActionReport,
navigateToQuickAction,
selectOption,
reportNameValuePairs,
isValidReport,
]);

return (
Expand Down
16 changes: 16 additions & 0 deletions tests/unit/ReportUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,22 @@ describe('ReportUtils', () => {
});
});

describe('getQuickActionDetails', () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for adding this test!

Can you please follow this format to add a little bit of context and documentation to the test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tgolen i updated

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, close enough, but that format is meant to have each comment start with literal "Given", "When" and "Then" words :D

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Noted for the feature.

it('if the report is archived, the quick action will hide the subtitle and avatar', () => {
const archivedReport: Report = {
reportID: '1',
private_isArchived: DateUtils.getDBTime(),
};
const reportNameValuePairs = {
type: 'chat',
private_isArchived: true,
};
const quickActionDetails = ReportUtils.getQuickActionDetails(archivedReport, undefined, undefined, reportNameValuePairs);
expect(quickActionDetails.quickActionAvatars.length).toEqual(0);
expect(quickActionDetails.hideQABSubtitle).toEqual(true);
});
});

describe('getChatByParticipants', () => {
const userAccountID = 1;
const userAccountID2 = 2;
Expand Down
Loading