Web: Files: fixed locked badge

This commit is contained in:
Nikita Gopienko 2021-05-14 14:10:08 +03:00
parent 059b43ea01
commit fe38eb0f44
2 changed files with 12 additions and 3 deletions

View File

@ -22,9 +22,10 @@ export default function withBadges(WrappedComponent) {
this.state = { showConvertDialog: false };
}
onClickLock = () => {
const { item, lockFileAction } = this.props;
const { locked, id } = item;
const { item, lockFileAction, isAdmin } = this.props;
const { locked, id, access } = item;
if (!isAdmin || !access === 0) return;
lockFileAction(id, !locked).catch((err) => toastr.error(err));
};
@ -163,6 +164,7 @@ export default function withBadges(WrappedComponent) {
isTrashFolder,
canConvert,
onFilesClick, // from withFileAction HOC
isAdmin,
} = this.props;
const { fileStatus, access } = item;
@ -176,6 +178,7 @@ export default function withBadges(WrappedComponent) {
const badgesComponent = (
<Badges
item={item}
isAdmin={isAdmin}
showNew={showNew}
newItems={newItems}
canWebEdit={canWebEdit}
@ -242,6 +245,7 @@ export default function withBadges(WrappedComponent) {
const canConvert = docserviceStore.canConvert(item.fileExst);
return {
isAdmin: auth.isAdmin,
canWebEdit,
canConvert,
isTrashFolder: isRecycleBinFolder,

View File

@ -25,7 +25,7 @@ const SimpleFilesRowContent = styled(RowContent)`
margin-right: 6px;
}
.lock-file {
cursor: pointer;
cursor: ${(props) => (props.withAccess ? "pointer" : "default")};
}
.badges {
display: flex;
@ -59,6 +59,7 @@ const FilesRowContent = ({
isTrashFolder,
onFilesClick,
badgesComponent,
isAdmin,
}) => {
const {
contentLength,
@ -66,6 +67,7 @@ const FilesRowContent = ({
filesCount,
foldersCount,
providerKey,
access,
} = item;
const onMobileRowClick = () => {
@ -73,6 +75,8 @@ const FilesRowContent = ({
onFilesClick();
};
const withAccess = isAdmin || access === 0;
return (
<>
<SimpleFilesRowContent
@ -80,6 +84,7 @@ const FilesRowContent = ({
isMobile={isMobile}
sideColor={sideColor}
isFile={fileExst || contentLength}
withAccess={withAccess}
//onClick={onMobileRowClick}
>
<Link