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

Don't allow user to change write capability in workspace chat #56453

Merged
merged 4 commits into from
Feb 6, 2025
Merged

Don't allow user to change write capability in workspace chat #56453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7a7713
don't allow user to change write capability in workspace chat
bernhardoj Feb 6, 2025
ae6427d
lint
bernhardoj Feb 6, 2025
472192e
fix test
bernhardoj Feb 6, 2025
adf29d4
remove async
bernhardoj Feb 6, 2025
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/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7923,7 +7923,14 @@ function shouldDisableRename(report: OnyxEntry<Report>): boolean {
* @param policy - the workspace the report is on, null if the user isn't a member of the workspace
*/
function canEditWriteCapability(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
return isPolicyAdminPolicyUtils(policy) && !isAdminRoom(report) && !isArchivedReport(getReportNameValuePairs(report?.reportID)) && !isThread(report) && !isInvoiceRoom(report);
return (
isPolicyAdminPolicyUtils(policy) &&
!isAdminRoom(report) &&
!isArchivedReport(getReportNameValuePairs(report?.reportID)) &&
!isThread(report) &&
!isInvoiceRoom(report) &&
!isPolicyExpenseChat(report)
);
}

/**
Expand Down
11 changes: 11 additions & 0 deletions tests/unit/ReportUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
buildOptimisticIOUReportAction,
buildParticipantsFromAccountIDs,
buildTransactionThread,
canEditWriteCapability,
getAllAncestorReportActions,
getApprovalChain,
getChatByParticipants,
Expand Down Expand Up @@ -1834,6 +1835,16 @@ describe('ReportUtils', () => {
});
});

describe('canEditWriteCapability', () => {
it('should return false for workspace chat', () => {
const workspaceChat: Report = {
...createRandomReport(1),
chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
};
expect(canEditWriteCapability(workspaceChat, {...policy, role: CONST.POLICY.ROLE.ADMIN})).toBe(false);
});
});

describe('getApprovalChain', () => {
describe('submit and close policy', () => {
it('should return empty array', () => {
Expand Down