Skip to content

Commit 4409e43

Browse files
Terala-PriyankaDmitriy-Litvinenko
authored andcommitted
UIREQ-1188 - Add optional column 'Retrieval service point' (#1240)
* UIREQ-1188 - Add optional column 'Retrieval service point' * Male retieval sp column sortable * add unit test
1 parent 82d981c commit 4409e43

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

src/routes/RequestsRoute.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ export const getListFormatter = (
292292
'year': rq => getFormattedYears(rq.instance?.publication, DEFAULT_DISPLAYED_YEARS_AMOUNT),
293293
'callNumber': rq => effectiveCallNumber(rq.item),
294294
'servicePoint': rq => get(rq, 'pickupServicePoint.name', DEFAULT_FORMATTER_VALUE),
295+
'retrievalServicePoint': rq => get(rq, 'item.retrievalServicePointName', DEFAULT_FORMATTER_VALUE),
295296
'copies': rq => get(rq, PRINT_DETAILS_COLUMNS.COPIES, DEFAULT_FORMATTER_VALUE),
296297
'printed': rq => (rq.printDetails ? getLastPrintedDetails(rq.printDetails, intl) : DEFAULT_FORMATTER_VALUE),
297298
});
@@ -353,6 +354,7 @@ class RequestsRoute extends React.Component {
353354
'requestStatus': 'status',
354355
'servicePoint': 'searchIndex.pickupServicePointName',
355356
'requesterBarcode': 'requester.barcode',
357+
'retrievalServicePoint': 'item.retrievalServicePointName',
356358
'requestDate': 'requestDate',
357359
'position': 'position/number',
358360
'proxy': 'proxy',
@@ -1490,6 +1492,7 @@ class RequestsRoute extends React.Component {
14901492
servicePoint: <FormattedMessage id="ui-requests.requests.servicePoint" />,
14911493
requester: <FormattedMessage id="ui-requests.requests.requester" />,
14921494
requesterBarcode: <FormattedMessage id="ui-requests.requests.requesterBarcode" />,
1495+
retrievalServicePoint: <FormattedMessage id="ui-requests.requests.retrievalServicePoint" />,
14931496
singlePrint: <FormattedMessage id="ui-requests.requests.singlePrint" />,
14941497
...(isProxyAvailable ? { proxy: <FormattedMessage id="ui-requests.requests.proxy" /> } : {}),
14951498
...(isViewPrintDetailsEnabled && {
@@ -1763,7 +1766,7 @@ class RequestsRoute extends React.Component {
17631766
resultIsSelected={this.resultIsSelected}
17641767
onFilterChange={this.handleFilterChange}
17651768
sortableColumns={['requestDate', 'title', 'year', 'itemBarcode', 'callNumber', 'type', 'requestStatus',
1766-
'position', 'servicePoint', 'requester', 'requesterBarcode', ...(isProxyAvailable ? ['proxy'] : []), 'copies', 'printed']}
1769+
'position', 'servicePoint', 'requester', 'requesterBarcode', 'retrievalServicePoint', ...(isProxyAvailable ? ['proxy'] : []), 'copies', 'printed']}
17671770
pageAmount={100}
17681771
pagingType={MCLPagingTypes.PREV_NEXT}
17691772
/>

src/routes/RequestsRoute.test.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,6 +1301,8 @@ describe('RequestsRoute', () => {
13011301
select: 'test value',
13021302
item: {
13031303
barcode: 'itemBarcode',
1304+
retrievalServicePointId: '3a40852d-49fd-4df2-a1f9-6e2641a6e91f',
1305+
retrievalServicePointName: 'Circ Desk 1',
13041306
},
13051307
position: 'position',
13061308
proxy: {},
@@ -1522,6 +1524,12 @@ describe('RequestsRoute', () => {
15221524
});
15231525
});
15241526

1527+
describe('retrieval service point', () => {
1528+
it('should return retrieval service point', () => {
1529+
expect(listFormatter.retrievalServicePoint(requestWithData)).toBe(requestWithData.item.retrievalServicePointName);
1530+
});
1531+
});
1532+
15251533
describe('when formatting copies column', () => {
15261534
it('should return copies for copies column', () => {
15271535
expect(listFormatter.copies(requestWithData)).toBe(requestWithData.printDetails.printCount);

translations/ui-requests/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"requests.itemBarcode": "Item barcode",
5252
"requests.callNumber": "Effective call number string",
5353
"requests.servicePoint": "Pickup service point",
54+
"requests.retrievalServicePoint": "Retrieval service point",
5455
"requests.createTitleLevelRequest": "Create title level request",
5556
"requests.singlePrint": "Single print",
5657
"requests.printButtonLabel": "Print",

0 commit comments

Comments
 (0)