Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9

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

@@ -83,7 +83,7 @@ export default function withContextOptions(WrappedComponent) {
 
     onClickLinkForPortal = () => {
       const { item, homepage, t } = this.props;
-      const { fileExst, canOpenPlayer, webUrl } = item;
+      const { fileExst, canOpenPlayer, webUrl, id } = item;
 
       const isFile = !!fileExst;
       copy(

products/ASC.Files/Client/src/components/Badges.js

@@ -24,6 +24,10 @@ const Badges = ({
 }) => {
   const { id, locked, fileStatus, versionGroup, title, fileExst } = item;
 
+  const isFavorite = fileStatus === 32;
+  const isEditing = fileStatus === 1;
+  const isNewWithFav = fileStatus === 34;
+
   return fileExst ? (
     <div className="badges additional-badges">
       {/* TODO: Uncomment after fix conversation {canConvert && !isTrashFolder && (
@@ -57,7 +61,7 @@ const Badges = ({
           onClick={onClickLock}
         />
       )}
-      {fileStatus === 32 && !isTrashFolder && (
+      {(isFavorite || isNewWithFav) && !isTrashFolder && (
         <StyledFavoriteIcon
           className="favorite icons-group"
           size="small"
@@ -67,7 +71,7 @@ const Badges = ({
           onClick={onClickFavorite}
         />
       )}
-      {fileStatus === 1 && (
+      {isEditing && (
         <StyledFileActionsConvertEditDocIcon className="badge" size="small" />
       )}
       {versionGroup > 1 && (
@@ -85,7 +89,7 @@ const Badges = ({
           data-id={id}
         />
       )}
-      {showNew && (
+      {(showNew || isNewWithFav) && (
         <Badge
           className="badge-version icons-group"
           backgroundColor="#ED7309"

products/ASC.Files/Client/src/store/FilesStore.js

@@ -369,7 +369,7 @@ class FilesStore {
     const isVisitor =
       (this.userStore.user && this.userStore.user.isVisitor) || false;
     const isFile = !!item.fileExst || item.contentLength;
-    const isFavorite = item.fileStatus === 32;
+    const isFavorite = item.fileStatus === 32 || item.fileStatus === 34;
     const isFullAccess = item.access < 2;
     const withoutShare = false; //TODO: need this prop
     const isThirdPartyItem = item.providerKey;