Skip to content

fix: pass workspace policyID when exporting with account-level custom templates #92131

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

Draft
aswin-s wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −3
Draft

fix: pass workspace policyID when exporting with account-level custom templates #92131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/hooks/useExportActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function useExportActions({reportID, policy, onPDFModalOpen}: UseExportActionsPa
jsonQuery: '{}',
reportIDList: [moneyRequestReport.reportID],
transactionIDList,
policyID,
policyID: policyID ?? moneyRequestReport.policyID,
});
};

Expand Down
9 changes: 7 additions & 2 deletions src/hooks/useSearchBulkActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,18 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
return;
}

const selectedPolicyID = selectedPolicyIDs.length === 1 ? selectedPolicyIDs.at(0) : undefined;
const queryPolicyID = queryJSON?.policyID?.length === 1 ? queryJSON.policyID.at(0) : undefined;
const exportPolicyID = policyID ?? (areAllMatchingItemsSelected ? queryPolicyID : selectedPolicyID);

if (areAllMatchingItemsSelected) {
queueExportSearchWithTemplate({
templateName,
templateType,
jsonQuery: queryJSON ? serializeQueryJSONForBackend(queryJSON) : JSON.stringify(queryJSON),
reportIDList: [],
transactionIDList: [],
policyID,
policyID: exportPolicyID,
});
} else {
queueExportSearchWithTemplate({
Expand All @@ -494,7 +498,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
jsonQuery: '{}',
reportIDList: selectedTransactionReportIDs,
transactionIDList: selectedTransactionsKeys,
policyID,
policyID: exportPolicyID,
});
}

Expand All @@ -520,6 +524,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
queryJSON,
selectedTransactionReportIDs,
selectedTransactionsKeys,
selectedPolicyIDs,
],
);

Expand Down
Loading