feat(globaltags to glossaryterm): add globaltags property to glossaryterm and glossarynode entities

NikEyAkube · NikEyAkube · commit 22d8ae83c48a · 2024-12-23T14:09:32.000Z
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/GlossaryNodeType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/GlossaryNodeType.java
@@ -1,6 +1,7 @@
 package com.linkedin.datahub.graphql.types.glossary;
 
 import static com.linkedin.metadata.Constants.FORMS_ASPECT_NAME;
+import static com.linkedin.metadata.Constants.GLOBAL_TAGS_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.GLOSSARY_NODE_ENTITY_NAME;
 import static com.linkedin.metadata.Constants.GLOSSARY_NODE_INFO_ASPECT_NAME;
 import static com.linkedin.metadata.Constants.GLOSSARY_NODE_KEY_ASPECT_NAME;
@@ -33,6 +34,7 @@ public class GlossaryNodeType
       ImmutableSet.of(
           GLOSSARY_NODE_KEY_ASPECT_NAME,
           GLOSSARY_NODE_INFO_ASPECT_NAME,
+          GLOBAL_TAGS_ASPECT_NAME,
           OWNERSHIP_ASPECT_NAME,
           STRUCTURED_PROPERTIES_ASPECT_NAME,
           FORMS_ASPECT_NAME);
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/GlossaryTermType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/GlossaryTermType.java
@@ -2,6 +2,7 @@
 
 import static com.linkedin.datahub.graphql.Constants.*;
 import static com.linkedin.metadata.Constants.*;
+import static com.linkedin.metadata.Constants.GLOBAL_TAGS_ASPECT_NAME;
 
 import com.google.common.collect.ImmutableSet;
 import com.linkedin.common.urn.Urn;
@@ -54,6 +55,7 @@ public class GlossaryTermType
           GLOSSARY_RELATED_TERM_ASPECT_NAME,
           INSTITUTIONAL_MEMORY_ASPECT_NAME,
           OWNERSHIP_ASPECT_NAME,
+          GLOBAL_TAGS_ASPECT_NAME,
           STATUS_ASPECT_NAME,
           BROWSE_PATHS_ASPECT_NAME,
           DOMAINS_ASPECT_NAME,
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/mappers/GlossaryNodeMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/mappers/GlossaryNodeMapper.java
@@ -4,6 +4,7 @@
 import static com.linkedin.metadata.Constants.*;
 
 import com.linkedin.common.Forms;
+import com.linkedin.common.GlobalTags;
 import com.linkedin.common.Ownership;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.DataMap;
@@ -18,6 +19,7 @@
 import com.linkedin.datahub.graphql.types.form.FormsMapper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import com.linkedin.datahub.graphql.types.structuredproperty.StructuredPropertiesMapper;
+import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper;
 import com.linkedin.entity.EntityResponse;
 import com.linkedin.entity.EnvelopedAspectMap;
 import com.linkedin.glossary.GlossaryNodeInfo;
@@ -61,6 +63,9 @@ public GlossaryNode apply(
             entity.setStructuredProperties(
                 StructuredPropertiesMapper.map(
                     context, new StructuredProperties(dataMap), entityUrn))));
+    mappingHelper.mapToResult(
+        GLOBAL_TAGS_ASPECT_NAME,
+        (dataset, dataMap) -> mapGlobalTags(context, dataset, dataMap, entityUrn));
     mappingHelper.mapToResult(
         FORMS_ASPECT_NAME,
         ((entity, dataMap) ->
@@ -99,4 +104,15 @@ private void mapGlossaryNodeKey(@Nonnull GlossaryNode glossaryNode, @Nonnull Dat
       glossaryNode.getProperties().setName(glossaryNodeKey.getName());
     }
   }
+
+  private static void mapGlobalTags(
+      @Nullable final QueryContext context,
+      @Nonnull GlossaryNode glossaryNode,
+      @Nonnull DataMap dataMap,
+      @Nonnull final Urn entityUrn) {
+    com.linkedin.datahub.graphql.generated.GlobalTags globalTags =
+        GlobalTagsMapper.map(context, new GlobalTags(dataMap), entityUrn);
+    glossaryNode.setGlobalTags(globalTags);
+    glossaryNode.setTags(globalTags);
+  }
 }
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/mappers/GlossaryTermMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/glossary/mappers/GlossaryTermMapper.java
@@ -5,6 +5,7 @@
 
 import com.linkedin.common.Deprecation;
 import com.linkedin.common.Forms;
