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

Web:Files:Filter: disable sort in recent and favorites folder

Browse Source
This commit is contained in:
Timofey Boyko 2022-03-03 16:10:18 +03:00
commit 61a1a7fbd3
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/asc-web-common/components/NewFilterInput/sub-components/SortButton.js
View File

@ -43,6 +43,10 @@ const StyledSortButton = styled.div`
.combo-button {
background: ${(props) =>
props.theme.newFilterInput.sort.background} !important;
.icon-button_svg {
cursor: pointer;
}
}
.sort-combo-box {
@ -249,26 +253,27 @@ const SortButton = ({
)}
</>
)}
{/* <>
{data.map((item, index) => (
<>
<DropDownItem
onClick={onOptionClick}
className={item.className}
key={item.key}
data-value={item.key}
>
<Text fontWeight={600}>{item.label}</Text>
<SortDesc
className={`option-item__icon ${
item.isSelected ? "selected-option-item__icon" : ""
}`}
/>
</DropDownItem>
</>
))}
</> */}
{!isFavoritesFolder && !isRecentFolder && (
<>
{data.map((item, index) => (
<>
<DropDownItem
onClick={onOptionClick}
className={item.className}
key={item.key}
data-value={item.key}
>
<Text fontWeight={600}>{item.label}</Text>
<SortDesc
className={`option-item__icon ${
item.isSelected ? "selected-option-item__icon" : ""
}`}
/>
</DropDownItem>
</>
))}
</>
)}
</>
);
}, [
@ -286,6 +291,7 @@ const SortButton = ({
<StyledSortButton
viewAs={viewAs}
isDesc={currentSelectedFilterData.sortDirection === "desc"}
onClick={toggleCombobox}
>
<ComboBox
opened={isOpen}
@ -303,11 +309,7 @@ const SortButton = ({
isDefaultMode={false}
manualY={"102%"}
>
<IconButton
onClick={toggleCombobox}
iconName="/static/images/sort.react.svg"
size={16}
/>
<IconButton iconName="/static/images/sort.react.svg" size={16} />
</ComboBox>
</StyledSortButton>
);

9
products/ASC.Files/Client/src/HOCs/withFileActions.js
View File

@ -371,11 +371,15 @@ export default function withFileActions(WrappedFileItem) {
(item.isFolder || (!item.fileExst && item.id === -1))
) !== -1;
const isActive =
let isActive = false;
if (
bufferSelection &&
bufferSelection.id === item.id &&
bufferSelection.fileExst === item.fileExst &&
!selection.length; // need for select row item
!selection.length
)
isActive = true;
return {
t,
@ -421,7 +425,6 @@ export default function withFileActions(WrappedFileItem) {
isActive,
inProgress,
setBufferSelection,
bufferSelection,
};
}
)(observer(WithFileActions));