Fix code after merge

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

@@ -35,6 +35,7 @@ import {
   removeItemFromFavorite,
   fetchFavoritesFolder,
   deselectFile,
+  updateFile,
   fetchFiles,
   selectFile,
   setAction,
@@ -230,14 +231,11 @@ class SectionBodyContent extends React.Component {
       removeItemFromFavorite,
       updateFile,
       fetchFavoritesFolder,
-      selectedTreeNode,
-      favoritesNodeId } = this.props;
+      isFavorites } = this.props;
     const { action,
       id,
       title } = e.currentTarget.dataset;
 
-    const isFavoritesDir = +selectedTreeNode === +favoritesNodeId;
-
     switch (action) {
       case "mark":
         return markItemAsFavorite(+id)
@@ -246,7 +244,7 @@ class SectionBodyContent extends React.Component {
           .catch(e => toastr.error(e));
       case "remove":
         return removeItemFromFavorite(+id)
-          .then(() => (isFavoritesDir ? fetchFavoritesFolder() : updateFile(id, title)))
+          .then(() => (isFavorites ? fetchFavoritesFolder() : updateFile(id, title)))
           .then(() => toastr.success("Removed from favorites"))
           .catch(e => toastr.error(e));
       default:
@@ -514,7 +512,6 @@ class SectionBodyContent extends React.Component {
     const { t } = this.props;
 
     const isSharable = item.access !== 1 && item.access !== 0;
-    const isFavorite = item.fileStatus === 32 && true;
 
     return options.map((option) => {
       switch (option) {
@@ -539,7 +536,19 @@ class SectionBodyContent extends React.Component {
           };
         case "separator0":
         case "separator1":
+        case "separator2":
           return { key: option, isSeparator: true };
+        case "mark-as-favorite":
+          return {
+            key: option,
+            label: t("MarkAsFavorite"),
+            icon: "FavoritesIcon",
+            onClick: this.onClickFavorite,
+            disabled: false,
+            "data-action": "mark",
+            "data-id": item.id,
+            "data-title": item.title
+          };
         case "block-unblock-version":
           return {
             key: option,
@@ -645,6 +654,17 @@ class SectionBodyContent extends React.Component {
             onClick: this.onClickDelete,
             disabled: false,
           };
+        case "remove-from-favorites":
+          return {
+            key: option,
+            label: t("RemoveFromFavorites"),
+            icon: "FavoritesIcon",
+            onClick: this.onClickFavorite,
+            disabled: false,
+            "data-action": "remove",
+            "data-id": item.id,
+            "data-title": item.title
+          };
         default:
           break;
       }
@@ -1546,6 +1566,7 @@ class SectionBodyContent extends React.Component {
                       culture={settings.culture}
                       onEditComplete={this.onEditComplete}
                       onMediaFileClick={this.onMediaFileClick}
+                      onClickFavorite={this.onClickFavorite}
                     />
                   </SimpleFilesRow>
                 </DragAndDrop>
@@ -1595,7 +1616,7 @@ const mapStateToProps = (state) => {
   const myFolderIndex = 0;
   const shareFolderIndex = 1;
   const commonFolderIndex = 2;
-  //const favoritesNodeId = selectFavoritesDirectoryId(state);
+  const favoritesFolderIndex = 3;
 
   const myDocumentsId =
     treeFolders.length &&
@@ -1609,8 +1630,13 @@ const mapStateToProps = (state) => {
     treeFolders.length &&
     treeFolders[commonFolderIndex] &&
     treeFolders[commonFolderIndex].id;
+  const favoritesFolderId =
+    treeFolders.length &&
+    treeFolders[favoritesFolderIndex] &&
+    treeFolders[favoritesFolderIndex].id;
   const isShare = pathParts && pathParts[0] === shareFolderId;
   const isCommon = pathParts && pathParts[0] === commonFolderId;
+  const isFavorites = pathParts && pathParts[0] === favoritesFolderId;
 
   return {
     currentFolderCount: getCurrentFolderCount(state),
@@ -1626,6 +1652,7 @@ const mapStateToProps = (state) => {
     folders: getFolders(state),
     isAdmin: isAdmin(state),
     isCommon,
+    isFavorites,
     isLoading: getIsLoading(state),
     isShare,
     mediaViewerVisible: getMediaViewerVisibility(state),
@@ -1646,6 +1673,7 @@ const mapStateToProps = (state) => {
 
 export default connect(mapStateToProps, {
   deselectFile,
+  updateFile,
   fetchFiles,
   selectFile,
   setAction,
@@ -1659,4 +1687,7 @@ export default connect(mapStateToProps, {
   setUpdateTree,
   setIsLoading,
   clearProgressData,
+  markItemAsFavorite,
+  removeItemFromFavorite,
+  fetchFavoritesFolder
 })(withRouter(withTranslation()(SectionBodyContent)));

products/ASC.Files/Client/src/store/files/selectors.js

@@ -617,13 +617,6 @@ export const getSelectedFolderType = (state) => {
   }
 };
 
-// const selectAllDirectories = state => state.files.treeFolders
-
-// export const selectFavoritesDirectoryId = createSelector(
-//   selectAllDirectories,
-//   allDirectories => allDirectories.find(dir => dir.key === "0-3").id
-// )
-
 export const getFileAction = (state) => {
   return state.files.fileAction;
 };
@@ -774,6 +767,7 @@ const getFilesContextOptions = (item, viewer) => {
   const options = [];
 
   const isFile = !!item.fileExst;
+  const isFavorite = item.fileStatus === 32;
   const canOpenPlayer = isMediaOrImage(item.fileExst);
 
   if (item.id <= 0) return [];
@@ -792,6 +786,9 @@ const getFilesContextOptions = (item, viewer) => {
     options.push("finalize-version");
     options.push("block-unblock-version");
     options.push("separator1");
+    if (!isFavorite) {
+      options.push("mark-as-favorite");
+    }
 
     if (canOpenPlayer) {
       options.push("view");
@@ -803,6 +800,7 @@ const getFilesContextOptions = (item, viewer) => {
     options.push("download");
   }
 
+  
   options.push("move");
   options.push("copy");
 
@@ -813,6 +811,11 @@ const getFilesContextOptions = (item, viewer) => {
   options.push("rename");
   options.push("delete");
 
+  if (isFavorite) {
+    options.push("separator2");
+    options.push("remove-from-favorites");
+  }
+
   return options;
 };
 

web/ASC.Web.Common/src/api/files/index.js

@@ -48,7 +48,9 @@ export function getFoldersTree() {
     "@my",
     "@share",
     "@common",
-    /*'@projects',*/ "@favorites", "@trash"
+    /*'@projects',*/ 
+    "@favorites", 
+    "@trash" // Do not remove @trash from the last position
   ]; //TODO: need get from settings
   const requestsArray = rootFoldersPaths.map(path =>
     request({ method: "get", url: `/files/${path}?filterType=2` })
@@ -57,7 +59,7 @@ export function getFoldersTree() {
   return axios.all(requestsArray).then(
     axios.spread((...responses) =>
       responses.map((data, index) => {
-        const trashIndex = 4;
+        const trashIndex = rootFoldersPaths.length - 1;
         return {
           id: data.current.id,
           key: `0-${index}`,