Merge pull request #257 from ONLYOFFICE/bugfix/fixed-files-badges

Bugfix/fixed files badges

products/ASC.Files/Client/src/HOCs/withBadges.js

@@ -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,

products/ASC.Files/Client/src/components/Badges.js

@@ -27,6 +27,7 @@ const Badges = ({
   const isFavorite = fileStatus === 32;
   const isEditing = fileStatus === 1;
   const isNewWithFav = fileStatus === 34;
+  const showEditBadge = !locked || item.access === 0;
 
   return fileExst ? (
     <div className="badges additional-badges">
@@ -41,7 +42,7 @@ const Badges = ({
                     hoverColor="#3B72A7"
                   />
       )} */}
-      {canWebEdit && !isTrashFolder && accessToEdit && (
+      {canWebEdit && !isTrashFolder && accessToEdit && showEditBadge && (
         <IconButton
           onClick={onFilesClick}
           iconName="/static/images/access.edit.react.svg"

products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js

@@ -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