From dd6d6df03e8c18d74530a2ae4278b8075b2162c4 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 18:16:37 -0400 Subject: [PATCH 1/9] Use showStates in report params so that report state filters get applied in OldDot --- src/pages/workspace/bills/WorkspaceBillsFirstSection.js | 2 +- src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js | 2 +- src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js | 2 +- src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js index c4c61849407..5a8aa51b677 100644 --- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js +++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js @@ -50,7 +50,7 @@ const WorkspaceBillsFirstSection = ({ { 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?param={"startDate":"","endDate":"","reportName":"","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 index ac837d9482b..40f48ae1d7d 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js @@ -35,7 +35,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?param={"startDate":"","endDate":"","reportName":"","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 index 821421d4f6d..e19fef6b995 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js @@ -31,7 +31,7 @@ const WorkspaceInvoicesVBAView = ({translate, policyID}) => ( { 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?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"invoice","showStates":"Processing","isAdvancedFilterMode":true}`), icon: CircleHourglass, shouldShowRightIcon: true, iconRight: NewWindow, diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js index 19d65bf5f46..272ed5c4d35 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js @@ -31,7 +31,7 @@ const WorkspaceReimburseNoVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.reimburse.viewAllReceipts'), - onPress: () => openOldDotLink(`expenses?policyIDList=${policyID}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`), + onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"expense","showStates":"Archived","isAdvancedFilterMode":"true"}`), icon: Receipt, shouldShowRightIcon: true, iconRight: NewWindow, From 7e6ba03c381cebb30fb0c1fa05e2561eb79f4150 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 18:53:04 -0400 Subject: [PATCH 2/9] Apply report filters to other places as well --- src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js index b1d78e28562..98a1197af4b 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js @@ -55,7 +55,7 @@ const WorkspaceReimburseVBAView = ({translate, policyID}) => ( { 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?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"expense","showStates":"Archived","isAdvancedFilterMode":true}`), icon: Bank, shouldShowRightIcon: true, iconRight: NewWindow, From 868873e6ed872db4d10768155660dbb2e6b240d9 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 18:56:30 -0400 Subject: [PATCH 3/9] Fix max-len issue --- src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js index 272ed5c4d35..4176519cea1 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js @@ -31,6 +31,7 @@ const WorkspaceReimburseNoVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.reimburse.viewAllReceipts'), + // eslint-disable-next-line max-len onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"expense","showStates":"Archived","isAdvancedFilterMode":"true"}`), icon: Receipt, shouldShowRightIcon: true, From 3466f02644f134f6bd330237e686d3a201177eed Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 19:38:06 -0400 Subject: [PATCH 4/9] revert unneeded change --- src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js index 4176519cea1..69d2033b5ed 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js @@ -32,7 +32,7 @@ const WorkspaceReimburseNoVBAView = ({translate, policyID}) => ( { title: translate('workspace.reimburse.viewAllReceipts'), // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"expense","showStates":"Archived","isAdvancedFilterMode":"true"}`), + onPress: () => openOldDotLink(`expenses?policyIDList=${policyID}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`), icon: Receipt, shouldShowRightIcon: true, iconRight: NewWindow, From 100a2e595ed8596832c571f4c7bef9a5c51e4985 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 19:44:47 -0400 Subject: [PATCH 5/9] Use url params --- src/pages/workspace/bills/WorkspaceBillsFirstSection.js | 2 +- src/pages/workspace/bills/WorkspaceBillsVBAView.js | 2 +- src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js | 2 +- src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js | 2 +- src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js index 5a8aa51b677..6021e5ec339 100644 --- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js +++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js @@ -50,7 +50,7 @@ const WorkspaceBillsFirstSection = ({ { title: translate('workspace.bills.viewAllBills'), // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"bill","showStates":"Processing,Approved","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/bills/WorkspaceBillsVBAView.js b/src/pages/workspace/bills/WorkspaceBillsVBAView.js index a69a56b326c..ab9e607a6c9 100644 --- a/src/pages/workspace/bills/WorkspaceBillsVBAView.js +++ b/src/pages/workspace/bills/WorkspaceBillsVBAView.js @@ -31,7 +31,7 @@ const WorkspaceBillsVBAView = ({translate, policyID}) => ( { 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 index 40f48ae1d7d..e169b5ed189 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js @@ -35,7 +35,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","showStates":"Open,Processing,Approved,Reimbursed,Archived","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 index e19fef6b995..c10a153c1ba 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js @@ -31,7 +31,7 @@ const WorkspaceInvoicesVBAView = ({translate, policyID}) => ( { title: translate('workspace.invoices.viewUnpaidInvoices'), // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"invoice","showStates":"Processing","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 index 98a1197af4b..6fa4d34dfb6 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js @@ -55,7 +55,7 @@ const WorkspaceReimburseVBAView = ({translate, policyID}) => ( { title: translate('workspace.reimburse.reimburseReceipts'), // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?param={"startDate":"","endDate":"","reportName":"","policyID":"${policyID}","from":"all","type":"expense","showStates":"Archived","isAdvancedFilterMode":true}`), + onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`), icon: Bank, shouldShowRightIcon: true, iconRight: NewWindow, From 0425fe0721f4062f92100546cdd662819477d472 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 19:45:27 -0400 Subject: [PATCH 6/9] fix missing policyID --- src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js index e169b5ed189..55b629eb3f5 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js @@ -35,7 +35,7 @@ const WorkspaceInvoicesFirstSection = ({translate, policyID}) => ( { title: translate('workspace.invoices.viewAllInvoices'), // eslint-disable-next-line max-len - onPress: () => openOldDotLink(`reports?policyID=policyID&from=all&type=invoice&showStates=Open,Processing,Approved,Reimbursed,Archived&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, From 2095a8737955d8d5c56e7b6891f8767099110534 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 19:50:20 -0400 Subject: [PATCH 7/9] remove unused linter exception --- src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js | 1 - src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js index 69d2033b5ed..19d65bf5f46 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js @@ -31,7 +31,6 @@ const WorkspaceReimburseNoVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.reimburse.viewAllReceipts'), - // eslint-disable-next-line max-len onPress: () => openOldDotLink(`expenses?policyIDList=${policyID}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`), icon: Receipt, shouldShowRightIcon: true, diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js index 6fa4d34dfb6..72f88e13239 100644 --- a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js +++ b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js @@ -54,7 +54,6 @@ const WorkspaceReimburseVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.reimburse.reimburseReceipts'), - // eslint-disable-next-line max-len onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`), icon: Bank, shouldShowRightIcon: true, From f27300f3c82876243011482ef1e6dcb372bde560 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 19:51:54 -0400 Subject: [PATCH 8/9] remove unused linter exception --- src/pages/workspace/bills/WorkspaceBillsFirstSection.js | 1 - src/pages/workspace/bills/WorkspaceBillsVBAView.js | 1 - src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js | 1 - src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js | 1 - 4 files changed, 4 deletions(-) diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js index 6021e5ec339..c8662f2db28 100644 --- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js +++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js @@ -49,7 +49,6 @@ const WorkspaceBillsFirstSection = ({ menuItems={[ { title: translate('workspace.bills.viewAllBills'), - // eslint-disable-next-line max-len onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=bill&showStates=Processing,Approved&isAdvancedFilterMode=true`), icon: Bill, shouldShowRightIcon: true, diff --git a/src/pages/workspace/bills/WorkspaceBillsVBAView.js b/src/pages/workspace/bills/WorkspaceBillsVBAView.js index ab9e607a6c9..243aa362cbc 100644 --- a/src/pages/workspace/bills/WorkspaceBillsVBAView.js +++ b/src/pages/workspace/bills/WorkspaceBillsVBAView.js @@ -30,7 +30,6 @@ const WorkspaceBillsVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.common.bills'), - // eslint-disable-next-line max-len onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=bill&showStates=Processing,Approved&isAdvancedFilterMode=true`), icon: Bill, shouldShowRightIcon: true, diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js index 55b629eb3f5..c37cd258da8 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesFirstSection.js @@ -34,7 +34,6 @@ const WorkspaceInvoicesFirstSection = ({translate, policyID}) => ( }, { title: translate('workspace.invoices.viewAllInvoices'), - // eslint-disable-next-line max-len onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=invoice&showStates=Open,Processing,Approved,Reimbursed,Archived&isAdvancedFilterMode=true`), icon: Invoice, shouldShowRightIcon: true, diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js index c10a153c1ba..87674bed4c2 100644 --- a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js +++ b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js @@ -30,7 +30,6 @@ const WorkspaceInvoicesVBAView = ({translate, policyID}) => ( menuItems={[ { title: translate('workspace.invoices.viewUnpaidInvoices'), - // eslint-disable-next-line max-len onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=invoice&showStates=Processing&isAdvancedFilterMode=true`), icon: CircleHourglass, shouldShowRightIcon: true, From 3f908f9e2d856cc74dd04b8f7f03221b09ca70de Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Wed, 13 Oct 2021 20:19:35 -0400 Subject: [PATCH 9/9] Fix view all bills link --- src/pages/workspace/bills/WorkspaceBillsFirstSection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js index c8662f2db28..3b2cbdb47c5 100644 --- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js +++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js @@ -49,7 +49,7 @@ const WorkspaceBillsFirstSection = ({ menuItems={[ { title: translate('workspace.bills.viewAllBills'), - onPress: () => openOldDotLink(`reports?policyID=${policyID}&from=all&type=bill&showStates=Processing,Approved&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,