Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0

packages/asc-web-common/components/PrivateRoute/index.js

@@ -33,6 +33,11 @@ const PrivateRoute = ({ component: Component, ...rest }) => {
 
   const renderComponent = (props) => {
     if (isLoaded && !isAuthenticated) {
+      if (personal && process.env.NODE_ENV === "production") {
+        window.location.replace("/");
+        return <></>;
+      }
+
       console.log("PrivateRoute render Redirect to login", rest);
       return (
         <Redirect

products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js

@@ -119,21 +119,23 @@ class DeleteDialogComponent extends React.Component {
       isLoading,
       unsubscribe,
       isPrivacyFolder,
+      isRecycleBinFolder,
       personal,
     } = this.props;
     const { filesList, foldersList, selection } = this.state;
 
     const checkedSelections = selection.filter((x) => x.checked === true);
 
-    const title = isPrivacyFolder
-      ? t("ConfirmRemove")
-      : unsubscribe
-      ? t("UnsubscribeTitle")
-      : checkedSelections.length === 1 || isPrivacyFolder
-      ? checkedSelections[0].fileExst
-        ? t("MoveToTrashOneFileTitle")
-        : t("MoveToTrashOneFolderTitle")
-      : t("MoveToTrashItemsTitle");
+    const title =
+      isPrivacyFolder || isRecycleBinFolder
+        ? t("ConfirmRemove")
+        : unsubscribe
+        ? t("UnsubscribeTitle")
+        : checkedSelections.length === 1 || isPrivacyFolder
+        ? checkedSelections[0].fileExst
+          ? t("MoveToTrashOneFileTitle")
+          : t("MoveToTrashOneFolderTitle")
+        : t("MoveToTrashItemsTitle");
 
     const noteText = unsubscribe
       ? t("UnsubscribeNote")
@@ -145,11 +147,12 @@ class DeleteDialogComponent extends React.Component {
         : t("MoveToTrashOneFolderNote")
       : t("MoveToTrashItemsNote");
 
-    const accessButtonLabel = isPrivacyFolder
-      ? t("Common:OKButton")
-      : unsubscribe
-      ? t("UnsubscribeButton")
-      : t("MoveToTrashButton");
+    const accessButtonLabel =
+      isPrivacyFolder || isRecycleBinFolder
+        ? t("Common:OKButton")
+        : unsubscribe
+        ? t("UnsubscribeButton")
+        : t("MoveToTrashButton");
 
     const accuracy = 20;
     let filesHeight = 25 * filesList.length + accuracy + 8;
@@ -251,7 +254,7 @@ export default inject(
   }) => {
     const { selection, isLoading } = filesStore;
     const { deleteAction, unsubscribeAction } = filesActionsStore;
-    const { isPrivacyFolder } = treeFoldersStore;
+    const { isPrivacyFolder, isRecycleBinFolder } = treeFoldersStore;
 
     const {
       deleteDialogVisible: visible,
@@ -269,6 +272,7 @@ export default inject(
       isRootFolder: selectedFolderStore.isRootFolder,
       visible,
       isPrivacyFolder,
+      isRecycleBinFolder,
 
       setDeleteDialogVisible,
       deleteAction,

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

@@ -326,7 +326,7 @@ class SectionHeaderContent extends React.Component {
       selectionCount,
       isAccessedSelected,
       isWebEditSelected,
-      // isViewedSelected,
+      isViewedSelected,
       // isMediaSelected,
       deleteDialogVisible,
       isRecycleBin,
@@ -335,7 +335,7 @@ class SectionHeaderContent extends React.Component {
       isFavoritesFolder,
       isRecentFolder,
       isShareFolder,
-      // personal,
+      personal,
     } = this.props;
 
     let menu = [
@@ -473,12 +473,14 @@ class SectionHeaderContent extends React.Component {
       menu.splice(3, 1);
     }
 
-    /*if (
-      (personal && !isWebEditSelected && !isViewedSelected) ||
-      selectionCount > 1
+    if (
+      personal &&
+      !isWebEditSelected &&
+      !isViewedSelected &&
+      !isFavoritesFolder
     ) {
       menu.splice(1, 1);
-    }*/
+    }
 
     return menu;
   };