Web: move profile block to common article

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

@@ -14,6 +14,7 @@ import SubArticleBackdrop from "./sub-components/article-backdrop";
 import SubArticleHeader from "./sub-components/article-header";
 import SubArticleMainButton from "./sub-components/article-main-button";
 import SubArticleBody from "./sub-components/article-body";
+import ArticleProfile from "./sub-components/article-profile";
 
 import { StyledArticle } from "./styled-article";
 
@@ -35,6 +36,7 @@ const Article = ({
   children,
 
   isBannerVisible,
+  hideProfileBlock,
   ...rest
 }) => {
   const [articleHeaderContent, setArticleHeaderContent] = React.useState(null);
@@ -130,6 +132,7 @@ const Article = ({
         ) : null}
         <SubArticleBody showText={showText}>
           {articleBodyContent ? articleBodyContent.props.children : null}
+          {!hideProfileBlock && <ArticleProfile showText={showText} />}
         </SubArticleBody>
       </StyledArticle>
       {articleOpen && (isMobileOnly || window.innerWidth <= 375) && (
@@ -153,6 +156,7 @@ Article.propTypes = {
   toggleArticleOpen: PropTypes.func,
   setIsMobileArticle: PropTypes.func,
   children: PropTypes.any,
+  hideProfileBlock: PropTypes.bool,
 };
 
 Article.Header = () => {

packages/asc-web-common/components/Article/sub-components/article-profile.js

@@ -46,7 +46,7 @@ const StyledProfile = styled.div`
   }
 `;
 
-const Profile = (props) => {
+const ArticleProfile = (props) => {
   const {
     history,
     user,
@@ -187,7 +187,7 @@ const Profile = (props) => {
               zIndex={402}
               directionX="left"
               directionY="top"
-              iconName="images/vertical-dots.react.svg"
+              iconName="/static/images/vertical-dots.react.svg"
               size={15}
               isFill
               getData={getContextOptions}
@@ -225,5 +225,5 @@ export default withRouter(
       setHotkeyPanelVisible,
       logout,
     };
-  })(observer(Profile))
+  })(observer(ArticleProfile))
 );

products/ASC.Files/Client/src/components/Article/Body/index.js

@@ -21,7 +21,6 @@ import withLoader from "../../../HOCs/withLoader";
 import { withTranslation } from "react-i18next";
 import { FolderType } from "@appserver/common/constants";
 import RoomsFilter from "@appserver/common/api/rooms/filter";
-import Profile from "./Profile";
 
 const StyledBlock = styled.div`
   padding: 0 20px;
@@ -158,7 +157,6 @@ const ArticleBodyContent = (props) => {
             campaigns.length > 0 && <Banner FirebaseHelper={FirebaseHelper} />}
         </StyledBlock>
       )}
-      <Profile showText={showText} />
     </>
   );
 };