fix: Donations spreadsheet not respecting applied filters

src/components/admin/donations/grid/Grid.tsx

@@ -54,6 +54,13 @@ export default observer(function Grid() {
 
   const campaignId = router.query.campaignId as string | undefined
   const paymentId = router.query.paymentId as string | undefined
+  if (campaignId) {
+    donationStore.setCampaignId(campaignId)
+  }
+
+  if (paymentId) {
+    donationStore.setPaymentId(paymentId)
+  }
 
   const syncMutation = useMutation({
     mutationFn: async (id: string) => {

src/components/admin/donations/grid/GridAppbar.tsx

@@ -26,7 +26,12 @@ export default function GridAppbar() {
   const { donationStore } = useStores()
   const { t } = useTranslation()
   const exportToExcel = useMutation({
-    mutationFn: useExportToExcel(donationStore.donationFilters, donationStore.donationSearch),
+    mutationFn: useExportToExcel(
+      donationStore.donationFilters,
+      donationStore.donationSearch,
+      donationStore.getCampaignId,
+      donationStore.getPaymentId,
+    ),
     onError: () => AlertStore.show(t('common:alerts.error'), 'error'),
     onSuccess: ({ data }) => {
       downloadFile('Donations.xlsx', data)

src/service/apiEndpoints.ts

@@ -235,13 +235,20 @@ export const endpoints = {
     userDonations: <Endpoint>{ url: 'donation/user-donations', method: 'GET' },
     uploadBankTransactionsFile: (bankTransactionsFileId: string) =>
       <Endpoint>{ url: `/bank-transactions-file/${bankTransactionsFileId}`, method: 'POST' },
-    exportToExcel: (filterData?: FilterData, searchData?: string) =>
+    exportToExcel: (
+      filterData?: FilterData,
+      searchData?: string,
+      campaignId?: string,
+      paymentId?: string,
+    ) =>
       <Endpoint>{
         url: `/donation/export-excel?status=${filterData?.status}&provider=${
           filterData?.paymentProvider
         }&from=${filterData?.date.from}&to=${filterData?.date.to}&search=${searchData}&minAmount=${
           filterData?.minAmount ?? ''
-        }&maxAmount=${filterData?.maxAmount ?? ''}&sortBy=${filterData?.sortBy ?? ''}`,
+        }&maxAmount=${filterData?.maxAmount ?? ''}&sortBy=${
+          filterData?.sortBy ?? ''
+        }&campaignId=${campaignId}&paymentId=${paymentId}`,
         method: 'GET',
       },
   },

src/service/donation.ts

@@ -174,13 +174,21 @@ export const useUploadBankTransactionsFiles = () => {
   }
 }
 
-export const useExportToExcel = (filterData?: FilterData, searchData?: string) => {
+export const useExportToExcel = (
+  filterData?: FilterData,
+  searchData?: string,
+  campaignId?: string,
+  paymentId?: string,
+) => {
   const { data: session } = useSession()
   return async () => {
-    return await apiClient(endpoints.donation.exportToExcel(filterData, searchData).url, {
-      ...authConfig(session?.accessToken),
-      responseType: 'blob',
-    })
+    return await apiClient(
+      endpoints.donation.exportToExcel(filterData, searchData, campaignId, paymentId).url,
+      {
+        ...authConfig(session?.accessToken),
+        responseType: 'blob',
+      },
+    )
   }
 }
 

src/stores/DomainStores/DonationStore.ts

@@ -29,6 +29,7 @@ export class DonationStore {
   }
   donationSearch: string | undefined = undefined
   campaignId: string | undefined = undefined
+  paymentId: string | undefined = undefined
 
   constructor() {
     makeObservable(this, {
@@ -67,6 +68,10 @@ export class DonationStore {
     this.campaignId = value
   }
 
+  setPaymentId(value: string | undefined) {
+    this.paymentId = value
+  }
+
   get getDonations() {
     return this.donations
   }
@@ -82,4 +87,8 @@ export class DonationStore {
   get getCampaignId() {
     return this.campaignId
   }
+
+  get getPaymentId() {
+    return this.paymentId
+  }
 }