From faf7de0d8ed7f137d915cea4b41940a59a700b3c Mon Sep 17 00:00:00 2001 From: sniedzielski Date: Wed, 7 Aug 2024 14:49:56 +0200 Subject: [PATCH] CM-987: added short summary of records uploaded --- src/actions.js | 1 + src/components/payroll/BenefitConsumptionSearcher.js | 2 ++ .../payroll/BenefitConsumptionSearcherModal.js | 2 ++ src/components/payroll/PayrollPaymentFilesSearcher.js | 9 +++++++++ src/components/payroll/dialogs/AdditionalFieldsDialog.js | 6 ++++-- src/translations/en.json | 3 ++- 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/actions.js b/src/actions.js index e7a382c..1259ccc 100644 --- a/src/actions.js +++ b/src/actions.js @@ -92,6 +92,7 @@ const CSV_RECONCILIATION_PROJECTION = () => [ 'fileName', 'status', 'error', + 'jsonExt', ]; const PAYMENT_METHOD_PROJECTION = () => [ diff --git a/src/components/payroll/BenefitConsumptionSearcher.js b/src/components/payroll/BenefitConsumptionSearcher.js index 1893acd..7893ab6 100644 --- a/src/components/payroll/BenefitConsumptionSearcher.js +++ b/src/components/payroll/BenefitConsumptionSearcher.js @@ -79,6 +79,8 @@ function BenefitConsumptionSearcher({ (benefitConsumption) => ( ), ]; diff --git a/src/components/payroll/BenefitConsumptionSearcherModal.js b/src/components/payroll/BenefitConsumptionSearcherModal.js index 7e99d94..8d8d15a 100644 --- a/src/components/payroll/BenefitConsumptionSearcherModal.js +++ b/src/components/payroll/BenefitConsumptionSearcherModal.js @@ -137,6 +137,8 @@ function BenefitConsumptionSearcherModal({ (benefitAttachment) => ( ), (benefitAttachment) => ( diff --git a/src/components/payroll/PayrollPaymentFilesSearcher.js b/src/components/payroll/PayrollPaymentFilesSearcher.js index fe77b0a..f191919 100644 --- a/src/components/payroll/PayrollPaymentFilesSearcher.js +++ b/src/components/payroll/PayrollPaymentFilesSearcher.js @@ -16,6 +16,7 @@ import { } from '../../constants'; import { fetchPayrollPaymentFiles } from '../../actions'; import downloadPayroll from '../../utils/export'; +import AdditionalFieldsDialog from './dialogs/AdditionalFieldsDialog'; function PayrollPaymentFilesSearcher({ fetchingPayrollFiles, @@ -35,6 +36,7 @@ function PayrollPaymentFilesSearcher({ 'payrollPaymentFile.status', 'payrollPaymentFile.error', 'payrollPaymentFile.download', + '', ]; const defaultFilters = () => { @@ -76,6 +78,13 @@ function PayrollPaymentFilesSearcher({ ), + (file) => ( + + ), ]; return ( diff --git a/src/components/payroll/dialogs/AdditionalFieldsDialog.js b/src/components/payroll/dialogs/AdditionalFieldsDialog.js index fd73a25..1630101 100644 --- a/src/components/payroll/dialogs/AdditionalFieldsDialog.js +++ b/src/components/payroll/dialogs/AdditionalFieldsDialog.js @@ -24,6 +24,8 @@ function AdditionalFieldsDialog({ intl, classes, jsonExt, + buttonLabel, + title, }) { // eslint-disable-next-line no-param-reassign if (!jsonExt) jsonExt = '{}'; @@ -50,7 +52,7 @@ function AdditionalFieldsDialog({ marginTop: '6px', }} > - {formatMessage(intl, 'payroll', 'payroll.additonalFields.showAdditionalFields')} + {formatMessage(intl, 'payroll', buttonLabel)} - {formatMessage(intl, 'payroll', 'payroll.additonalFields.label')} + {formatMessage(intl, 'payroll', title)}