From 2d8b6943748e1ff8ab528b94d36aba038304668a Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Mon, 13 Jul 2020 15:56:24 +0300 Subject: [PATCH 1/2] Web: Common: Fixed order of returning filter props, add new --- web/ASC.Web.Common/src/api/files/filter.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web/ASC.Web.Common/src/api/files/filter.js b/web/ASC.Web.Common/src/api/files/filter.js index 08ff87ce97..4917fc545b 100644 --- a/web/ASC.Web.Common/src/api/files/filter.js +++ b/web/ASC.Web.Common/src/api/files/filter.js @@ -68,21 +68,25 @@ class FilesFilter { toDto = () => { const { + authorType, + filterType, + folder, + page, pageCount, + search, sortBy, sortOrder, - filterType, - withSubfolders, - search, - authorType + withSubfolders } = this; const isFilterSet = (filterType || (search ?? "").trim() || authorType) ? withSubfolders : false; const userIdOrGroupId = authorType && authorType.includes('_') ? authorType.slice(authorType.indexOf('_') + 1) : null; let dtoFilter = { + folder: folder, + pagecount: pageCount, startIndex: this.getStartIndex(), - count: pageCount, + page: page, sortby: sortBy, sortOrder: sortOrder, filterType: filterType, From c9eb590f1e0beca49a3ed43f6dd1677e0c98dd71 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Mon, 13 Jul 2020 15:56:36 +0300 Subject: [PATCH 2/2] web: common: bump version --- web/ASC.Web.Common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Common/package.json b/web/ASC.Web.Common/package.json index 8f79b9c45e..9b9152b4c7 100644 --- a/web/ASC.Web.Common/package.json +++ b/web/ASC.Web.Common/package.json @@ -1,6 +1,6 @@ { "name": "asc-web-common", - "version": "1.0.175", + "version": "1.0.176", "description": "Ascensio System SIA common components and solutions library", "license": "AGPL-3.0", "files": [