Ontology filter persist (#27702)

* Added filter persist overall mode

* Fix name fallback

Author: anuj-kumary

openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.interface.ts

@@ -109,6 +109,7 @@ export interface OntologyGraphProps {
   nodePositions?: Record<string, { x: number; y: number }>;
   selectedNodeId?: string | null;
   expandedTermIds?: Set<string>;
+  glossaries: Glossary[];
   glossaryColorMap: Record<string, string>;
   dataSignature?: string;
   explorationMode?: ExplorationMode;
@@ -208,6 +209,7 @@ export interface BuildGraphDataProps {
   expandedTermIds?: Set<string>;
   clickedEdgeId: string | null;
   nodePositions?: Record<string, { x: number; y: number }>;
+  glossaries: Glossary[];
   glossaryColorMap: Record<string, string>;
   layoutType: LayoutEngineType;
   hierarchyCombos?: HierarchyComboInfo[];

openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyExplorer.tsx

@@ -243,6 +243,7 @@ const OntologyExplorer: React.FC<OntologyExplorerProps> = ({
                 ? selectedNode?.id ?? entityId
                 : entityId
             }
+            glossaries={glossaries}
             glossaryColorMap={glossaryColorMap}
             graphSearchHighlight={graphSearchHighlight}
             hierarchyCombos={

openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/OntologyGraphG6.tsx

@@ -61,6 +61,7 @@ const OntologyGraph = forwardRef<OntologyGraphHandle, OntologyGraphProps>(
       settings,
       selectedNodeId,
       expandedTermIds,
+      glossaries,
       glossaryColorMap,
       dataSignature = '',
       explorationMode = 'model',
@@ -99,6 +100,7 @@ const OntologyGraph = forwardRef<OntologyGraphHandle, OntologyGraphProps>(
       selectedNodeId: selectedNodeId ?? null,
       expandedTermIds,
       clickedEdgeId,
+      glossaries,
       glossaryColorMap,
       hierarchyCombos: hierarchyCombos ?? [],
       graphSearchHighlight,

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(() => {

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({});
       }
     },

openmetadata-ui/src/main/resources/ui/src/components/OntologyExplorer/utils/graphBuilders.ts

@@ -200,14 +200,16 @@ 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,
       type: hasRelations ? 'glossaryTerm' : 'glossaryTermIsolated',
       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,
     });