Merge pull request Expensify#36225 from mkhutornyi/fix-35174

fix workspace chats and rooms not archived when delete policy offline
Aashw1n · Feb 12, 2024 · 6c5bbbd · 6c5bbbd
2 parents 96e4614 + b7ea5b3
commit 6c5bbbd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
@@ -116,6 +116,13 @@ Onyx.connect({
     },
 });
 
+let allReports: OnyxCollection<Report> = null;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT,
+    waitForCollectionCallback: true,
+    callback: (value) => (allReports = value),
+});
+
 let allPolicyMembers: OnyxCollection<PolicyMember>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY_MEMBERS,
@@ -218,7 +225,7 @@ function hasActiveFreePolicy(policies: Array<OnyxEntry<Policy>> | PoliciesRecord
 /**
  * Delete the workspace
  */
-function deleteWorkspace(policyID: string, reports: Report[], policyName: string) {
+function deleteWorkspace(policyID: string, policyName: string) {
     if (!allPolicies) {
         return;
     }
@@ -247,7 +254,9 @@ function deleteWorkspace(policyID: string, reports: Report[], policyName: string
             : []),
     ];
 
-    reports.forEach(({reportID, ownerAccountID}) => {
+    const reportsToArchive = Object.values(allReports ?? {}).filter((report) => report?.policyID === policyID && (ReportUtils.isChatRoom(report) || ReportUtils.isPolicyExpenseChat(report)));
+    reportsToArchive.forEach((report) => {
+        const {reportID, ownerAccountID} = report ?? {};
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
@@ -292,7 +301,8 @@ function deleteWorkspace(policyID: string, reports: Report[], policyName: string
         },
     ];
 
-    reports.forEach(({reportID, stateNum, statusNum, hasDraft, oldPolicyName}) => {
+    reportsToArchive.forEach((report) => {
+        const {reportID, stateNum, statusNum, hasDraft, oldPolicyName} = report ?? {};
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,

diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
@@ -126,7 +126,7 @@ function WorkspacesListPage({policies, allPolicyMembers, reimbursementAccount, r
             return;
         }
 
-        Policy.deleteWorkspace(policyIDToDelete, [], policyNameToDelete);
+        Policy.deleteWorkspace(policyIDToDelete, policyNameToDelete);
         setIsDeleteModalOpen(false);
     };
-Original file line number
+Diff line change
@@ Expand Up @@
                 return;
             }
-            Policy.deleteWorkspace(policyIDToDelete, [], policyNameToDelete);
+            Policy.deleteWorkspace(policyIDToDelete, policyNameToDelete);
             setIsDeleteModalOpen(false);
         };
@@ Expand Down @@