From b6575ded1cde31e1a505a53451b8323fcefcb57a Mon Sep 17 00:00:00 2001
From: Gabe Lyons <itsgabelyons@gmail.com>
Date: Thu, 28 Oct 2021 23:15:30 -0700
Subject: [PATCH] fix(ui): trim whitespace when resolving foreign keys (#3485)

---
 .../dataset/profile/schema/utils/schemaTitleRenderer.tsx     | 5 +++--
 .../tabs/Dataset/Schema/components/ForeignKeyLabel.tsx       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx
index 6d9e9f0655..1e881ce83d 100644
--- a/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx
+++ b/datahub-web-react/src/app/entity/dataset/profile/schema/utils/schemaTitleRenderer.tsx
@@ -65,8 +65,9 @@ export default function useSchemaTitleRenderer(
                     {schemaMetadata?.foreignKeys
                         ?.filter(
                             (constraint) =>
-                                (constraint?.sourceFields?.filter((sourceField) => sourceField?.fieldPath === fieldPath)
-                                    .length || 0) > 0,
+                                (constraint?.sourceFields?.filter(
+                                    (sourceField) => sourceField?.fieldPath.trim() === fieldPath.trim(),
+                                ).length || 0) > 0,
                         )
                         .map((constraint) => (
                             <ForeignKeyLabel
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx
index 38a781b817..fa4826551c 100644
--- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx
+++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/ForeignKeyLabel.tsx
@@ -38,7 +38,7 @@ export default function ForeignKeyLabel({
     const selectedFk = useContext(FkContext);
 
     const onOpenFk = () => {
-        if (selectedFk?.fieldPath === fieldPath && selectedFk?.constraint?.name === constraint?.name) {
+        if (selectedFk?.fieldPath.trim() === fieldPath.trim() && selectedFk?.constraint?.name === constraint?.name) {
             onClick(null);
         } else {
             onClick({ fieldPath, constraint });