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.

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

UIU-2988-poppy-dcb - User - Open Loans: UI changes for supporting DCB… #2598

Merged
merged 1 commit into from
Nov 29, 2023
Merged

UIU-2988-poppy-dcb - User - Open Loans: UI changes for supporting DCB… #2598

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

* Disable open loan actions for virtual patron. Refs UIU-2964.
* Hide all actionalble buttons on user details pane for DCB Virtual user. Refs UIU-2987.
* Open loan page modifications for a virtual patron. Refs UIU-2988.

## [10.0.5](https://github.com/folio-org/ui-users/tree/v10.0.5) (2023-11-21)
[Full Changelog](https://github.com/folio-org/ui-users/compare/v10.0.4...v10.0.5)
Expand Down
114 changes: 72 additions & 42 deletions src/components/Loans/OpenLoans/components/ActionsDropdown/ActionsDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import {
getChargeFineToLoanPath,
getOpenRequestsPath,
checkUserActive,
isDcbUser,
isDCBItem,
} from '../../../../util';

import { itemStatuses } from '../../../../../constants';
Expand Down Expand Up @@ -54,20 +56,26 @@ class ActionsDropdown extends React.Component {
const loanPolicyLink = `/settings/circulation/loan-policies/${loan.loanPolicyId}`;
const buttonDisabled = !stripes.hasPerm('ui-users.feesfines.actions.all');
const isUserActive = checkUserActive(user);
const isVirtualUser = isDcbUser(user);
const isVirtualItem = isDCBItem(loan?.item);

return (
<DropdownMenu data-role="menu">
<IfPermission perm="inventory.items.item.get">
<Button
buttonStyle="dropdownItem"
to={itemDetailsLink}
disabled={!loan?.item}
>
<FormattedMessage id="ui-users.itemDetails" />
</Button>
{
!isVirtualItem && (
<Button
buttonStyle="dropdownItem"
to={itemDetailsLink}
disabled={!loan?.item}
>
<FormattedMessage id="ui-users.itemDetails" />
</Button>
)
}
</IfPermission>
<IfPermission perm="ui-users.loans.renew">
{ isUserActive && itemStatusName !== itemStatuses.CLAIMED_RETURNED &&
{ isUserActive && !isVirtualUser && itemStatusName !== itemStatuses.CLAIMED_RETURNED &&
<Button
buttonStyle="dropdownItem"
data-test-dropdown-content-renew-button
Expand All @@ -81,7 +89,7 @@ class ActionsDropdown extends React.Component {
}
</IfPermission>
<IfPermission perm="ui-users.loans.claim-item-returned">
{ itemStatusName !== itemStatuses.CLAIMED_RETURNED &&
{ itemStatusName !== itemStatuses.CLAIMED_RETURNED && !isVirtualUser &&
<Button
buttonStyle="dropdownItem"
data-test-dropdown-content-claim-returned-button
Expand All @@ -98,6 +106,7 @@ class ActionsDropdown extends React.Component {
{ itemStatusName !== itemStatuses.DECLARED_LOST &&
itemStatusName !== itemStatuses.CLAIMED_RETURNED &&
itemStatusName !== itemStatuses.AGED_TO_LOST &&
!isVirtualUser &&
<Button
buttonStyle="dropdownItem"
data-test-dropdown-content-change-due-date-button
Expand All @@ -111,7 +120,7 @@ class ActionsDropdown extends React.Component {
}
</IfPermission>
<IfPermission perm="ui-users.loans.declare-item-lost">
{ itemStatusName !== itemStatuses.DECLARED_LOST &&
{ itemStatusName !== itemStatuses.DECLARED_LOST && !isVirtualUser &&
<Button
buttonStyle="dropdownItem"
data-test-dropdown-content-declare-lost-button
Expand All @@ -125,7 +134,7 @@ class ActionsDropdown extends React.Component {
}
</IfPermission>
<IfPermission perm="ui-users.loans.declare-claimed-returned-item-as-missing">
{ itemStatusName === itemStatuses.CLAIMED_RETURNED &&
{ itemStatusName === itemStatuses.CLAIMED_RETURNED && !isVirtualUser &&
<Button
buttonStyle="dropdownItem"
data-test-dropdown-content-mark-as-missing-button
Expand All @@ -139,34 +148,46 @@ class ActionsDropdown extends React.Component {
}
</IfPermission>
<IfPermission perm="circulation-storage.loan-policies.item.get">
<Button
buttonStyle="dropdownItem"
to={loanPolicyLink}
>
<FormattedMessage id="ui-users.loans.details.loanPolicy" />
</Button>
{
!isVirtualUser && (
<Button
buttonStyle="dropdownItem"
to={loanPolicyLink}
>
<FormattedMessage id="ui-users.loans.details.loanPolicy" />
</Button>
)
}
</IfPermission>
<IfPermission perm="ui-users.feesfines.actions.all">
<Button
buttonStyle="dropdownItem"
disabled={buttonDisabled}
to={getChargeFineToLoanPath(params.id, loan.id)}
>
<FormattedMessage id="ui-users.loans.newFeeFine" />
</Button>
{
!isVirtualUser && (
<Button
buttonStyle="dropdownItem"
disabled={buttonDisabled}
to={getChargeFineToLoanPath(params.id, loan.id)}
>
<FormattedMessage id="ui-users.loans.newFeeFine" />
</Button>
)
}
</IfPermission>
<IfPermission perm="ui-users.feesfines.view">
<Button
buttonStyle="dropdownItem"
disabled={disableFeeFineDetails}
onClick={() => {
handleOptionsChange({ loan, action: 'feefineDetails' });
}}
>
<FormattedMessage id="ui-users.loans.feeFineDetails" />
</Button>
{
!isVirtualUser && (
<Button
buttonStyle="dropdownItem"
disabled={disableFeeFineDetails}
onClick={() => {
handleOptionsChange({ loan, action: 'feefineDetails' });
}}
>
<FormattedMessage id="ui-users.loans.feeFineDetails" />
</Button>
)
}
</IfPermission>
{requestQueue && stripes.hasPerm('ui-requests.all') &&
{requestQueue && stripes.hasPerm('ui-requests.all') && !isVirtualUser &&
<Button
buttonStyle="dropdownItem"
data-test-dropdown-content-request-queue
Expand All @@ -180,17 +201,26 @@ class ActionsDropdown extends React.Component {
};

render() {
const { intl: { formatMessage } } = this.props;
const { intl: { formatMessage }, user, loan } = this.props;
const isVirtualUser = isDcbUser(user);
const isVirtualItem = isDCBItem(loan?.item);

return (
<Dropdown
data-testid="actions-dropdown-test-id"
renderTrigger={({ getTriggerProps }) => (
<IconButton
{...getTriggerProps()}
icon="ellipsis"
aria-label={formatMessage({ id: 'ui-users.action' })}
/>
)}
renderTrigger={({ getTriggerProps }) => {
if (isVirtualItem && isVirtualUser) {
return null;
}

return (
<IconButton
{...getTriggerProps()}
icon="ellipsis"
aria-label={formatMessage({ id: 'ui-users.action' })}
/>
);
}}
renderMenu={this.renderMenu}
/>
);
Expand Down
58 changes: 57 additions & 1 deletion src/components/Loans/OpenLoans/components/ActionsDropdown/ActionsDropdown.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ import buildStripes from '__mock__/stripes.mock';

import ActionsDropdown from './ActionsDropdown';

import { itemStatuses } from '../../../../../constants';
import {
itemStatuses,
DCB,
DCB_VIRTUAL_USER,
DCB_HOLDINGS_RECORD_ID,
DCB_INSTANCE_ID,
} from '../../../../../constants';

const mockHandleOptionsChange = jest.fn();

Expand Down Expand Up @@ -162,5 +168,55 @@ describe('ActoinsDropdown component', () => {
expect(mockHandleOptionsChange).toBeCalledWith({ loan: props.loan, action: 'feefineDetails' });
});
});

describe('when dcb lending role', () => {
it('render only item details button', () => {
const alteredProps = {
...props,
user: {
...okapiCurrentUser,
lastName: DCB_VIRTUAL_USER.personal.lastName,
type: DCB,
}
};
renderActionsDropdown(alteredProps);

expect(screen.queryByText('ui-users.itemDetails')).toBeInTheDocument();
expect(screen.queryByText('ui-users.renew')).toBeNull();
expect(screen.queryByText('ui-users.loans.claimReturned')).toBeNull();
expect(screen.queryByText('stripes-smart-components.cddd.changeDueDate')).toBeNull();
expect(screen.queryByText('ui-users.loans.declareLost')).toBeNull();
expect(screen.queryByText('ui-users.loans.details.loanPolicy')).toBeNull();
expect(screen.queryByText('ui-users.loans.newFeeFine')).toBeNull();
expect(screen.queryByText('ui-users.loans.feeFineDetails')).toBeNull();
expect(screen.queryByText('ui-users.loans.details.requestQueue')).toBeNull();
});
});

describe('when dcb borrowing role', () => {
it('render only item details button', () => {
const alteredProps = {
...props,
loan: {
...okapiOpenLoan,
item: {
instanceId: DCB_INSTANCE_ID,
holdingsRecordId: DCB_HOLDINGS_RECORD_ID,
},
}
};
renderActionsDropdown(alteredProps);

expect(screen.queryByText('ui-users.itemDetails')).toBeNull();
expect(screen.queryByText('ui-users.renew')).toBeInTheDocument();
expect(screen.queryByText('ui-users.loans.claimReturned')).toBeInTheDocument();
expect(screen.queryByText('stripes-smart-components.cddd.changeDueDate')).toBeInTheDocument();
expect(screen.queryByText('ui-users.loans.declareLost')).toBeInTheDocument();
expect(screen.queryByText('ui-users.loans.details.loanPolicy')).toBeInTheDocument();
expect(screen.queryByText('ui-users.loans.newFeeFine')).toBeInTheDocument();
expect(screen.queryByText('ui-users.loans.feeFineDetails')).toBeInTheDocument();
expect(screen.queryByText('ui-users.loans.details.requestQueue')).toBeInTheDocument();
});
});
});
});
82 changes: 43 additions & 39 deletions src/components/Loans/OpenLoans/components/OpenLoansSubHeader/OpenLoansSubHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
hasAnyLoanItemStatus,
getRenewalPatronBlocksFromPatronBlocks,
checkUserActive,
isDcbUser,
} from '../../../../util';

import css from './OpenLoansSubHeader.css';
Expand Down Expand Up @@ -121,6 +122,7 @@ const OpenLoansSubHeader = ({
const onlyClaimedReturnedItemsSelected = hasEveryLoanItemStatus(checkedLoans, itemStatuses.CLAIMED_RETURNED);
const onlyLostyItemsSelected = hasAnyLoanItemStatus(checkedLoans, lostItemStatuses);
const isUserActive = checkUserActive(user);
const isVirtualUser = isDcbUser(user);

return (
<ActionsBar
Expand Down Expand Up @@ -158,45 +160,47 @@ const OpenLoansSubHeader = ({
</span>
}
contentEnd={
<span>
<IfPermission perm="ui-users.loans.renew">
<Button
marginBottom0
id="renew-all"
disabled={noSelectedLoans || onlyClaimedReturnedItemsSelected || !isUserActive}
onClick={!isEmpty(countRenews)
? openPatronBlockedModal
: () => renewSelected()
}
>
{intl.formatMessage({ id: 'ui-users.renew' })}
</Button>
</IfPermission>
<IfPermission perm="ui-users.loans.claim-item-returned">
<Button
marginBottom0
id="bulk-claim-returned"
disabled={noSelectedLoans || onlyClaimedReturnedItemsSelected}
onClick={openBulkClaimReturnedModal}
>
{intl.formatMessage({ id: 'ui-users.loans.claimReturned' })}
</Button>
</IfPermission>
<IfPermission perm="ui-users.loans.change-due-date">
<Button
marginBottom0
id="change-due-date-all"
disabled={noSelectedLoans || onlyLostyItemsSelected}
onClick={showChangeDueDateDialog}
>
{intl.formatMessage({ id: 'stripes-smart-components.cddd.changeDueDate' })}
</Button>
</IfPermission>
<ExportCsv
data={recordsToCSV}
onlyFields={columnHeadersMap}
/>
</span>
!isVirtualUser && (
<span>
<IfPermission perm="ui-users.loans.renew">
<Button
marginBottom0
id="renew-all"
disabled={noSelectedLoans || onlyClaimedReturnedItemsSelected || !isUserActive}
onClick={!isEmpty(countRenews)
? openPatronBlockedModal
: () => renewSelected()
}
>
{intl.formatMessage({ id: 'ui-users.renew' })}
</Button>
</IfPermission>
<IfPermission perm="ui-users.loans.claim-item-returned">
<Button
marginBottom0
id="bulk-claim-returned"
disabled={noSelectedLoans || onlyClaimedReturnedItemsSelected}
onClick={openBulkClaimReturnedModal}
>
{intl.formatMessage({ id: 'ui-users.loans.claimReturned' })}
</Button>
</IfPermission>
<IfPermission perm="ui-users.loans.change-due-date">
<Button
marginBottom0
id="change-due-date-all"
disabled={noSelectedLoans || onlyLostyItemsSelected}
onClick={showChangeDueDateDialog}
>
{intl.formatMessage({ id: 'stripes-smart-components.cddd.changeDueDate' })}
</Button>
</IfPermission>
<ExportCsv
data={recordsToCSV}
onlyFields={columnHeadersMap}
/>
</span>
)
}
/>
);
Expand Down
Loading
Loading