Skip to content

Commit

Permalink
UIU-2995 - Update resourceData and queryParams in UserSearchContainer…
Browse files Browse the repository at this point in the history
….js to escape special characters in tags filter
  • Loading branch information
Terala-Priyanka committed Nov 9, 2023
1 parent ee4f141 commit 6d7c9d1
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Also support `feesfines` interface version `19.0`. Refs UIU-2960.
* Correctly handle optional `X-Okapi-token` request header. Refs UIU-2977.
* Fix bug with Edit form Expand/collapse all shortcuts not working. Refs UIU-2959.
* Update resourceData to escape special characters in filter tags before passing to makeQuery function. Refs. UIU-2731.

## [10.0.3](https://github.com/folio-org/ui-users/tree/v10.0.3) (2023-10-23)
[Full Changelog](https://github.com/folio-org/ui-users/compare/v10.0.1...v10.0.3)
Expand Down
25 changes: 24 additions & 1 deletion src/routes/UserSearchContainer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {
cloneDeep,
get,
template,
} from 'lodash';
Expand Down Expand Up @@ -34,8 +35,30 @@ const searchFields = [
];
const compileQuery = template(`(${searchFields.join(' or ')})`, { interpolate: /%{([\s\S]+?)}/g });

const escapeSpecialCharactersInTagFilters = (queryParams, resourceData) => {
const newResourceData = cloneDeep(resourceData);
let escapedFilters;

if (resourceData.query.filters) {
const filterArr = resourceData.query.filters.split(',');
escapedFilters = filterArr.map(f => {
let newF = f;
if (f.startsWith('tags.')) {
newF = f.replace(/["^*?\\]/g, c => '\\' + c);
}
return newF;
});
escapedFilters = escapedFilters.join(',');

newResourceData.query.filters = escapedFilters;
queryParams.filters = escapedFilters;
}
return newResourceData;
};

export function buildQuery(queryParams, pathComponents, resourceData, logger, props) {
const customFilterConfig = buildFilterConfig(queryParams.filters);
const newResourceData = escapeSpecialCharactersInTagFilters(queryParams, resourceData);

return makeQueryFunction(
'cql.allRecords=1',
Expand All @@ -53,7 +76,7 @@ export function buildQuery(queryParams, pathComponents, resourceData, logger, pr
},
[...filterConfig, ...customFilterConfig],
2,
)(queryParams, pathComponents, resourceData, logger, props);
)(queryParams, pathComponents, newResourceData, logger, props);
}

class UserSearchContainer extends React.Component {
Expand Down

0 comments on commit 6d7c9d1

Please sign in to comment.