Skip to content

feat(context): Support Viewing and Adding Related Context to All Asset Types #15453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjoyce0510 merged 25 commits into from
Dec 8, 2025
Merged

feat(context): Support Viewing and Adding Related Context to All Asset Types #15453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
21cd6bf
Checkpoint
Nov 27, 2025
4983e00
Addressing chris comments from prev PR
Dec 1, 2025
7324c1e
delete unnecessary file
Dec 1, 2025
2487543
Addressing my own comments 1
Dec 1, 2025
b1dfd1a
resolve more of my own comments
Dec 1, 2025
9172129
Adding finishing touches
Dec 1, 2025
15b6c85
More linting fixes
Dec 1, 2025
980b361
Adding fixes to documents
Dec 1, 2025
05e88e9
Fix cypress tests
Dec 1, 2025
8c9c132
Fixing draft test
Dec 2, 2025
ad44436
Attempt to fix test
Dec 3, 2025
bf16877
attempt unit test updates
Dec 4, 2025
d9bc27f
Checkpoint
Nov 27, 2025
4bdc885
Addressing chris comments from prev PR
Dec 1, 2025
595b825
delete unnecessary file
Dec 1, 2025
f6fbe1e
Addressing my own comments 1
Dec 1, 2025
37d1198
resolve more of my own comments
Dec 1, 2025
1960c3b
Adding finishing touches
Dec 1, 2025
71af7b6
More linting fixes
Dec 1, 2025
536d020
Adding fixes to documents
Dec 1, 2025
f1dac58
Fix cypress tests
Dec 1, 2025
9231cc7
Fixing draft test
Dec 2, 2025
2be60ad
Attempt to fix test
Dec 3, 2025
80c5bde
attempt unit test updates
Dec 4, 2025
68a209e
Merge remote-tracking branch 'cloud/jj--add-context-docs-ui-v2-part3'…
Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 69 additions & 5 deletions datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,10 @@ private void configureContainerResolvers(final RuntimeWiring.Builder builder) {
typeWiring ->
typeWiring
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService))
.dataFetcher("entities", new ContainerEntitiesResolver(entityClient))
.dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
.dataFetcher(
Expand Down Expand Up @@ -1749,6 +1753,10 @@ private void configureDatasetResolvers(final RuntimeWiring.Builder builder) {
typeWiring
.dataFetcher(
"relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge
.RelatedDocumentsResolver(documentService, entityClient, groupService))
.dataFetcher("browsePaths", new EntityBrowsePathsResolver(this.datasetType))
.dataFetcher(
"lineage",
Expand Down Expand Up @@ -1975,7 +1983,11 @@ private void configureGlossaryTermResolvers(final RuntimeWiring.Builder builder)
.dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
.dataFetcher(
"aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry))
.dataFetcher("exists", new EntityExistsResolver(entityService)));
.dataFetcher("exists", new EntityExistsResolver(entityService))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService)));
}

private void configureGlossaryNodeResolvers(final RuntimeWiring.Builder builder) {
Expand All @@ -1991,7 +2003,11 @@ private void configureGlossaryNodeResolvers(final RuntimeWiring.Builder builder)
"glossaryChildrenSearch",
new GlossaryChildrenSearchResolver(this.entityClient, this.viewService))
.dataFetcher(
"aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry)));
"aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService)));
}

