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

Web: Files: Badges/QuickButtons: Restored show logic after merge

Browse Source
This commit is contained in:
Ilya Oleshko 2022-02-24 16:36:06 +03:00
parent 0814ce13cc
commit 7995f38ef9
2 changed files with 9 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
products/ASC.Files/Client/src/components/Badges.js
View File

@ -59,26 +59,13 @@ const Badges = ({
accessToEdit,
showNew,
onFilesClick,
onClickLock,
onClickFavorite,
onShowVersionHistory,
onBadgeClick,
setConvertDialogVisible,
viewAs,
}) => {
const {
id,
locked,
fileStatus,
version,
versionGroup,
title,
fileExst,
isEditing,
} = item;
const { id, locked, version, versionGroup, fileExst, isEditing } = item;
const isFavorite =
(fileStatus & FileStatus.IsFavorite) === FileStatus.IsFavorite;
const showEditBadge = !locked || item.access === 0;
const isPrivacy = isPrivacyFolder && isDesktopClient;
const isForm = fileExst === ".oform";
@ -147,47 +134,6 @@ const Badges = ({
title={t("Common:EditButton")}
/>
)}
{locked && accessToEdit && !isTrashFolder && (
// <StyledFileActionsLockedIcon
// className="badge lock-file icons-group"
// size="small"
// data-id={id}
// data-locked={true}
// onClick={onClickLock}
// />
//TODO: Fix icon
<StyledIcon
onClick={onClickLock}
iconName={iconRefresh}
className="badge tablet-badge icons-group lock-file"
size={sizeBadge}
hoverColor="#3B72A7"
data-action="remove"
data-id={id}
data-locked={true}
/>
)}
{isFavorite && !isTrashFolder && (
// <StyledFavoriteIcon
// className="favorite icons-group badge"
// size="small"
// data-action="remove"
// data-id={id}
// data-title={title}
// onClick={onClickFavorite}
// />
//TODO: Fix icon
<StyledIcon
onClick={onClickFavorite}
iconName={iconRefresh}
className="badge tablet-badge icons-group favorite"
size={sizeBadge}
hoverColor="#3B72A7"
data-action="remove"
data-id={id}
data-title={title}
/>
)}
{canConvert && !isTrashFolder && (
<StyledIcon
onClick={setConvertDialogVisible}

15
products/ASC.Files/Client/src/components/QuickButtons.js
View File

@ -3,6 +3,7 @@ import styled from "styled-components";
import IconButton from "@appserver/components/icon-button";
import commonIconsStyles from "@appserver/components/utils/common-icons-style";
import { isMobile, isTablet } from "react-device-detect";
import { FileStatus } from "@appserver/common/constants";
export const StyledIcon = styled(IconButton)`
${commonIconsStyles}
@ -21,10 +22,8 @@ const QuickButtons = ({
}) => {
const { id, locked, fileStatus, title, fileExst, shared } = item;
const isFavorite = fileStatus === 32;
const isNewWithFav = fileStatus === 34;
const isEditingWithFav = fileStatus === 33;
const showFavorite = isFavorite || isNewWithFav || isEditingWithFav;
const isFavorite =
(fileStatus & FileStatus.IsFavorite) === FileStatus.IsFavorite;
const isTile = viewAs === "tile";
@ -36,7 +35,7 @@ const QuickButtons = ({
? "/static/images/file.actions.locked.react.svg"
: "/static/images/locked.react.svg";
const iconFavorite = showFavorite
const iconFavorite = isFavorite
? "/static/images/file.actions.favorite.react.svg"
: "/static/images/favorite.react.svg";
@ -46,7 +45,9 @@ const QuickButtons = ({
const displayShare = viewAs === "row" && (isMobile || sectionWidth <= 500);
const displayLock = !locked && (isMobile || sectionWidth <= 500);
const displayFavorite = !showFavorite && (isMobile || sectionWidth <= 500);
const displayFavorite = !isFavorite && (isMobile || sectionWidth <= 500);
const setFavorite = () => onClickFavorite(isFavorite);
return (
<div className="badges additional-badges">
@ -80,7 +81,7 @@ const QuickButtons = ({
size={sizeQuickButton}
data-id={id}
data-title={title}
onClick={() => onClickFavorite(showFavorite)}
onClick={setFavorite}
hoverColor="#3B72A7"
/>
)}