add decoding coverage to assertions and foreign keys

datahub-project · Nov 3, 2022 · dbe889f · dbe889f
1 parent 2c61f61
commit dbe889f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/components/SchemaRow.tsx
@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 import { GetDatasetQuery } from '../../../../../../../graphql/dataset.generated';
 import { EntityType } from '../../../../../../../types.generated';
+import { decodeSchemaField } from '../../../../../../lineage/utils/columnLineageUtils';
 import CompactContext from '../../../../../../shared/CompactContext';
 import { useEntityRegistry } from '../../../../../../useEntityRegistry';
 import { ANTD_GRAY } from '../../../../constants';
@@ -130,7 +131,7 @@ export const SchemaRow = ({
                                     <TableTitle>{baseEntity.dataset?.name}</TableTitle>
                                     {selectedFk?.constraint?.sourceFields?.map((field) => (
                                         <div key={field?.fieldPath}>
-                                            <FieldBadge count={field?.fieldPath} />
+                                            <FieldBadge count={decodeSchemaField(field?.fieldPath || '')} />
                                         </div>
                                     ))}
                                 </div>
@@ -139,7 +140,7 @@ export const SchemaRow = ({
                                     <TableTitle>{selectedFk?.constraint?.foreignDataset?.name}</TableTitle>
                                     {selectedFk?.constraint?.foreignFields?.map((field) => (
                                         <div key={field?.fieldPath}>
-                                            <FieldBadge count={field?.fieldPath} />
+                                            <FieldBadge count={decodeSchemaField(field?.fieldPath || '')} />
                                         </div>
                                     ))}
                                 </div>

diff --git a/...-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx b/...-web-react/src/app/entity/shared/tabs/Dataset/Validations/DatasetAssertionDescription.tsx
@@ -9,6 +9,7 @@ import {
     DatasetAssertionScope,
     SchemaFieldRef,
 } from '../../../../../../types.generated';
+import { decodeSchemaField } from '../../../../../lineage/utils/columnLineageUtils';
 import { getFormattedParameterValue } from './assertionUtils';
 import { DatasetAssertionLogicModal } from './DatasetAssertionLogicModal';
 
@@ -37,7 +38,7 @@ const getSchemaAggregationText = (
         case AssertionStdAggregation.Columns:
             return <Typography.Text>Dataset columns are</Typography.Text>;
         case AssertionStdAggregation.Native: {
-            const fieldNames = fields?.map((field) => field.path) || [];
+            const fieldNames = fields?.map((field) => decodeSchemaField(field.path)) || [];
             return (
                 <Typography.Text>
                     Dataset columns <Typography.Text strong>{JSON.stringify(fieldNames)}</Typography.Text> are
@@ -76,7 +77,7 @@ const getColumnAggregationText = (
     aggregation: AssertionStdAggregation | undefined | null,
     field: SchemaFieldRef | undefined,
 ) => {
-    let columnText = field?.path;
+    let columnText = decodeSchemaField(field?.path || '');
     if (field === undefined) {
         columnText = 'undefined';
         console.error(`Invalid field provided for Dataset Assertion with scope Column ${JSON.stringify(field)}`);