Skip to content

Commit 059bc70

Browse files
UIREQMED-65: Minor improvements and code fixes
1 parent 4032f79 commit 059bc70

File tree

16 files changed

+29
-19
lines changed

16 files changed

+29
-19
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Change history for ui-requests-mediated
22

3+
## 2.1.0 (IN PROGRESS)
4+
* Minor improvements and code fixes. Refs UIREQMED-65.
5+
36
## [2.0.0] (https://github.com/folio-org/ui-requests-mediated/tree/v2.0.0) (2024-11-30)
47
[Full Changelog](https://github.com/folio-org/ui-requests-mediated/compare/v1.1.0...v2.0.0)
58
* Print slip for Mediated requests activity - Send item in transit. Refs UIREQMED-40.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@folio/requests-mediated",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "Mediated requests",
55
"main": "src/index.js",
66
"repository": "folio-org/ui-requests-mediated",
@@ -77,7 +77,8 @@
7777
"requests-mediated": "2.0",
7878
"requests-mediated-actions": "1.0",
7979
"request-preference-storage": "2.0",
80-
"circulation": "14.2"
80+
"circulation": "14.4",
81+
"users": "16.3"
8182
},
8283
"permissionSets": [
8384
{

src/components/ConfirmItem/ConfirmItem.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
const ConfirmItem = ({
2929
pristine,
3030
paneTitle,
31-
navigationMenuFunction,
31+
navigationMenuUrl,
3232
confirmItemType,
3333
contentData,
3434
handleSubmit,
@@ -52,7 +52,7 @@ const ConfirmItem = ({
5252
defaultWidth={FILTER_PANE_WIDTH}
5353
paneTitle={paneTitle}
5454
>
55-
<NavigationMenu value={navigationMenuFunction} />
55+
<NavigationMenu value={navigationMenuUrl} />
5656
</Pane>
5757
<Pane
5858
data-testid="confirmItemPane"
@@ -101,7 +101,7 @@ const ConfirmItem = ({
101101
ConfirmItem.propTypes = {
102102
pristine: PropTypes.bool,
103103
paneTitle: PropTypes.node.isRequired,
104-
navigationMenuFunction: PropTypes.func.isRequired,
104+
navigationMenuUrl: PropTypes.string.isRequired,
105105
confirmItemType: PropTypes.oneOf([CONFIRM_ITEM_TYPES.CONFIRM_ITEM_ARRIVAL, CONFIRM_ITEM_TYPES.SEND_ITEM_IN_TRANSIT]).isRequired,
106106
contentData: PropTypes.arrayOf(PropTypes.object),
107107
handleSubmit: PropTypes.func.isRequired,

src/components/ConfirmItem/ConfirmItem.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const labelIds = {
3535
const basicProps = {
3636
pristine: false,
3737
paneTitle: 'paneTitle',
38-
navigationMenuFunction: jest.fn(),
38+
navigationMenuUrl: 'confirmItem',
3939
confirmItemType: CONFIRM_ITEM_TYPES.CONFIRM_ITEM_ARRIVAL,
4040
contentData: [],
4141
handleSubmit: jest.fn(),
@@ -72,7 +72,7 @@ describe('ConfirmItem', () => {
7272

7373
it('should render navigation menu with correct props', () => {
7474
expect(NavigationMenu).toHaveBeenCalledWith(expect.objectContaining({
75-
value: basicProps.navigationMenuFunction,
75+
value: basicProps.navigationMenuUrl,
7676
}), {});
7777
});
7878

src/components/ConfirmItem/components/ConfirmItemList.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ const ConfirmItem = ({
109109
}) => {
110110
return (
111111
<MultiColumnList
112-
id="confirmItemList"
113112
fullWidth
114113
visibleColumns={CONFIRM_ITEM_COLUMNS_NAME}
115114
columnWidths={COLUMN_WIDTHS}

src/components/ConfirmItemArrival/ConfirmItemArrival.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const ConfirmItemArrival = () => {
4444
<>
4545
<ConfirmItem
4646
paneTitle={intl.formatMessage({ id: 'ui-requests-mediated.confirmItemArrival.paneTitle' })}
47-
navigationMenuFunction={getConfirmItemArrivalUrl()}
47+
navigationMenuUrl={getConfirmItemArrivalUrl()}
4848
confirmItemType={CONFIRM_ITEM_TYPES.CONFIRM_ITEM_ARRIVAL}
4949
contentData={confirmItemArrivalData}
5050
onSubmit={handleSubmit}

src/components/ConfirmItemArrival/ConfirmItemArrival.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('ConfirmItemArrival', () => {
2828
it('should render ConfirmItem with correct props', () => {
2929
expect(ConfirmItem).toHaveBeenCalledWith(expect.objectContaining({
3030
paneTitle: messageIds.paneTitle,
31-
navigationMenuFunction: getConfirmItemArrivalUrl(),
31+
navigationMenuUrl: getConfirmItemArrivalUrl(),
3232
confirmItemType: CONFIRM_ITEM_TYPES.CONFIRM_ITEM_ARRIVAL,
3333
contentData: [],
3434
onSubmit: expect.any(Function),

src/components/MediatedRequestsActivities/components/MediatedRequestsFilters/MediatedRequestsFilters.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ MediatedRequestsFilters.propTypes = {
6363
...MEDIATED_REQUEST_LEVEL_PROP_TYPES,
6464
}).isRequired,
6565
searchValue: PropTypes.shape({
66-
query: PropTypes.string.isRequired,
66+
query: PropTypes.string,
6767
}).isRequired,
6868
getSearchHandlers: PropTypes.func.isRequired,
6969
resetAll: PropTypes.func.isRequired,

src/components/MediatedRequestsActivities/components/MediatedRequestsFilters/components/Search/Search.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
import PropTypes from 'prop-types';
55
import {
66
FormattedMessage,
7+
useIntl,
78
} from 'react-intl';
89
import {
910
isEmpty,
@@ -30,6 +31,7 @@ const Search = ({
3031
resetAll,
3132
activeFilters,
3233
}) => {
34+
const intl = useIntl();
3335
const handleChange = useCallback((e) => {
3436
if (e.target.value) {
3537
getSearchHandlers().query(e);
@@ -47,6 +49,7 @@ const Search = ({
4749
className={styles.searchFieldContainer}
4850
>
4951
<SearchField
52+
aria-label={intl.formatMessage({ id: 'stripes-smart-components.search' })}
5053
data-testid="mediatedRequestsActivitiesSearch"
5154
autoFocus
5255
autoComplete="off"
@@ -88,7 +91,7 @@ Search.propTypes = {
8891
...MEDIATED_REQUEST_LEVEL_PROP_TYPES,
8992
}).isRequired,
9093
searchValue: PropTypes.shape({
91-
query: PropTypes.string.isRequired,
94+
query: PropTypes.string,
9295
}).isRequired,
9396
getSearchHandlers: PropTypes.func.isRequired,
9497
resetAll: PropTypes.func.isRequired,

src/components/MediatedRequestsActivities/components/MediatedRequestsList/MediatedRequestsList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ const MediatedRequestsList = ({
142142
};
143143

144144
MediatedRequestsList.propTypes = {
145-
visibleColumns: PropTypes.object,
145+
visibleColumns: PropTypes.arrayOf(PropTypes.string).isRequired,
146146
contentData: PropTypes.arrayOf(PropTypes.object).isRequired,
147147
source: PropTypes.shape({
148148
totalCount: PropTypes.func,

0 commit comments

Comments
 (0)