Skip to content
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.

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

UIU-3027: Update fee/fine actions column UX for accessibility #2836

Merged
merged 4 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* React v19: refactor away from default props for functional components. Refs. UIU-3141.
* Hide Create block button for user without permission. Refs UIU-3300.
* Add HTML page title to add/edit patron block page. Refs UIU-3302.
* Update fee/fine actions column UX for accessibility. Refs UIU-3027.

## [11.0.10](https://github.com/folio-org/ui-users/tree/v11.0.10) (2025-01-10)
[Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.9...v11.0.10)
Expand Down
5 changes: 3 additions & 2 deletions src/components/Accounts/ViewFeesFines/ViewFeesFines.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ class ViewFeesFines extends React.Component {
'callNumber': f => (f.callNumber ? f.callNumber : '-'),
'dueDate': f => (f.dueDate ? this.formatDateTime(f.dueDate) : '-'),
'returnedDate': f => (this.getLoan(f).returnDate ? this.formatDateTime(this.getLoan(f).returnDate) : '-'),
' ': f => this.renderActions(f, this.getLoan(f)),
'actions': f => this.renderActions(f, this.getLoan(f)),
};
}

Expand Down Expand Up @@ -478,6 +478,7 @@ class ViewFeesFines extends React.Component {
'callNumber': intl.formatMessage({ id: 'ui-users.accounts.history.columns.number' }),
'dueDate': intl.formatMessage({ id: 'ui-users.accounts.history.columns.due' }),
'returnedDate': intl.formatMessage({ id: 'ui-users.accounts.history.columns.returned' }),
'actions': intl.formatMessage({ id: 'ui-users.accounts.history.columns.actions' }),
};

return (
Expand All @@ -499,7 +500,7 @@ class ViewFeesFines extends React.Component {
'callNumber': 110,
'dueDate': 110,
'returnedDate': 110,
' ': 50
'actions': 70
}}
visibleColumns={this.props.visibleColumns}
fullWidth
Expand Down
14 changes: 2 additions & 12 deletions src/components/Accounts/ViewFeesFines/ViewFeesFines.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const defaultProps = {
match: { params: { id: 1 } },
history,
user: { id: '123' },
visibleColumns: [' ', 'metadata.createdDate', 'metadata.updatedDate', 'feeFineType', 'amount', 'remaining', 'paymentStatus.name', 'feeFineOwner', 'title', 'barcode', 'callNumber', 'dueDate', 'returnedDate', ' '],
visibleColumns: [' ', 'metadata.createdDate', 'metadata.updatedDate', 'feeFineType', 'amount', 'remaining', 'paymentStatus.name', 'feeFineOwner', 'title', 'barcode', 'callNumber', 'dueDate', 'returnedDate', 'actions'],
intl: {
formatMessage: ({ id }) => id
},
Expand Down Expand Up @@ -184,17 +184,7 @@ describe('ViewFeesFines', () => {
const checkBox = screen.getAllByRole('checkbox', { name: '' });
userEvent.click(checkBox[1]);
await userEvent.click(screen.queryByText(/ui-users.accounts.history.button.pay/i));
expect(mockOnChangeActions).toHaveBeenCalledWith({ pay: true }, accountsData);
await userEvent.click(screen.queryByText(/ui-users.accounts.history.button.waive/i));
expect(mockOnChangeActions).toHaveBeenCalledWith({ waiveModal: true }, accountsData);
await userEvent.click(screen.queryByText(/ui-users.accounts.history.button.refund/i));
expect(mockOnChangeActions).toHaveBeenCalledWith({ refundModal: true }, accountsData);
await userEvent.click(screen.queryByText(/ui-users.accounts.history.button.transfer/i));
expect(mockOnChangeActions).toHaveBeenCalledWith({ transferModal: true }, accountsData);
await userEvent.click(screen.queryByText(/ui-users.accounts.button.error/i));
expect(mockOnChangeActions).toHaveBeenCalledWith({ cancellation: true }, accountsData);
await userEvent.click(screen.queryByText(/ui-users.accounts.history.button.loanDetails/i));
expect(nav.onClickViewLoanActionsHistory).toBeCalled();
expect(mockOnChangeActions).toHaveBeenCalledWith({ 'refund': true, 'regularpayment': false, 'transfer': false, 'waive': false });
});
it('onClickViewLoanActionsHistory to be called when loanDetails clicked from DropDownMenu', async () => {
renderViewFeesFines(defaultProps);
Expand Down
2 changes: 1 addition & 1 deletion src/views/AccountsListing/AccountsListing.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const possibleColumns = [
'callNumber',
'dueDate',
'returnedDate',
' ',
'actions',
];

class AccountsHistory extends React.Component {
Expand Down
1 change: 1 addition & 0 deletions translations/ui-users/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@
"accounts.history.columns.number": "Effective call number string",
"accounts.history.columns.status": "Payment status",
"accounts.history.columns.due": "Due date",
"accounts.history.columns.actions": "Actions",
"accounts.history.columns.returned": "Returned date",
"accounts.history.possibleColumns.columns.created": "Date Created",
"accounts.history.button.select": "Select columns",
Expand Down
Loading