private void configureSchemaFieldResolvers(final RuntimeWiring.Builder builder) {
Expand Down Expand Up @@ -2216,6 +2232,10 @@ private void configureDashboardResolvers(final RuntimeWiring.Builder builder) {
typeWiring ->
typeWiring
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService))
.dataFetcher("browsePaths", new EntityBrowsePathsResolver(this.dashboardType))
.dataFetcher(
"lineage",
Expand Down Expand Up @@ -2347,6 +2367,10 @@ private void configureChartResolvers(final RuntimeWiring.Builder builder) {
typeWiring ->
typeWiring
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService))
.dataFetcher("browsePaths", new EntityBrowsePathsResolver(this.chartType))
.dataFetcher(
"aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry))
Expand Down Expand Up @@ -2547,6 +2571,10 @@ private void configureDataJobResolvers(final RuntimeWiring.Builder builder) {
typeWiring
.dataFetcher(
"relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge
.RelatedDocumentsResolver(documentService, entityClient, groupService))
.dataFetcher("browsePaths", new EntityBrowsePathsResolver(this.dataJobType))
.dataFetcher(
"lineage",
Expand Down Expand Up @@ -2650,6 +2678,10 @@ private void configureDataFlowResolvers(final RuntimeWiring.Builder builder) {
typeWiring ->
typeWiring
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService))
.dataFetcher("browsePaths", new EntityBrowsePathsResolver(this.dataFlowType))
.dataFetcher(
"lineage",
Expand Down Expand Up @@ -2706,6 +2738,10 @@ private void configureMLFeatureTableResolvers(final RuntimeWiring.Builder builde
typeWiring
.dataFetcher(
"relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge
.RelatedDocumentsResolver(documentService, entityClient, groupService))
.dataFetcher(
"browsePaths", new EntityBrowsePathsResolver(this.mlFeatureTableType))
.dataFetcher(
Expand Down Expand Up @@ -2798,6 +2834,10 @@ private void configureMLFeatureTableResolvers(final RuntimeWiring.Builder builde
typeWiring
.dataFetcher(
"relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge
.RelatedDocumentsResolver(documentService, entityClient, groupService))
.dataFetcher("browsePaths", new EntityBrowsePathsResolver(this.mlModelType))
.dataFetcher(
"lineage",
Expand Down Expand Up @@ -2846,6 +2886,10 @@ private void configureMLFeatureTableResolvers(final RuntimeWiring.Builder builde
typeWiring
.dataFetcher(
"relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge
.RelatedDocumentsResolver(documentService, entityClient, groupService))
.dataFetcher(
"browsePaths", new EntityBrowsePathsResolver(this.mlModelGroupType))
.dataFetcher(
Expand Down Expand Up @@ -2879,6 +2923,10 @@ private void configureMLFeatureTableResolvers(final RuntimeWiring.Builder builde
typeWiring
.dataFetcher(
"relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge
.RelatedDocumentsResolver(documentService, entityClient, groupService))
.dataFetcher(
"lineage",
new EntityLineageResultResolver(
Expand All @@ -2905,6 +2953,10 @@ private void configureMLFeatureTableResolvers(final RuntimeWiring.Builder builde
typeWiring
.dataFetcher(
"relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge
.RelatedDocumentsResolver(documentService, entityClient, groupService))
.dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
.dataFetcher(
"lineage",
Expand Down Expand Up @@ -2951,7 +3003,11 @@ private void configureDomainResolvers(final RuntimeWiring.Builder builder) {
.dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
.dataFetcher(
"aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry))
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient)));
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService)));
builder.type(
"DomainAssociation",
typeWiring ->
Expand Down Expand Up @@ -3043,7 +3099,11 @@ private void configureDataProductResolvers(final RuntimeWiring.Builder builder)
.dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
.dataFetcher(
"aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry))
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient)));
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService)));
}

private void configureApplicationResolvers(final RuntimeWiring.Builder builder) {
Expand All @@ -3054,7 +3114,11 @@ private void configureApplicationResolvers(final RuntimeWiring.Builder builder)
.dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
.dataFetcher(
"aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry))
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient)));
.dataFetcher("relationships", new EntityRelationshipsResultResolver(graphClient))
.dataFetcher(
"relatedDocuments",
new com.linkedin.datahub.graphql.resolvers.knowledge.RelatedDocumentsResolver(
documentService, entityClient, groupService)));
builder.type(
"ApplicationAssociation",
typeWiring ->
Expand Down
72 changes: 72 additions & 0 deletions ...main/java/com/linkedin/datahub/graphql/resolvers/knowledge/DocumentSearchFilterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package com.linkedin.datahub.graphql.resolvers.knowledge;

import com.linkedin.metadata.query.filter.Condition;
import com.linkedin.metadata.query.filter.ConjunctiveCriterion;
import com.linkedin.metadata.query.filter.ConjunctiveCriterionArray;
import com.linkedin.metadata.query.filter.Criterion;
import com.linkedin.metadata.query.filter.CriterionArray;
import com.linkedin.metadata.query.filter.Filter;
import com.linkedin.metadata.utils.CriterionUtils;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;

/**
* Utility class for building document search filters with ownership constraints. Shared logic for
* SearchDocumentsResolver and ContextDocumentsResolver.
*/
public class DocumentSearchFilterUtils {

private DocumentSearchFilterUtils() {
// Utility class - prevent instantiation
}

/**
* Builds a combined filter with ownership constraints. The filter structure is: (user-filters AND
* PUBLISHED AND NOT-DRAFT) OR (user-filters AND UNPUBLISHED AND owned-by-user-or-groups AND
* NOT-DRAFT)
*
* <p>Drafts (documents with draftOf field set) are excluded by default from search results. They
* should only be accessed directly by URN or through the DocumentDrafts resolver.
*
* @param baseCriteria The base user criteria (without state filtering)
* @param userAndGroupUrns List of URNs for the current user and their groups
* @return The combined filter
*/
@Nonnull
public static Filter buildCombinedFilter(
@Nonnull List<Criterion> baseCriteria, @Nonnull List<String> userAndGroupUrns) {
// Build two conjunctive clauses:
// 1. Base filters AND PUBLISHED AND NOT-DRAFT
// 2. Base filters AND UNPUBLISHED AND owned-by-user-or-groups AND NOT-DRAFT

List<ConjunctiveCriterion> orClauses = new ArrayList<>();

// Create criterion to exclude drafts (draftOf field must be null/not set)
Criterion notDraftCriterion = new Criterion();
notDraftCriterion.setField("draftOf");
notDraftCriterion.setCondition(Condition.IS_NULL);

// Clause 1: Published documents (with user filters, excluding drafts)
List<Criterion> publishedCriteria = new ArrayList<>(baseCriteria);
publishedCriteria.add(CriterionUtils.buildCriterion("state", Condition.EQUAL, "PUBLISHED"));
publishedCriteria.add(notDraftCriterion);
orClauses.add(new ConjunctiveCriterion().setAnd(new CriterionArray(publishedCriteria)));

// Clause 2: Unpublished documents owned by user or their groups (with user filters, excluding
// drafts)
List<Criterion> unpublishedOwnedCriteria = new ArrayList<>(baseCriteria);
unpublishedOwnedCriteria.add(
CriterionUtils.buildCriterion("state", Condition.EQUAL, "UNPUBLISHED"));
unpublishedOwnedCriteria.add(
CriterionUtils.buildCriterion("owners", Condition.EQUAL, userAndGroupUrns));
// Create a new criterion instance for the second clause to avoid sharing mutable state
Criterion notDraftCriterion2 = new Criterion();
notDraftCriterion2.setField("draftOf");
notDraftCriterion2.setCondition(Condition.IS_NULL);
unpublishedOwnedCriteria.add(notDraftCriterion2);
orClauses.add(new ConjunctiveCriterion().setAnd(new CriterionArray(unpublishedOwnedCriteria)));

return new Filter().setOr(new ConjunctiveCriterionArray(orClauses));
}
}
Loading
Loading