From 100f88513838c8242e5498970e075b2a0f82d5b5 Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Tue, 9 May 2023 21:28:04 +0530
Subject: [PATCH] fix(ui): fix the ellipses and icon misplacement of entity
 headers (#11502)

* fix the ellipses and icon misplacement of entity headers

* changes as per commets
---
 .../EntityHeaderTitle.component.tsx           | 44 +++++++++----------
 .../EntityHeaderTitle.interface.ts            |  1 +
 .../GlossaryHeader.component.tsx              |  5 +--
 .../common/entityPageInfo/EntityPageInfo.tsx  |  6 +--
 .../table-data-card-v2/TableDataCardV2.tsx    | 12 ++---
 .../ui/src/pages/database-details/index.tsx   |  6 +--
 .../resources/ui/src/pages/service/index.tsx  |  6 +--
 .../resources/ui/src/pages/tags/index.tsx     | 32 +++++++-------
 .../ui/src/styles/components/size.less        |  6 +++
 9 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx
index 366508848a0..6f7b0021dee 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.component.tsx
@@ -28,6 +28,7 @@ const EntityHeaderTitle = ({
   openEntityInNewPage,
   deleted = false,
   serviceName,
+  badge,
 }: EntityHeaderTitleProps) => {
   const { t } = useTranslation();
   const location = useLocation();
@@ -43,29 +44,27 @@ const EntityHeaderTitle = ({
       data-testid={`${serviceName}-${name}`}
       gutter={8}
       wrap={false}>
-      <Col flex="45px">{icon}</Col>
-      <Col flex="auto">
-        <div>
-          <Typography.Text
-            className="m-b-0 d-block text-grey-muted text-md font-medium"
-            data-testid="entity-header-name">
-            {stringToHTML(name)}
-          </Typography.Text>
+      <Col>{icon}</Col>
+      <Col className={deleted || badge ? 'w-max-full-140' : 'w-max-full-45'}>
+        <Typography.Text
+          className="m-b-0 d-block text-grey-muted text-md font-medium"
+          data-testid="entity-header-name">
+          {stringToHTML(name)}
+        </Typography.Text>
 
-          <Typography.Text
-            className="m-b-0 d-block entity-header-display-name text-lg font-bold"
-            data-testid="entity-header-display-name"
-            ellipsis={{ tooltip: true }}>
-            {stringToHTML(displayName ?? name)}
-            {openEntityInNewPage && (
-              <IconExternalLink
-                className="anticon vertical-baseline m-l-xss"
-                height={14}
-                width={14}
-              />
-            )}
-          </Typography.Text>
-        </div>
+        <Typography.Text
+          className="m-b-0 d-block entity-header-display-name text-lg font-bold"
+          data-testid="entity-header-display-name"
+          ellipsis={{ tooltip: true }}>
+          {stringToHTML(displayName ?? name)}
+          {openEntityInNewPage && (
+            <IconExternalLink
+              className="anticon vertical-baseline m-l-xss"
+              height={14}
+              width={14}
+            />
+          )}
+        </Typography.Text>
       </Col>
       {deleted && (
         <Col className="self-end text-xs">
@@ -75,6 +74,7 @@ const EntityHeaderTitle = ({
           </div>
         </Col>
       )}
+      {badge && <Col className="self-end">{badge}</Col>}
     </Row>
   );
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.interface.ts
index fcc82dea2cd..88fbcf93d61 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityHeaderTitle/EntityHeaderTitle.interface.ts
@@ -18,4 +18,5 @@ export interface EntityHeaderTitleProps {
   openEntityInNewPage?: boolean;
   deleted?: boolean;
   serviceName: string;
+  badge?: React.ReactNode;
 }
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx
index 39b7d15d120..00077a3b4aa 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx
@@ -363,12 +363,11 @@ const GlossaryHeader = ({
   return (
     <>
       <Row gutter={[0, 16]} justify="space-between" wrap={false}>
-        <Col>
+        <Col flex="auto">
           <EntityHeader
             breadcrumb={breadcrumb}
             entityData={selectedData}
             entityType={EntityType.GLOSSARY_TERM}
-            gutter="large"
             icon={
               isGlossary ? (
                 <IconFolder
@@ -389,7 +388,7 @@ const GlossaryHeader = ({
             serviceName=""
           />
         </Col>
-        <Col>
+        <Col flex="270px">
           <div style={{ textAlign: 'right' }}>
             <div>
               {createButtons}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx
index cf9daace9f9..4785569d12c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/EntityPageInfo.tsx
@@ -366,8 +366,8 @@ const EntityPageInfo = ({
       className="w-full"
       data-testid="entity-page-info"
       direction="vertical">
-      <Row>
-        <Col span={18}>
+      <Row wrap={false}>
+        <Col flex="auto">
           <EntityHeader
             breadcrumb={titleLinks}
             entityData={{
@@ -384,7 +384,7 @@ const EntityPageInfo = ({
             serviceName={serviceType ?? ''}
           />
         </Col>
-        <Col className="d-flex justify-end item-start" span={6}>
+        <Col className="d-flex justify-end item-start" flex="320px">
           <Space align="center" id="version-and-follow-section">
             {!isUndefined(version) && (
               <VersionButton
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.tsx
index 92541815fef..dc06af9d518 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card-v2/TableDataCardV2.tsx
@@ -151,8 +151,8 @@ const TableDataCardV2: React.FC<TableDataCardPropsV2> = forwardRef<
         onClick={() => {
           handleSummaryPanelDisplay && handleSummaryPanelDisplay(source, tab);
         }}>
-        <Row>
-          <Col span={23}>
+        <Row wrap={false}>
+          <Col flex="auto">
             <EntityHeader
               titleIsLink
               breadcrumb={breadcrumbs}
@@ -163,11 +163,11 @@ const TableDataCardV2: React.FC<TableDataCardPropsV2> = forwardRef<
               serviceName={source.serviceType ?? ''}
             />
           </Col>
-          <Col className="d-flex justify-end" span={1}>
-            {showCheckboxes && (
+          {showCheckboxes && (
+            <Col flex="20px">
               <Checkbox checked={checked} className="m-l-auto" />
-            )}
-          </Col>
+            </Col>
+          )}
         </Row>
 
         <div className="tw-pt-3">
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
index 2018e393962..a7ddbe2e414 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
@@ -847,8 +847,8 @@ const DatabaseDetails: FunctionComponent = () => {
             ) : (
               <>
                 {database && (
-                  <Row className="p-x-xs">
-                    <Col span={23}>
+                  <Row className="p-x-xs" wrap={false}>
+                    <Col flex="auto">
                       <EntityHeader
                         breadcrumb={slashedDatabaseName}
                         entityData={database}
@@ -862,7 +862,7 @@ const DatabaseDetails: FunctionComponent = () => {
                         serviceName={database.service.name ?? ''}
                       />
                     </Col>
-                    <Col className="d-flex justify-end" span={1}>
+                    <Col flex="30px">
                       <ManageButton
                         isRecursiveDelete
                         allowSoftDelete={false}
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
index 687af8cabc9..623866f41ed 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
@@ -1090,8 +1090,8 @@ const ServicePage: FunctionComponent = () => {
           {servicePermission.ViewAll || servicePermission.ViewBasic ? (
             <Row data-testid="service-page">
               {serviceDetails && (
-                <Row className="w-full m-b-xs">
-                  <Col span={22}>
+                <Row className="w-full m-b-xs" wrap={false}>
+                  <Col flex="auto">
                     <EntityHeader
                       breadcrumb={slashedTableName}
                       entityData={serviceDetails}
@@ -1104,7 +1104,7 @@ const ServicePage: FunctionComponent = () => {
                       serviceName={serviceDetails.name}
                     />
                   </Col>
-                  <Col className="d-flex justify-end" span={2}>
+                  <Col flex="80px">
                     {serviceDetails?.serviceType !==
                       MetadataServiceType.OpenMetadata && (
                       <Tooltip
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
index c8ea5da4a73..4c2709f6dd6 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
@@ -786,12 +786,18 @@ const TagsPage = () => {
         ) : (
           <div className="full-height" data-testid="tags-container">
             {currentClassification && (
-              <Space
-                align="start"
-                className="w-full justify-between"
-                data-testid="header">
-                <Space align="end">
+              <Row data-testid="header" wrap={false}>
+                <Col flex="auto">
                   <EntityHeaderTitle
+                    badge={
+                      currentClassification.provider === ProviderType.System ? (
+                        <AppBadge
+                          className="m--t-xss"
+                          icon={<LockIcon height={12} />}
+                          label={capitalize(currentClassification.provider)}
+                        />
+                      ) : null
+                    }
                     displayName={getEntityName(currentClassification)}
                     icon={
                       <IconTag
@@ -802,15 +808,9 @@ const TagsPage = () => {
                     name={currentClassification.name}
                     serviceName="classification"
                   />
-                  {currentClassification.provider === ProviderType.System && (
-                    <AppBadge
-                      className="m--t-xss"
-                      icon={<LockIcon height={12} />}
-                      label={capitalize(currentClassification.provider)}
-                    />
-                  )}
-                </Space>
-                <div className="flex-center">
+                </Col>
+
+                <Col className="d-flex justify-end item-start" flex="270px">
                   <Tooltip
                     title={
                       !(
@@ -881,8 +881,8 @@ const TagsPage = () => {
                         </Tooltip>
                       </Dropdown>
                     )}
-                </div>
-              </Space>
+                </Col>
+              </Row>
             )}
             <div className="m-b-sm m-t-xs" data-testid="description-container">
               <Description
diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/components/size.less b/openmetadata-ui/src/main/resources/ui/src/styles/components/size.less
index 9454d0c46c3..9e7cfbd51e2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/styles/components/size.less
+++ b/openmetadata-ui/src/main/resources/ui/src/styles/components/size.less
@@ -132,6 +132,12 @@
 .w-max-13 {
   max-width: 13rem;
 }
+.w-max-full-45 {
+  max-width: calc(100% - 45px);
+}
+.w-max-full-140 {
+  max-width: calc(100% - 140px);
+}
 
 .w-auto {
   width: auto;