From f863e01d069fc9597d9abbc8e87b51703405cec7 Mon Sep 17 00:00:00 2001 From: anuj-kumary Date: Fri, 24 Apr 2026 15:53:54 +0530 Subject: [PATCH 1/2] Added filter persist overall mode --- .../OntologyExplorer/hooks/useOntologyExplorer.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/hooks/useOntologyExplorer.ts b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/hooks/useOntologyExplorer.ts index deb774b72e7f..40fd5d5646ee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/hooks/useOntologyExplorer.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/hooks/useOntologyExplorer.ts @@ -1190,8 +1190,7 @@ export function useOntologyExplorer({ if (mode === 'data') { modelFiltersRef.current = filters; const nextFilters: GraphFilters = { - ...dataFiltersRef.current, - glossaryIds: filters.glossaryIds, + ...filters, viewMode: 'overview' satisfies GraphViewMode, }; if (graphData) { @@ -1205,7 +1204,10 @@ export function useOntologyExplorer({ setSelectedNode(null); setExpandedTermIds(new Set()); setExplorationMode(mode); - setFilters(modelFiltersRef.current); + setFilters({ + ...filters, + viewMode: modelFiltersRef.current.viewMode, + }); setTermAssetCounts({}); } }, From 29fd72689813d4b75d6d78f9c8649cfdfefa0a08 Mon Sep 17 00:00:00 2001 From: anuj-kumary Date: Sat, 25 Apr 2026 00:13:11 +0530 Subject: [PATCH 2/2] Fix name fallback --- .../OntologyExplorer/OntologyExplorer.interface.ts | 2 ++ .../src/components/OntologyExplorer/OntologyExplorer.tsx | 1 + .../ui/src/components/OntologyExplorer/OntologyGraphG6.tsx | 2 ++ .../src/components/OntologyExplorer/hooks/useGraphData.ts | 7 ++++++- .../src/components/OntologyExplorer/utils/graphBuilders.ts | 4 +++- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.interface.ts index 088f498133cc..5264232db9c9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.interface.ts @@ -109,6 +109,7 @@ export interface OntologyGraphProps { nodePositions?: Record; selectedNodeId?: string | null; expandedTermIds?: Set; + glossaries: Glossary[]; glossaryColorMap: Record; dataSignature?: string; explorationMode?: ExplorationMode; @@ -208,6 +209,7 @@ export interface BuildGraphDataProps { expandedTermIds?: Set; clickedEdgeId: string | null; nodePositions?: Record; + glossaries: Glossary[]; glossaryColorMap: Record; layoutType: LayoutEngineType; hierarchyCombos?: HierarchyComboInfo[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.tsx index 69921e671071..a1a1a6c07193 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.tsx @@ -243,6 +243,7 @@ const OntologyExplorer: React.FC = ({ ? selectedNode?.id ?? entityId : entityId } + glossaries={glossaries} glossaryColorMap={glossaryColorMap} graphSearchHighlight={graphSearchHighlight} hierarchyCombos={ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyGraphG6.tsx b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyGraphG6.tsx index 44e0e20c43fa..b3371015a879 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyGraphG6.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyGraphG6.tsx @@ -61,6 +61,7 @@ const OntologyGraph = forwardRef( settings, selectedNodeId, expandedTermIds, + glossaries, glossaryColorMap, dataSignature = '', explorationMode = 'model', @@ -99,6 +100,7 @@ const OntologyGraph = forwardRef( selectedNodeId: selectedNodeId ?? null, expandedTermIds, clickedEdgeId, + glossaries, glossaryColorMap, hierarchyCombos: hierarchyCombos ?? [], graphSearchHighlight, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/hooks/useGraphData.ts b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/hooks/useGraphData.ts index d0a224d9f4eb..c309270d649e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/hooks/useGraphData.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/hooks/useGraphData.ts @@ -150,6 +150,7 @@ export function useGraphDataBuilder({ expandedTermIds, clickedEdgeId, nodePositions, + glossaries, glossaryColorMap, layoutType, hierarchyCombos = [], @@ -718,7 +719,10 @@ export function useGraphDataBuilder({ if (terms.length === 0) { return; } - const name = terms[0].group ?? glossaryId; + const glossary = glossaries.find((g) => g.id === glossaryId); + const name = + terms[0].group ?? + (glossary ? glossary.displayName || glossary.name : ''); const color = glossaryColorMap[glossaryId] ?? 'var(--color-gray-400)'; const isComboDimmed = Boolean( searchGlossarySet && !searchGlossarySet.has(glossaryId) @@ -752,6 +756,7 @@ export function useGraphDataBuilder({ explorationMode, hierarchyCombos, graphSearchHighlight, + glossaries, ]); const assetToTermMap = useMemo(() => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/utils/graphBuilders.ts b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/utils/graphBuilders.ts index f4551bcf6a0d..2e55bcdc54db 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/utils/graphBuilders.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/utils/graphBuilders.ts @@ -200,6 +200,8 @@ export function buildGraphFromAllTerms( (term.children && term.children.length > 0) || term.parent; + const glossary = glossaryList.find((g) => g.id === term.glossary?.id); + nodesMap.set(term.id, { id: term.id, label: term.displayName || term.name, @@ -207,7 +209,7 @@ export function buildGraphFromAllTerms( fullyQualifiedName: term.fullyQualifiedName, description: term.description, glossaryId: term.glossary?.id, - group: glossaryList.find((g) => g.id === term.glossary?.id)?.name, + group: glossary ? glossary.displayName || glossary.name : undefined, owners: term.owners, });