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

Merge pull request #68 from ONLYOFFICE/bugfix/65004

Browse Source 
Bugfix/65004
This commit is contained in:
Alexey Safronov 2023-11-13 22:57:39 +04:00 committed by GitHub
commit 9c7b696c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/components/FilesSelector/helpers/useFilesHelper.ts
View File

@ -158,7 +158,7 @@ export const useFilesHelper = ({
filter.applyFilterOption = ApplyFilterOption.Files;
switch (filterParam) {
case FilesSelectorFilterTypes.DOCX:
filter.filterType = FilterType.DocumentsOnly;
filter.extension = FilesSelectorFilterTypes.DOCX;
break;
case FilesSelectorFilterTypes.IMG:
@ -166,7 +166,7 @@ export const useFilesHelper = ({
break;
case FilesSelectorFilterTypes.GZ:
filter.filterType = FilterType.ArchiveOnly;
filter.extension = FilesSelectorFilterTypes.GZ;
break;
case FilesSelectorFilterTypes.DOCXF:

20
packages/common/api/files/filter.js
View File

@ -18,6 +18,7 @@ const DEFAULT_FOLDER = "@my";
const DEFAULT_SEARCH_IN_CONTENT = null;
const DEFAULT_EXCLUDE_SUBJECT = null;
const DEFAULT_APPLY_FILTER_OPTION = null;
const DEFAULT_EXTENSION = null;
const SEARCH_TYPE = "withSubfolders";
const AUTHOR_TYPE = "authorType";
@ -34,6 +35,7 @@ const PREVIEW = "preview";
const SEARCH_IN_CONTENT = "searchInContent";
const EXCLUDE_SUBJECT = "excludeSubject";
const APPLY_FILTER_OPTION = "applyFilterOption";
const EXTENSION = "extension";
// TODO: add next params
// subjectGroup bool
@ -82,6 +84,7 @@ class FilesFilter {
urlFilter[EXCLUDE_SUBJECT] || defaultFilter.excludeSubject;
const applyFilterOption =
urlFilter[APPLY_FILTER_OPTION] || defaultFilter.applyFilterOption;
const extension = urlFilter[EXTENSION] || defaultFilter.extension;
const newFilter = new FilesFilter(
page,
@ -99,7 +102,8 @@ class FilesFilter {
folder,
searchInContent,
excludeSubject,
applyFilterOption
applyFilterOption,
extension
);
return newFilter;
@ -121,7 +125,8 @@ class FilesFilter {
folder = DEFAULT_FOLDER,
searchInContent = DEFAULT_SEARCH_IN_CONTENT,
excludeSubject = DEFAULT_EXCLUDE_SUBJECT,
applyFilterOption = DEFAULT_APPLY_FILTER_OPTION
applyFilterOption = DEFAULT_APPLY_FILTER_OPTION,
extension = DEFAULT_EXTENSION
) {
this.page = page;
this.pageCount = pageCount;
@ -139,6 +144,7 @@ class FilesFilter {
this.searchInContent = searchInContent;
this.excludeSubject = excludeSubject;
this.applyFilterOption = applyFilterOption;
this.extension = extension;
}
getStartIndex = () => {
@ -168,6 +174,7 @@ class FilesFilter {
searchInContent,
excludeSubject,
applyFilterOption,
extension,
} = this;
const isFilterSet =
@ -197,6 +204,7 @@ class FilesFilter {
searchInContent,
excludeSubject,
applyFilterOption,
extension,
};
const str = toUrlParams(dtoFilter, true);
@ -218,6 +226,7 @@ class FilesFilter {
searchInContent,
excludeSubject,
applyFilterOption,
extension,
} = this;
const dtoFilter = {};
@ -235,6 +244,7 @@ class FilesFilter {
if (searchInContent) dtoFilter[SEARCH_IN_CONTENT] = searchInContent;
if (excludeSubject) dtoFilter[EXCLUDE_SUBJECT] = excludeSubject;
if (applyFilterOption) dtoFilter[APPLY_FILTER_OPTION] = applyFilterOption;
if (extension) dtoFilter[EXTENSION] = extension;
dtoFilter[PAGE] = page + 1;
dtoFilter[SORT_BY] = sortBy;
@ -265,7 +275,8 @@ class FilesFilter {
this.folder,
this.searchInContent,
this.excludeSubject,
this.applyFilterOption
this.applyFilterOption,
this.extension
);
}
@ -285,7 +296,8 @@ class FilesFilter {
this.pageCount === filter.pageCount &&
this.searchInContent === filter.searchInContent &&
this.excludeSubject === filter.excludeSubject &&
this.applyFilterOption === filter.applyFilterOption;
this.applyFilterOption === filter.applyFilterOption &&
this.extension === filter.extension;
return equals;
}