IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web:Common:RoomFilter: update getFilter method

Browse Source
This commit is contained in:
TimofeyBoyko 2022-06-23 20:03:28 +03:00
parent 348169e3f4
commit a1ba434163
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
packages/asc-web-common/api/rooms/filter.js
View File

@ -42,41 +42,49 @@ class RoomsFilter {
const defaultFilter = RoomsFilter.getDefault(); const defaultFilter = RoomsFilter.getDefault();
const filterType =
(urlFilter[FILTER_TYPE] && +urlFilter[FILTER_TYPE]) ||
defaultFilter.filterType;
const authorType =
(urlFilter[AUTHOR_TYPE] &&
urlFilter[AUTHOR_TYPE].includes("_") &&
urlFilter[AUTHOR_TYPE]) ||
defaultFilter.authorType;
const withSubfolders =
(urlFilter[SEARCH_TYPE] && urlFilter[SEARCH_TYPE]) ||
defaultFilter.withSubfolders;
const search = urlFilter[SEARCH] || defaultFilter.search;
const sortBy = urlFilter[SORT_BY] || defaultFilter.sortBy;
const viewAs = urlFilter[VIEW_AS] || defaultFilter.viewAs;
const sortOrder = urlFilter[SORT_ORDER] || defaultFilter.sortOrder;
const page = const page =
(urlFilter[PAGE] && +urlFilter[PAGE] - 1) || defaultFilter.page; (urlFilter[PAGE] && +urlFilter[PAGE] - 1) || defaultFilter.page;
const pageCount = const pageCount =
(urlFilter[PAGE_COUNT] && +urlFilter[PAGE_COUNT]) || (urlFilter[PAGE_COUNT] && +urlFilter[PAGE_COUNT]) ||
defaultFilter.pageCount; defaultFilter.pageCount;
const folder = urlFilter[FOLDER] || defaultFilter.folder;
const filterValue =
(urlFilter[FILTER_VALUE] && +urlFilter[FILTER_VALUE]) ||
defaultFilter.filterValue;
const types = (urlFilter[TYPES] && urlFilter[TYPES]) || defaultFilter.types;
const subjectId =
(urlFilter[SUBJECT_ID] && +urlFilter[SUBJECT_ID]) ||
defaultFilter.subjectId;
const searchInContent =
(urlFilter[SEARCH_IN_CONTENT] && +urlFilter[SEARCH_IN_CONTENT]) ||
defaultFilter.searchInContent;
const withSubfolders =
(urlFilter[SEARCH_TYPE] && urlFilter[SEARCH_TYPE]) ||
defaultFilter.withSubfolders;
const searchArea =
(urlFilter[SEARCH_AREA] && urlFilter[SEARCH_AREA]) ||
defaultFilter.searchArea;
const tags = (urlFilter[TAGS] && urlFilter[TAGS]) || defaultFilter.tags;
const newFilter = new RoomsFilter( const newFilter = new RoomsFilter(
page, page,
pageCount, pageCount,
defaultFilter.total, defaultFilter.total,
sortBy, filterValue,
sortOrder, types,
viewAs, subjectId,
filterType, searchInContent,
withSubfolders, withSubfolders,
search, withSubfolders,
authorType, searchArea,
defaultFilter.selectedItem, tags
folder
); );
return newFilter; return newFilter;