+import com.linkedin.common.GlobalTags;
 import com.linkedin.common.InstitutionalMemory;
 import com.linkedin.common.Ownership;
 import com.linkedin.common.urn.Urn;
@@ -23,6 +24,7 @@
 import com.linkedin.datahub.graphql.types.glossary.GlossaryTermUtils;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import com.linkedin.datahub.graphql.types.structuredproperty.StructuredPropertiesMapper;
+import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper;
 import com.linkedin.domain.Domains;
 import com.linkedin.entity.EntityResponse;
 import com.linkedin.entity.EnvelopedAspectMap;
@@ -92,6 +94,9 @@ public GlossaryTerm apply(
             entity.setStructuredProperties(
                 StructuredPropertiesMapper.map(
                     context, new StructuredProperties(dataMap), entityUrn))));
+    mappingHelper.mapToResult(
+        GLOBAL_TAGS_ASPECT_NAME,
+        (dataset, dataMap) -> mapGlobalTags(context, dataset, dataMap, entityUrn));
     mappingHelper.mapToResult(
         FORMS_ASPECT_NAME,
         ((entity, dataMap) ->
@@ -124,4 +129,15 @@ private void mapDomains(
     final Domains domains = new Domains(dataMap);
     glossaryTerm.setDomain(DomainAssociationMapper.map(context, domains, glossaryTerm.getUrn()));
   }
+
+  private static void mapGlobalTags(
+      @Nullable final QueryContext context,
+      @Nonnull GlossaryTerm glossaryTerm,
+      @Nonnull DataMap dataMap,
+      @Nonnull final Urn entityUrn) {
+    com.linkedin.datahub.graphql.generated.GlobalTags globalTags =
+        GlobalTagsMapper.map(context, new GlobalTags(dataMap), entityUrn);
+    glossaryTerm.setGlobalTags(globalTags);
+    glossaryTerm.setTags(globalTags);
+  }
 }
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -2268,6 +2268,12 @@ type GlossaryTerm implements Entity {
     The forms associated with the Dataset
     """
     forms: Forms
+
+    """
+    Tags used for searching the data platform instance
+    """
+    tags: GlobalTags
+    globalTags: GlobalTags
 }
 
 """
@@ -2421,6 +2427,12 @@ type GlossaryNode implements Entity {
     The forms associated with the Dataset
     """
     forms: Forms
+
+    """
+    Tags used for searching the data platform instance
+    """
+    tags: GlobalTags
+    globalTags: GlobalTags
 }
 
 """
diff --git a/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx b/datahub-web-react/src/app/entity/glossaryNode/GlossaryNodeEntity.tsx
@@ -13,6 +13,7 @@ import ChildrenTab from './ChildrenTab';
 import { Preview } from './preview/Preview';
 import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
 import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
 
 class GlossaryNodeEntity implements Entity<GlossaryNode> {
     type: EntityType = EntityType.GlossaryNode;
@@ -101,6 +102,13 @@ class GlossaryNodeEntity implements Entity<GlossaryNode> {
         {
             component: SidebarOwnerSection,
         },
+	{
+            component: SidebarTagsSection,
+            properties: {
+                hasTags: true,
+		hasTerms: false,
+            },
+        },
         {
             component: SidebarStructuredPropsSection,
         },
@@ -128,6 +136,7 @@ class GlossaryNodeEntity implements Entity<GlossaryNode> {
                 name={this.displayName(data)}
                 description={data?.properties?.description || ''}
                 owners={data?.ownership?.owners}
+		globalTags={data.globalTags}
             />
         );
     };
@@ -149,6 +158,7 @@ class GlossaryNodeEntity implements Entity<GlossaryNode> {
             EntityCapabilityType.OWNERS,
             EntityCapabilityType.DEPRECATION,
             EntityCapabilityType.SOFT_DELETE,
+	    EntityCapabilityType.TAGS
         ]);
     };
 
diff --git a/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx b/datahub-web-react/src/app/entity/glossaryTerm/GlossaryTermEntity.tsx
@@ -19,6 +19,7 @@ import { EntityActionItem } from '../shared/entity/EntityActions';
 import { SidebarDomainSection } from '../shared/containers/profile/sidebar/Domain/SidebarDomainSection';
 import { PageRoutes } from '../../../conf/Global';
 import SidebarStructuredPropsSection from '../shared/containers/profile/sidebar/StructuredProperties/SidebarStructuredPropsSection';
+import { SidebarTagsSection } from '../shared/containers/profile/sidebar/SidebarTagsSection';
 
 /**
  * Definition of the DataHub Dataset entity.
@@ -124,6 +125,13 @@ export class GlossaryTermEntity implements Entity<GlossaryTerm> {
         {
             component: SidebarOwnerSection,
         },
+	{
+            component: SidebarTagsSection,
+            properties: {
+                hasTags: true,
+		hasTerms: false,
+            },
+        },
         {
             component: SidebarDomainSection,
             properties: {
@@ -156,6 +164,7 @@ export class GlossaryTermEntity implements Entity<GlossaryTerm> {
                 description={data?.properties?.description || ''}
                 owners={data?.ownership?.owners}
                 domain={data.domain?.domain}
+		globalTags={data.globalTags}
             />
         );
     };
@@ -181,6 +190,7 @@ export class GlossaryTermEntity implements Entity<GlossaryTerm> {
             EntityCapabilityType.OWNERS,
             EntityCapabilityType.DEPRECATION,
             EntityCapabilityType.SOFT_DELETE,
+	    EntityCapabilityType.TAGS
         ]);
     };
 
diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/sidebar/SidebarTagsSection.tsx
@@ -50,7 +50,9 @@ export const SidebarTagsSection = ({ properties, readOnly }: Props) => {
                     fontSize={12}
                 />
             </span>
-            <StyledDivider />
+            {canAddTerm && (
+	    <>
+	    <StyledDivider />
             <span id={ENTITY_PROFILE_GLOSSARY_TERMS_ID}>
                 <SidebarHeader title="Glossary Terms" />
                 <TagTermGroup
@@ -69,6 +71,8 @@ export const SidebarTagsSection = ({ properties, readOnly }: Props) => {
                     fontSize={12}
                 />
             </span>
+	    </>
+	)}
         </div>
     );
 };
diff --git a/datahub-web-react/src/graphql/glossaryNode.graphql b/datahub-web-react/src/graphql/glossaryNode.graphql
@@ -37,6 +37,9 @@ query getGlossaryNode($urn: String!) {
         forms {
             ...formsFields
         }
+	globalTags {
+            ...globalTagsFields
+    	}
         children: relationships(input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 10000 }) {
             total
             relationships {
diff --git a/datahub-web-react/src/graphql/glossaryTerm.graphql b/datahub-web-react/src/graphql/glossaryTerm.graphql
@@ -63,6 +63,9 @@ query getGlossaryTerm($urn: String!, $start: Int, $count: Int) {
         domain {
             ...entityDomain
         }
+	globalTags {
+            ...globalTagsFields
+    	}
         institutionalMemory {
             ...institutionalMemoryFields
         }
diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
@@ -150,6 +150,9 @@ fragment autoCompleteFields on Entity {
     ... on GlossaryTerm {
         name
         hierarchicalName
+	globalTags {
+            ...globalTagsFields
+    	}
         properties {
             name
         }
@@ -723,6 +726,9 @@ fragment searchResultsWithoutSchemaField on Entity {
         parentNodes {
             ...parentNodesFields
         }
+	globalTags {
+            ...globalTagsFields
+        }
         domain {
             ...entityDomain
         }
@@ -737,6 +743,9 @@ fragment searchResultsWithoutSchemaField on Entity {
         parentNodes {
             ...parentNodesFields
         }
+	globalTags {
+            ...globalTagsFields
+    	}
         structuredProperties {
             properties {
                 ...structuredPropertiesFields
diff --git a/metadata-models/src/main/resources/entity-registry.yml b/metadata-models/src/main/resources/entity-registry.yml
@@ -270,6 +270,7 @@ entities:
       - ownership
       - deprecation
       - domains
+      - globalTags
       - status
       - browsePaths
       - structuredProperties
@@ -282,6 +283,7 @@ entities:
       - glossaryNodeInfo
       - institutionalMemory
       - ownership
+      - globalTags
       - status
       - structuredProperties
       - forms

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ query getGlossaryTerm($urn: String!, $start: Int, $count: Int) {`
`63`	`63`	`domain {`
`64`	`64`	`...entityDomain`
`65`	`65`	`}`
	`66`	`+ globalTags {`
	`67`	`+ ...globalTagsFields`
	`68`	`+ }`
`66`	`69`	`institutionalMemory {`
`67`	`70`	`...institutionalMemoryFields`
`68`	`71`	`}`