feat(ui) Add sorting to the Usage column & fix entity type name in Li…

…neage Drawer (#6290)
datahub-project · Nov 1, 2022 · 96848d5 · 96848d5
1 parent 873b100
commit 96848d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx b/datahub-web-react/src/app/entity/shared/tabs/Dataset/Schema/SchemaTable.tsx
@@ -156,12 +156,23 @@ export default function SchemaTable({
         },
     };
 
+    // Function to get the count of each usageStats fieldPath
+    function getCount(fieldPath: any) {
+        const data: any =
+            usageStats?.aggregations?.fields &&
+            usageStats?.aggregations?.fields.find((field) => {
+                return field?.fieldName === fieldPath;
+            });
+        return data && data.count;
+    }
+
     const usageColumn = {
         width: '10%',
         title: 'Usage',
         dataIndex: 'fieldPath',
         key: 'usage',
         render: usageStatsRenderer,
+        sorter: (sourceA, sourceB) => getCount(sourceA.fieldPath) - getCount(sourceB.fieldPath),
     };
 
     const menuColumn = {

diff --git a/datahub-web-react/src/app/lineage/LineageExplorer.tsx b/datahub-web-react/src/app/lineage/LineageExplorer.tsx
@@ -12,7 +12,6 @@ import { EntityAndType, EntitySelectParams, FetchedEntities } from './types';
 import LineageViz from './LineageViz';
 import extendAsyncEntities from './utils/extendAsyncEntities';
 import { EntityType } from '../../types.generated';
-import { capitalizeFirstLetter } from '../shared/textUtil';
 import { ANTD_GRAY } from '../entity/shared/constants';
 import { GetEntityLineageQuery, useGetEntityLineageQuery } from '../../graphql/lineage.generated';
 import { useIsSeparateSiblingsMode } from '../entity/shared/siblingUtils';
@@ -184,7 +183,7 @@ export default function LineageExplorer({ urn, type }: Props) {
                                 Close
                             </Button>
                             <Button href={entityRegistry.getEntityUrl(selectedEntity.type, selectedEntity.urn)}>
-                                <InfoCircleOutlined /> {capitalizeFirstLetter(selectedEntity.type)} Details
+                                <InfoCircleOutlined /> {entityRegistry.getEntityName(selectedEntity.type)} Details
                             </Button>
                         </FooterButtonGroup>
                     )