Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1

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

@@ -1,13 +1,11 @@
 import React from "react";
 import { inject, observer } from "mobx-react";
-
 import {
   ShareAccessRights,
   AppServerConfig,
 } from "@appserver/common/constants";
 import toastr from "@appserver/components/toast/toastr";
 import { combineUrl } from "@appserver/common/utils";
-import { getFileConversationProgress } from "@appserver/common/api/files";
 
 import Badges from "../components/Badges";
 import config from "../../package.json";
@@ -72,59 +70,6 @@ export default function withBadges(WrappedComponent) {
       }
     };
 
-    getConvertProgress = (fileId) => {
-      const {
-        selectedFolderId,
-        filter,
-        setIsLoading,
-        setSecondaryProgressBarData,
-        t,
-        clearSecondaryProgressData,
-        fetchFiles,
-      } = this.props;
-      getFileConversationProgress(fileId).then((res) => {
-        if (res && res[0] && res[0].progress !== 100) {
-          setSecondaryProgressBarData({
-            icon: "file",
-            visible: true,
-            percent: res[0].progress,
-            label: t("Convert"),
-            alert: false,
-          });
-          setTimeout(() => this.getConvertProgress(fileId), 1000);
-        } else {
-          if (res[0].error) {
-            setSecondaryProgressBarData({
-              visible: true,
-              alert: true,
-            });
-            toastr.error(res[0].error);
-            setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
-          } else {
-            setSecondaryProgressBarData({
-              icon: "file",
-              visible: true,
-              percent: 100,
-              label: t("Convert"),
-              alert: false,
-            });
-            setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
-            const newFilter = filter.clone();
-            fetchFiles(selectedFolderId, newFilter)
-              .catch((err) => {
-                setSecondaryProgressBarData({
-                  visible: true,
-                  alert: true,
-                });
-                //toastr.error(err);
-                setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
-              })
-              .finally(() => setIsLoading(false));
-          }
-        }
-      });
-    };
-
     setConvertDialogVisible = () => {
       this.props.setConvertItem(this.props.item);
       this.props.setConvertDialogVisible(true);
@@ -190,16 +135,11 @@ export default function withBadges(WrappedComponent) {
         selectedFolderStore,
         dialogsStore,
         filesStore,
-        uploadDataStore,
       },
       { item }
     ) => {
       const { docserviceStore } = formatsStore;
-      const {
-        isRecycleBinFolder,
-        isPrivacyFolder,
-        updateRootBadge,
-      } = treeFoldersStore;
+      const { isRecycleBinFolder, isPrivacyFolder } = treeFoldersStore;
       const {
         lockFileAction,
         setFavoriteAction,
@@ -212,12 +152,7 @@ export default function withBadges(WrappedComponent) {
         setConvertDialogVisible,
         setConvertItem,
       } = dialogsStore;
-      const { filter, setIsLoading, fetchFiles } = filesStore;
-      const { secondaryProgressDataStore } = uploadDataStore;
-      const {
-        setSecondaryProgressBarData,
-        clearSecondaryProgressData,
-      } = secondaryProgressDataStore;
+      const { setIsLoading } = filesStore;
 
       const canWebEdit = docserviceStore.canWebEdit(item.fileExst);
       const canConvert = docserviceStore.canConvert(item.fileExst);
@@ -237,13 +172,7 @@ export default function withBadges(WrappedComponent) {
         selectedFolderPathParts: selectedFolderStore.pathParts,
         markAsRead,
         setNewFilesPanelVisible,
-        updateRootBadge,
-        setSecondaryProgressBarData,
-        selectedFolderId: selectedFolderStore.id,
-        filter,
         setIsLoading,
-        clearSecondaryProgressData,
-        fetchFiles,
         setConvertDialogVisible,
         setConvertItem,
         isDesktopClient,

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

@@ -89,7 +89,7 @@ export default function withFileActions(WrappedFileItem) {
       }
       e.preventDefault();
       setTooltipPosition(e.pageX, e.pageY);
-      !isFileName && setStartDrag(true);
+      setStartDrag(true);
       !isActive && setBufferSelection(null);
     };
 

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

@@ -11,6 +11,7 @@ import TableView from "./TableView/TableContainer";
 import { Consumer } from "@appserver/components/utils/context";
 
 let currentDroppable = null;
+let isDragActive = false;
 
 const SectionBodyContent = (props) => {
   const {
@@ -80,6 +81,7 @@ const SectionBodyContent = (props) => {
       return false;
     }
 
+    isDragActive = true;
     if (!dragging) {
       document.body.classList.add("drag-cursor");
       setDragging(true);
@@ -135,9 +137,10 @@ const SectionBodyContent = (props) => {
     const elem = e.target.closest(".droppable");
     const title = elem && elem.dataset.title;
     const value = elem && elem.getAttribute("value");
-    if ((!value && !treeValue) || isRecycleBinFolder) {
+    if ((!value && !treeValue) || isRecycleBinFolder || !isDragActive) {
       setDragging(false);
       setStartDrag(false);
+      isDragActive = false;
       return;
     }
 
@@ -146,6 +149,7 @@ const SectionBodyContent = (props) => {
     setStartDrag(false);
     setDragging(false);
     onMoveTo(folderId, title);
+    isDragActive = false;
     return;
   };
 
@@ -228,8 +232,6 @@ export default inject(
       fileActionId: fileActionStore.id,
       isEmptyFilesList,
       setDragging,
-      startDrag,
-      setStartDrag,
       folderId: selectedFolderStore.id,
       setTooltipPosition,
       isRecycleBinFolder: treeFoldersStore.isRecycleBinFolder,