From 6e455e51ace0467cef78d70857eea75655ad2e86 Mon Sep 17 00:00:00 2001
From: Sachin Chaurasiya <sachinchaurasiyachotey87@gmail.com>
Date: Fri, 29 Jul 2022 18:30:05 +0530
Subject: [PATCH] Fix #6410 UI: Homepage looks distorted on windows machine
 (#6435)

---
 .../ActivityFeedCard/ActivityFeedCard.tsx     |   1 +
 .../FeedCardHeader/FeedCardHeader.tsx         | 115 +++++++-----------
 .../common/PopOverCard/EntityPopOverCard.tsx  |  26 ++--
 .../common/PopOverCard/UserPopOverCard.tsx    |  14 ++-
 4 files changed, 74 insertions(+), 82 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx
index 52ebe28d1fa..53be2025d69 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx
@@ -159,6 +159,7 @@ const ActivityFeedCard: FC<ActivityFeedCardProp> = ({
           </UserPopOverCard>
           <div className="tw-flex tw-flex-col">
             <FeedCardHeader
+              className="tw-pl-2"
               createdBy={feedDetail.from}
               entityFQN={entityFQN as string}
               entityField={entityField as string}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx
index 568f2e3b38f..854781a6347 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeader.tsx
@@ -13,20 +13,17 @@
 
 import classNames from 'classnames';
 import { isUndefined, toString } from 'lodash';
-import React, { FC, Fragment } from 'react';
+import React, { FC } from 'react';
 import { Link, useHistory } from 'react-router-dom';
-import AppState from '../../../../AppState';
 import { getUserPath } from '../../../../constants/constants';
 import { ThreadType } from '../../../../generated/entity/feed/thread';
 import {
   entityDisplayName,
   getEntityFieldDisplay,
-  getFeedAction,
   prepareFeedLink,
 } from '../../../../utils/FeedUtils';
 import { getTaskDetailPath } from '../../../../utils/TasksUtils';
 import { getDayTimeByTimeStamp } from '../../../../utils/TimeUtils';
-import Ellipses from '../../../common/Ellipses/Ellipses';
 import EntityPopOverCard from '../../../common/PopOverCard/EntityPopOverCard';
 import UserPopOverCard from '../../../common/PopOverCard/UserPopOverCard';
 import { FeedHeaderProp } from '../ActivityFeedCard.interface';
@@ -51,33 +48,26 @@ const FeedCardHeader: FC<FeedHeaderProp> = ({
   const getFeedLinkElement = () => {
     if (!isUndefined(entityFQN) && !isUndefined(entityType)) {
       return (
-        <Ellipses rows={1}>
-          <span className="tw-pl-1 tw-font-normal" data-testid="headerText">
-            {getFeedAction(feedType)}{' '}
-            {isEntityFeed ? (
-              <span className="tw-heading" data-testid="headerText-entityField">
-                {getEntityFieldDisplay(entityField)}
-              </span>
-            ) : (
-              <Fragment>
-                <span data-testid="entityType">{entityType} </span>
+        <span className="tw-font-normal" data-testid="headerText">
+          <span className="tw-mx-1">posted on</span>
+          {isEntityFeed ? (
+            <span className="tw-heading" data-testid="headerText-entityField">
+              {getEntityFieldDisplay(entityField)}
+            </span>
+          ) : (
+            <>
+              <span data-testid="entityType">{entityType} </span>
+              <EntityPopOverCard entityFQN={entityFQN} entityType={entityType}>
                 <Link
+                  className="tw-break-all"
                   data-testid="entitylink"
                   to={prepareFeedLink(entityType, entityFQN)}>
-                  <button
-                    className="tw-text-info"
-                    disabled={AppState.isTourOpen}>
-                    <EntityPopOverCard
-                      entityFQN={entityFQN}
-                      entityType={entityType}>
-                      <span>{entityDisplayName(entityType, entityFQN)}</span>
-                    </EntityPopOverCard>
-                  </button>
+                  <span>{entityDisplayName(entityType, entityFQN)}</span>
                 </Link>
-              </Fragment>
-            )}
-          </span>
-        </Ellipses>
+              </EntityPopOverCard>
+            </>
+          )}
+        </span>
       );
     } else {
       return null;
@@ -87,45 +77,35 @@ const FeedCardHeader: FC<FeedHeaderProp> = ({
   const getTaskLinkElement = () => {
     if (!isUndefined(entityFQN) && !isUndefined(entityType)) {
       return (
-        <div className="tw-flex tw-flex-wrap">
-          <span className="tw-px-1">created a task</span>
+        <span className="tw-font-normal">
+          <span className="tw-mx-1">created a task</span>
           <Link
             data-testid="tasklink"
             to={getTaskDetailPath(toString(taskDetails?.id)).pathname}>
-            <button className="tw-text-info" disabled={AppState.isTourOpen}>
-              {`#${taskDetails?.id}`} <span>{taskDetails?.type}</span>
-            </button>
+            <span>
+              {`#${taskDetails?.id} `}
+              {taskDetails?.type}
+            </span>
           </Link>
-          <span className="tw-px-1">for</span>
+          <span className="tw-mx-1">for</span>
           {isEntityFeed ? (
             <span className="tw-heading" data-testid="headerText-entityField">
               {getEntityFieldDisplay(entityField)}
             </span>
           ) : (
-            <span className="tw-flex">
+            <>
               <span className="tw-pr-1">{entityType}</span>
-
               <EntityPopOverCard entityFQN={entityFQN} entityType={entityType}>
                 <Link
+                  className="tw-break-all"
                   data-testid="entitylink"
                   to={prepareFeedLink(entityType, entityFQN)}>
-                  <button disabled={AppState.isTourOpen}>
-                    <Ellipses
-                      className="tw-w-28 tw-text-left"
-                      rows={1}
-                      style={{
-                        color: 'rgb(24, 144, 255)',
-                        cursor: 'pointer',
-                        textDecoration: 'none',
-                      }}>
-                      {entityDisplayName(entityType, entityFQN)}
-                    </Ellipses>
-                  </button>
+                  {entityDisplayName(entityType, entityFQN)}
                 </Link>
               </EntityPopOverCard>
-            </span>
+            </>
           )}
-        </div>
+        </span>
       );
     } else {
       return null;
@@ -133,28 +113,25 @@ const FeedCardHeader: FC<FeedHeaderProp> = ({
   };
 
   return (
-    <div className={classNames('tw-flex', className)}>
-      <div className="tw-flex tw-m-0 tw-pl-2 tw-leading-4">
-        <UserPopOverCard userName={createdBy}>
-          <span
-            className="thread-author tw-cursor-pointer"
-            onClick={(e) => {
-              e.stopPropagation();
-              onTitleClickHandler(createdBy);
-            }}>
-            {createdBy}
-          </span>
-        </UserPopOverCard>
-
-        {feedType === ThreadType.Conversation
-          ? getFeedLinkElement()
-          : getTaskLinkElement()}
+    <div className={classNames('tw-inline-block', className)}>
+      <UserPopOverCard userName={createdBy}>
         <span
-          className="tw-text-grey-muted tw-pl-2 tw-text-xs tw--mb-0.5"
-          data-testid="timestamp">
-          {timeStamp && ' - ' + getDayTimeByTimeStamp(timeStamp)}
+          className="thread-author tw-cursor-pointer"
+          onClick={(e) => {
+            e.stopPropagation();
+            onTitleClickHandler(createdBy);
+          }}>
+          {createdBy}
         </span>
-      </div>
+      </UserPopOverCard>
+
+      {feedType === ThreadType.Conversation
+        ? getFeedLinkElement()
+        : getTaskLinkElement()}
+
+      <span className="tw-text-grey-muted" data-testid="timestamp">
+        {timeStamp && ' - ' + getDayTimeByTimeStamp(timeStamp)}
+      </span>
     </div>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
index 809a63df434..8a5515c0339 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
@@ -15,7 +15,7 @@ import { Popover } from 'antd';
 import { AxiosError, AxiosResponse } from 'axios';
 import { uniqueId } from 'lodash';
 import { EntityTags } from 'Models';
-import React, { FC, HTMLAttributes, useMemo, useState } from 'react';
+import React, { FC, HTMLAttributes, useEffect, useMemo, useState } from 'react';
 import { Link } from 'react-router-dom';
 import AppState from '../../../AppState';
 import { getDashboardByFqn } from '../../../axiosAPIs/dashboardAPI';
@@ -171,7 +171,20 @@ const EntityPopOverCard: FC<Props> = ({ children, entityType, entityFQN }) => {
     );
   };
 
+  const onMouseOver = () => {
+    const entitydetails = AppState.entityData[entityFQN];
+    if (entitydetails) {
+      setEntityData(entitydetails);
+    } else {
+      getData();
+    }
+  };
+
   const PopoverContent = () => {
+    useEffect(() => {
+      onMouseOver();
+    }, []);
+
     return (
       <div className="tw-w-80">
         <div className="tw-flex">
@@ -237,15 +250,6 @@ const EntityPopOverCard: FC<Props> = ({ children, entityType, entityFQN }) => {
     );
   };
 
-  const onMouseOver = () => {
-    const entitydetails = AppState.entityData[entityFQN];
-    if (entitydetails) {
-      setEntityData(entitydetails);
-    } else {
-      getData();
-    }
-  };
-
   return (
     <Popover
       destroyTooltipOnHide
@@ -255,7 +259,7 @@ const EntityPopOverCard: FC<Props> = ({ children, entityType, entityFQN }) => {
       title={<PopoverTitle />}
       trigger="hover"
       zIndex={9999}>
-      <div onMouseOver={onMouseOver}>{children}</div>
+      {children}
     </Popover>
   );
 };
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.tsx
index 7e403e893f9..3377a977784 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.tsx
@@ -14,7 +14,13 @@
 import { Popover } from 'antd';
 import { AxiosResponse } from 'axios';
 import { isEmpty } from 'lodash';
-import React, { FC, Fragment, HTMLAttributes, useState } from 'react';
+import React, {
+  FC,
+  Fragment,
+  HTMLAttributes,
+  useEffect,
+  useState,
+} from 'react';
 import { useHistory } from 'react-router-dom';
 import AppState from '../../../AppState';
 import { getUserByName } from '../../../axiosAPIs/userAPI';
@@ -135,6 +141,10 @@ const UserPopOverCard: FC<Props> = ({ children, userName, type = 'user' }) => {
   };
 
   const PopoverContent = () => {
+    useEffect(() => {
+      getData();
+    }, []);
+
     return (
       <Fragment>
         {isLoading ? (
@@ -164,7 +174,7 @@ const UserPopOverCard: FC<Props> = ({ children, userName, type = 'user' }) => {
       title={<PopoverTitle />}
       trigger="hover"
       zIndex={9999}>
-      <div onMouseOver={getData}>{children}</div>
+      {children}
     </Popover>
   );
 };