Fix OperationsPanel move menu

products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js

@@ -4,7 +4,7 @@ import { connect } from "react-redux";
 import { withRouter } from "react-router";
 import { ModalDialog } from "asc-web-components";
 import { withTranslation } from "react-i18next";
-import { utils as commonUtils, toastr, api } from "asc-web-common";
+import { utils as commonUtils, toastr, api, constants } from "asc-web-common";
 import { StyledAsidePanel } from "../StyledPanels";
 import TreeFolders from "../../Article/Body/TreeFolders";
 import {
@@ -27,6 +27,7 @@ const i18n = createI18N({
 });
 
 const { changeLanguage } = commonUtils;
+const { FolderType } = constants;
 
 class OperationsPanelComponent extends React.Component {
   constructor(props) {
@@ -43,6 +44,8 @@ class OperationsPanelComponent extends React.Component {
       loopFilesOperations,
       setProgressBarData,
       clearProgressData,
+      currentFolderId,
+      onClose
     } = this.props;
 
     const destFolderId = Number(e);
@@ -51,6 +54,10 @@ class OperationsPanelComponent extends React.Component {
     const folderIds = [];
     const fileIds = [];
 
+    if (currentFolderId === destFolderId) {
+      return onClose();
+    }
+    else {
       for (let item of selection) {
         if (item.fileExst) {
           fileIds.push(item.id);
@@ -60,7 +67,7 @@ class OperationsPanelComponent extends React.Component {
           folderIds.push(item.id);
         }
       }
-    this.props.onClose();
+      onClose();
 
       if (isCopy) {
         setProgressBarData({
@@ -107,6 +114,7 @@ class OperationsPanelComponent extends React.Component {
             clearProgressData();
           });
       }
+    }
   };
 
   render() {
@@ -121,7 +129,11 @@ class OperationsPanelComponent extends React.Component {
       onClose,
     } = this.props;
     const zIndex = 310;
-    const data = treeFolders.slice(0, 3);
+    const data = treeFolders.filter(folder => (
+      folder.rootFolderType === FolderType.USER ||
+      folder.rootFolderType === FolderType.COMMON ||
+      folder.rootFolderType === FolderType.Projects
+    ) && folder);
     const expandedKeys = this.props.expandedKeys.map((item) => item.toString());
 
     return (