From 3f5c8b8d95f86194d940d2f1cfa98fb5d3f6a20f Mon Sep 17 00:00:00 2001
From: Sachin Chaurasiya <sachinchaurasiyachotey87@gmail.com>
Date: Tue, 15 Feb 2022 12:21:20 +0530
Subject: [PATCH] Fix #2568 Show database/entity_name in Lineage Node Label.
 (#2744)

* Fix #2568 Show database/entity_name in Lineage Node Label.

* Changing `/` to `.` as separator.
---
 .../EntityLineage/EntityLineage.component.tsx          |  2 +-
 .../EntityLineage/NodeSuggestions.component.tsx        |  2 +-
 .../main/resources/ui/src/utils/EntityLineageUtils.tsx | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx
index eef30536cf7..5234b77d81c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx
@@ -168,7 +168,7 @@ const Entitylineage: FunctionComponent<EntityLineageProp> = ({
         ) : null}
         <p className="tw-flex">
           <span className="tw-mr-2">{getEntityIcon(node.type)}</span>
-          {getDataLabel(node.displayName, node.name)}
+          {getDataLabel(node.displayName, node.name, '.', false, node.type)}
         </p>
       </>
     );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/NodeSuggestions.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/NodeSuggestions.component.tsx
index e26b73a56e6..0ede4af1bf2 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/NodeSuggestions.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/NodeSuggestions.component.tsx
@@ -80,7 +80,7 @@ const NodeSuggestions: FC<EntitySuggestionProps> = ({
                   });
                 }}>
                 {entity.database
-                  ? `${entity.database}/${entity.name}`
+                  ? `${entity.database}.${entity.name}`
                   : entity.name}
               </span>
             </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx
index 21c5e1755d3..866dd31cd79 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx
@@ -399,8 +399,10 @@ export const getDataLabel = (
   displayName?: string,
   name = '',
   separator = '.',
-  isTextOnly = false
+  isTextOnly = false,
+  type?: string
 ) => {
+  const databaseName = getPartialNameFromFQN(name, ['database']);
   let label = '';
   if (displayName) {
     label = displayName;
@@ -417,7 +419,11 @@ export const getDataLabel = (
     <span
       className="tw-break-words description-text tw-self-center"
       data-testid="lineage-entity">
-      {label}
+      {type === 'table'
+        ? databaseName
+          ? `${databaseName}.${label}`
+          : label
+        : label}
     </span>
   );
 };