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

Web:Client:Home: add filter by author for My documents

Browse Source
This commit is contained in:
Timofey Boyko 2022-12-21 16:08:46 +03:00
parent a1daacb4d0
commit 934e1185a1
4 changed files with 36 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
View File

@ -86,14 +86,14 @@ class FilesTableHeader extends React.Component {
resizable: true,
sortBy: "Author",
isDisabled: isPersonalRoom,
// isDisabled: isPersonalRoom,
onClick: this.onFilter,
onChange: this.onColumnChange,
};
if (isPersonalRoom) {
authorOption.defaultSize = 0;
}
// if (isPersonalRoom) {
// authorOption.defaultSize = 0;
// }
const columns = [
{

62
packages/client/src/pages/Home/Section/Filter/index.js
View File

@ -561,7 +561,7 @@ const SectionFilterContent = ({
}
}
return filterValues;
// return filterValues;
const currentFilterValues = [];
setSelectedFilterValues((value) => {
@ -949,38 +949,36 @@ const SectionFilterContent = ({
filterOptions.push(...contentOptions);
}
if (!isPersonalRoom) {
const authorOption = [
{
key: FilterGroups.filterAuthor,
group: FilterGroups.filterAuthor,
label: t("ByAuthor"),
isHeader: true,
withMultiItems: true,
},
{
id: "filter_author-me",
key: FilterKeys.me,
group: FilterGroups.filterAuthor,
label: t("Common:MeLabel"),
},
{
id: "filter_author-other",
key: FilterKeys.other,
group: FilterGroups.filterAuthor,
label: t("Common:OtherLabel"),
},
{
id: "filter_author-user",
key: FilterKeys.user,
group: FilterGroups.filterAuthor,
label: t("Translations:AddAuthor"),
isSelector: true,
},
];
const authorOption = [
{
key: FilterGroups.filterAuthor,
group: FilterGroups.filterAuthor,
label: t("ByAuthor"),
isHeader: true,
withMultiItems: true,
},
{
id: "filter_author-me",
key: FilterKeys.me,
group: FilterGroups.filterAuthor,
label: t("Common:MeLabel"),
},
{
id: "filter_author-other",
key: FilterKeys.other,
group: FilterGroups.filterAuthor,
label: t("Common:OtherLabel"),
},
{
id: "filter_author-user",
key: FilterKeys.user,
group: FilterGroups.filterAuthor,
label: t("Translations:ChooseFromList"),
isSelector: true,
},
];
filterOptions.push(...authorOption);
}
filterOptions.push(...authorOption);
filterOptions.push(...typeOptions);
}

6
packages/common/components/FilterInput/sub-components/FilterBlock.js
View File

@ -383,11 +383,7 @@ const FilterBlock = ({
</StyledFilterBlockHeader>
<div className="filter-body">
{isLoading ? (
<Loaders.FilterBlock
isPersonalRoom={isPersonalRoom}
isRooms={isRooms}
isAccounts={isAccounts}
/>
<Loaders.FilterBlock isRooms={isRooms} isAccounts={isAccounts} />
) : (
<Scrollbar className="filter-body__scrollbar" stype="mediumBlack">
{filterData.map((item, index) => {

3
packages/common/components/Loaders/FilterBlockLoader/index.js
View File

@ -8,7 +8,6 @@ const FilterBlockLoader = ({
id,
className,
style,
isPersonalRoom,
isRooms,
isAccounts,
...rest
@ -46,7 +45,7 @@ const FilterBlockLoader = ({
</StyledBlock>
)}
{!isPersonalRoom && !isAccounts && (
{!isAccounts && (
<StyledBlock>
<RectangleLoader
width={"51"}