Merge pull request #5829 from Expensify/amal-fix-report-filtering

Use showStates in report params so that report state filters work in OldDot
Expensify · Oct 14, 2021 · ec48d35 · ec48d35
2 parents 2bef474 + 3f908f9
commit ec48d35
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
@@ -49,8 +49,7 @@ const WorkspaceBillsFirstSection = ({
             menuItems={[
                 {
                     title: translate('workspace.bills.viewAllBills'),
-                    // eslint-disable-next-line max-len
-                    onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"bill","states":{"Open":true,"Processing":true,"Approved":true,"Reimbursed":true,"Archived":true},"isAdvancedFilterMode":true}`),
+                    onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=bill&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`),
                     icon: Bill,
                     shouldShowRightIcon: true,
                     iconRight: NewWindow,

diff --git a/src/pages/workspace/bills/WorkspaceBillsVBAView.js b/src/pages/workspace/bills/WorkspaceBillsVBAView.js
@@ -30,8 +30,7 @@ const WorkspaceBillsVBAView = ({translate, policyID}) => (
             menuItems={[
                 {
                     title: translate('workspace.common.bills'),
-                    // eslint-disable-next-line max-len
-                    onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"bill","states":{"Open":false,"Processing":true,"Approved":true,"Reimbursed":false,"Archived":false},"isAdvancedFilterMode":true}`),
+                    onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=bill&showStates=Processing,Approved&isAdvancedFilterMode=true`),
                     icon: Bill,
                     shouldShowRightIcon: true,
                     iconRight: NewWindow,

diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js
@@ -34,8 +34,7 @@ const WorkspaceInvoicesFirstSection = ({translate, policyID}) => (
             },
             {
                 title: translate('workspace.invoices.viewAllInvoices'),
-                // eslint-disable-next-line max-len
-                onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"invoice","states":{"Open":true,"Processing":true,"Approved":true,"Reimbursed":true,"Archived":true},"isAdvancedFilterMode":true}`),
+                onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=invoice&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`),
                 icon: Invoice,
                 shouldShowRightIcon: true,
                 iconRight: NewWindow,

diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
@@ -30,8 +30,7 @@ const WorkspaceInvoicesVBAView = ({translate, policyID}) => (
             menuItems={[
                 {
                     title: translate('workspace.invoices.viewUnpaidInvoices'),
-                    // eslint-disable-next-line max-len
-                    onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"invoice","states":{"Open":false,"Processing":true,"Approved":false,"Reimbursed":false,"Archived":false},"isAdvancedFilterMode":true}`),
+                    onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=invoice&showStates=Processing&isAdvancedFilterMode=true`),
                     icon: CircleHourglass,
                     shouldShowRightIcon: true,
                     iconRight: NewWindow,

diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js
@@ -54,8 +54,7 @@ const WorkspaceReimburseVBAView = ({translate, policyID}) => (
             menuItems={[
                 {
                     title: translate('workspace.reimburse.reimburseReceipts'),
-                    // eslint-disable-next-line max-len
-                    onPress: () => openOldDotLink(`reports?param={"startDate":","endDate":","reportName":","policyID":"${policyID}","from":"all","type":"expense","states":{"Open":false,"Processing":false,"Approved":false,"Reimbursed":false,"Archived":true},"isAdvancedFilterMode":true}`),
+                    onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`),
                     icon: Bank,
                     shouldShowRightIcon: true,
                     iconRight: NewWindow,