Merge branch '1.4' of https://github.com/ezsystems/ezplatform-admin-ui-modules

Author: ViniTou

Resources/public/js/ContentTree.module.js.map

@@ -10,7 +10,7 @@ const ENDPOINT_BULK = '/api/ezp/v2/bulk';
 export const bulkMoveLocations = (restInfo, locations, newLocationHref, callback) => {
     const requestBodyOperations = getBulkMoveRequestOperations(locations, newLocationHref);
 
-    makeBulkRequest(restInfo, requestBodyOperations, processBulkResponse.bind(null, locations, 201, callback));
+    makeBulkRequest(restInfo, requestBodyOperations, processBulkResponse.bind(null, locations, callback));
 };
 
 export const bulkMoveLocationsToTrash = (restInfo, locations, callback) => {
@@ -33,12 +33,12 @@ const getBulkMoveRequestOperations = (locations, destination) => {
     return operations;
 };
 
-const processBulkResponse = (locations, successCode, callback, response) => {
+const processBulkResponse = (locations, callback, response) => {
     const { operations } = response.BulkOperationResponse;
     const locationsMatches = Object.entries(operations).reduce(
         (locationsMatches, [locationId, response]) => {
             const respectiveItem = locations.find((location) => location.id === parseInt(locationId, 10));
-            const isSuccess = response.statusCode === successCode;
+            const isSuccess = 200 <= response.statusCode && response.statusCode <= 299;
 
             if (isSuccess) {
                 locationsMatches.success.push(respectiveItem);

Resources/public/js/MultiFileUpload.module.js.map

@@ -39,7 +39,7 @@ export default class SearchComponent extends Component {
             () => ({ isSearching: true }),
             () => {
                 const promise = new Promise((resolve) =>
-                    this.props.findContentBySearchQuery(this.props.restInfo, this._refSearchInput.value, resolve)
+                    this.props.findContentBySearchQuery(this.props.restInfo, this._refSearchInput.value, resolve, this.props.searchResultsLimit)
                 );
 
                 promise
@@ -179,6 +179,7 @@ SearchComponent.propTypes = {
     maxHeight: PropTypes.number.isRequired,
     contentTypesMap: PropTypes.object.isRequired,
     searchResultsPerPage: PropTypes.number.isRequired,
+    searchResultsLimit: PropTypes.number.isRequired,
     restInfo: PropTypes.shape({
         token: PropTypes.string.isRequired,
         siteaccess: PropTypes.string.isRequired,

Resources/public/js/SubItems.module.js

@@ -13,6 +13,7 @@ const SearchPanelComponent = (props) => {
         maxHeight,
         contentTypesMap,
         searchResultsPerPage,
+        searchResultsLimit,
         restInfo,
         selectedContent,
         onSelectContent,
@@ -28,6 +29,7 @@ const SearchPanelComponent = (props) => {
             maxHeight,
             contentTypesMap,
             searchResultsPerPage,
+            searchResultsLimit,
             restInfo,
             selectedContent,
             onSelectContent,
@@ -57,6 +59,7 @@ SearchPanelComponent.propTypes = {
     maxHeight: PropTypes.number.isRequired,
     contentTypesMap: PropTypes.object.isRequired,
     searchResultsPerPage: PropTypes.number.isRequired,
+    searchResultsLimit: PropTypes.number.isRequired,
     restInfo: PropTypes.shape({
         token: PropTypes.string.isRequired,
         siteaccess: PropTypes.string.isRequired,

Resources/public/js/SubItems.module.js.map

@@ -195,8 +195,9 @@ export const findLocationsByParentLocationId = (
  * @param {Object} restInfo REST config hash containing: token and siteaccess properties
  * @param {String} query
  * @param {Function} callback
+ * @param {Number} limit
  */
-export const findContentBySearchQuery = ({ token, siteaccess }, query, callback) => {
+export const findContentBySearchQuery = ({ token, siteaccess }, query, callback, limit = QUERY_LIMIT) => {
     const body = JSON.stringify({
         ViewInput: {
             identifier: `udw-locations-by-search-query-${query}`,
@@ -206,7 +207,7 @@ export const findContentBySearchQuery = ({ token, siteaccess }, query, callback)
                 FacetBuilders: {},
                 SortClauses: {},
                 Query: { FullTextCriterion: query },
-                limit: QUERY_LIMIT,
+                limit,
                 offset: 0,
             },
         },