Skip to content

Fix workspace money request is archived when we delete the workspace #31900

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
MariaHCD merged 7 commits into from
Jan 24, 2024
Merged

Fix workspace money request is archived when we delete the workspace #31900

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de66326
only archive chat room, expense chat, and task
bernhardoj Nov 27, 2023
79aaa4b
update func name and comment
bernhardoj Nov 27, 2023
86fa182
add jsdoc returns
bernhardoj Nov 27, 2023
2346a02
prettier
bernhardoj Nov 27, 2023
f9aaae6
Merge branch 'main' into fix/28187-workspace-report-acrhive
bernhardoj Dec 20, 2023
eb56e2c
Merge branch 'main' into fix/28187-workspace-report-acrhive
bernhardoj Jan 8, 2024
4c66022
Merge branch 'main' into fix/28187-workspace-report-acrhive
bernhardoj Jan 24, 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
11 changes: 10 additions & 1 deletion src/pages/workspace/WorkspaceInitialPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ function dismissError(policyID) {
Policy.removeWorkspace(policyID);
}

/**
* Whether the policy report should be archived when we delete the policy.
* @param {Object} report
* @returns {Boolean}
*/
function shouldArchiveReport(report) {
return ReportUtils.isChatRoom(report) || ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isTaskReport(report);
}

@bernhardoj bernhardoj Nov 27, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Task report is also added considering we want to archive task report too.

@situchan situchan Jan 24, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why is the condition inverted?
What are the remaining reports other than money request reports, chat room, policy expense chat, task report?
Does this also archive #announce, #admins rooms and threads?

@bernhardoj bernhardoj Jan 24, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The condition is based on this comment

Does this also archive #announce, #admins rooms and threads?

Both are chat rooms, thread will take the parent chat type


function WorkspaceInitialPage(props) {
const styles = useThemeStyles();
const policy = props.policyDraft && props.policyDraft.id ? props.policyDraft : props.policy;
Expand Down Expand Up @@ -111,7 +120,7 @@ function WorkspaceInitialPage(props) {
* Call the delete policy and hide the modal
*/
const confirmDeleteAndHideModal = useCallback(() => {
Policy.deleteWorkspace(policyID, policyReports, policy.name);
Policy.deleteWorkspace(policyID, _.filter(policyReports, shouldArchiveReport), policy.name);
setIsDeleteModalOpen(false);
// Pop the deleted workspace page before opening workspace settings.
Navigation.goBack(ROUTES.SETTINGS_WORKSPACES);
Expand Down