Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces

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

@@ -490,6 +490,19 @@ class FilesRowContent extends React.PureComponent {
     );
   };
 
+  onClickLock = () => {
+    const { item } = this.props;
+    const { locked, id } = item;
+    this.props.lockFileAction(id, !locked).catch((err) => toastr.error(err));
+  };
+
+  onClickFavorite = () => {
+    const { t, item } = this.props;
+    this.props
+      .setFavoriteAction("remove", item.id)
+      .then(() => toastr.success(t("RemovedFromFavorites")))
+      .catch((err) => toastr.error(err));
+  };
   render() {
     const {
       t,
@@ -629,7 +642,7 @@ class FilesRowContent extends React.PureComponent {
                     size="small"
                     data-id={item.id}
                     data-locked={true}
-                    onClick={this.props.onClickLock}
+                    onClick={this.onClickLock}
                   />
                 )}
                 {fileStatus === 32 && !isTrashFolder && (
@@ -639,7 +652,7 @@ class FilesRowContent extends React.PureComponent {
                     data-action="remove"
                     data-id={item.id}
                     data-title={item.title}
-                    onClick={this.props.onClickFavorite}
+                    onClick={this.onClickFavorite}
                   />
                 )}
                 {fileStatus === 1 && (
@@ -648,15 +661,6 @@ class FilesRowContent extends React.PureComponent {
                     size="small"
                   />
                 )}
-                {locked && (
-                  <StyledFileActionsLockedIcon
-                    className="badge lock-file"
-                    size="small"
-                    data-id={item.id}
-                    data-locked={true}
-                    onClick={this.props.onClickLock}
-                  />
-                )}
                 {versionGroup > 1 && (
                   <Badge
                     className="badge-version"
@@ -860,6 +864,8 @@ export default inject(
       addExpandedKeys,
       openDocEditor,
       editCompleteAction: filesActionsStore.editCompleteAction,
+      lockFileAction: filesActionsStore.lockFileAction,
+      setFavoriteAction: filesActionsStore.setFavoriteAction,
       setMediaViewerData,
     };
   }

products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js

@@ -215,7 +215,7 @@ const SimpleFilesRow = (props) => {
   };
 
   const lockFile = () =>
-    lockFileAction(id, locked).catch((err) => toastr.error(err));
+    lockFileAction(id, !locked).catch((err) => toastr.error(err));
 
   const onClickLinkForPortal = () => {
     const isFile = !!fileExst;

web/ASC.Web.Client/src/components/Layout/index.js

@@ -21,6 +21,9 @@ const StyledContainer = styled.div`
       ? `${props.contentHeight}px`
       : "100vh"};
 
+  #customScrollBar {
+    z-index: 0;
+  }
   #articleScrollBar {
     > .scroll-body {
       position: ${(props) =>