Skip to content

Commit

Permalink
UIREQ-640: For consistency searching use == instead of = for requeste…
Browse files Browse the repository at this point in the history
…r barcode
  • Loading branch information
Dmitriy-Litvinenko committed Feb 24, 2025
1 parent e3d7a01 commit bdf6bcf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* *BREAKING* Update `react-intl` to `^7`. Refs UIREQ-1259.
* Migrate to shared GA workflows. Refs UIREQ-1257.
* *BREAKING* Update stripes-* dependencies to latest version. Refs UIREQ-1258.
* For consistency searching use == instead of = for requester barcode. Refs UIREQ-640.

## [11.0.4] (https://github.com/folio-org/ui-requests/tree/v11.0.4) (2025-02-07)
[Full Changelog](https://github.com/folio-org/ui-requests/compare/v11.0.3...v11.0.4)
Expand Down
4 changes: 2 additions & 2 deletions src/deprecated/routes/RequestsRoute/RequestsRoute.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ class RequestsRoute extends React.Component {
params: {
query: makeQueryFunction(
'cql.allRecords=1',
'(id=="%{query.query}" or requesterId=="%{query.query}" or requester.barcode="%{query.query}*" or instance.title="%{query.query}*" or instanceId="%{query.query}*" or item.barcode=="%{query.query}*" or itemId=="%{query.query}" or itemIsbn="%{query.query}" or searchIndex.callNumberComponents.callNumber=="%{query.query}*" or fullCallNumberIndex=="%{query.query}*")',
'(id=="%{query.query}" or requesterId=="%{query.query}" or requester.barcode=="%{query.query}*" or instance.title="%{query.query}*" or instanceId="%{query.query}*" or item.barcode=="%{query.query}*" or itemId=="%{query.query}" or itemIsbn="%{query.query}" or searchIndex.callNumberComponents.callNumber=="%{query.query}*" or fullCallNumberIndex=="%{query.query}*")',
{
'title': 'instance.title',
'instanceId': 'instanceId',
Expand Down Expand Up @@ -846,7 +846,7 @@ class RequestsRoute extends React.Component {
const filterQuery = filters2cql(RequestsFiltersConfig, deparseFilters(this.getActiveFilters()));

if (queryTerm) {
queryString = `(requesterId=="${queryTerm}" or requester.barcode="${queryTerm}*" or item.title="${queryTerm}*" or item.barcode=="${queryTerm}*" or itemId=="${queryTerm}")`;
queryString = `(requesterId=="${queryTerm}" or requester.barcode=="${queryTerm}*" or item.title="${queryTerm}*" or item.barcode=="${queryTerm}*" or itemId=="${queryTerm}")`;
queryClauses.push(queryString);
}
if (filterQuery) queryClauses.push(filterQuery);
Expand Down
4 changes: 2 additions & 2 deletions src/routes/RequestsRoute.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ class RequestsRoute extends React.Component {
params: {
query: makeQueryFunction(
'cql.allRecords=1',
'(id=="%{query.query}" or requesterId=="%{query.query}" or requester.barcode="%{query.query}*" or instance.title="%{query.query}*" or instanceId="%{query.query}*" or item.barcode=="%{query.query}*" or itemId=="%{query.query}" or itemIsbn="%{query.query}" or searchIndex.callNumberComponents.callNumber=="%{query.query}*" or fullCallNumberIndex=="%{query.query}*")',
'(id=="%{query.query}" or requesterId=="%{query.query}" or requester.barcode=="%{query.query}*" or instance.title="%{query.query}*" or instanceId="%{query.query}*" or item.barcode=="%{query.query}*" or itemId=="%{query.query}" or itemIsbn="%{query.query}" or searchIndex.callNumberComponents.callNumber=="%{query.query}*" or fullCallNumberIndex=="%{query.query}*")',
{
'title': 'instance.title',
'instanceId': 'instanceId',
Expand Down Expand Up @@ -904,7 +904,7 @@ class RequestsRoute extends React.Component {
const filterQuery = filters2cql(RequestsFiltersConfig, deparseFilters(this.getActiveFilters()));

if (queryTerm) {
queryString = `(requesterId=="${queryTerm}" or requester.barcode="${queryTerm}*" or item.title="${queryTerm}*" or item.barcode=="${queryTerm}*" or itemId=="${queryTerm}")`;
queryString = `(requesterId=="${queryTerm}" or requester.barcode=="${queryTerm}*" or item.title="${queryTerm}*" or item.barcode=="${queryTerm}*" or itemId=="${queryTerm}")`;
queryClauses.push(queryString);
}
if (filterQuery) queryClauses.push(filterQuery);
Expand Down

0 comments on commit bdf6bcf

Please sign in to comment.