@@ -26,7 +26,6 @@ import {AssetEdges} from './AssetEdges';
2626import { AssetGraphBackgroundContextMenu } from './AssetGraphBackgroundContextMenu' ;
2727import { AssetGraphJobSidebar } from './AssetGraphJobSidebar' ;
2828import { AssetNode , AssetNodeContextMenuWrapper , AssetNodeMinimal } from './AssetNode' ;
29- import { AssetNode2025 } from './AssetNode2025' ;
3029import { AssetNodeFacetSettingsButton } from './AssetNodeFacetSettingsButton' ;
3130import { useSavedAssetNodeFacets } from './AssetNodeFacets' ;
3231import { AssetNodeMenuProps } from './AssetNodeMenu' ;
@@ -79,11 +78,8 @@ import {LoadingSpinner} from '../ui/Loading';
7978import { isIframe } from '../util/isIframe' ;
8079import { AssetGraphExplorerSidebar } from './sidebar/Sidebar' ;
8180import { AssetGraphQueryItem } from './types' ;
82- import { WorkspaceAssetFragment } from '../workspace/WorkspaceContext/types/WorkspaceQueries.types' ;
8381import { buildRepoPathForHuman } from '../workspace/buildRepoAddress' ;
8482
85- type AssetNode = WorkspaceAssetFragment ;
86-
8783type Props = {
8884 options : GraphExplorerOptions ;
8985 setOptions ?: ( options : GraphExplorerOptions ) => void ;
@@ -196,7 +192,7 @@ const AssetGraphExplorerWithData = ({
196192 const [ direction , setDirection ] = useLayoutDirectionState ( ) ;
197193 const [ facets , setFacets ] = useSavedAssetNodeFacets ( ) ;
198194
199- const { flagAssetNodeFacets , flagAssetGraphGroupsPerCodeLocation} = useFeatureFlags ( ) ;
195+ const { flagAssetGraphGroupsPerCodeLocation} = useFeatureFlags ( ) ;
200196
201197 const [ expandedGroups , setExpandedGroups ] = useQueryAndLocalStoragePersistedState < string [ ] > ( {
202198 localStorageKey : `asset-graph-open-graph-nodes-${ viewType } -${ explorerPath . pipelineName } ` ,
@@ -222,9 +218,9 @@ const AssetGraphExplorerWithData = ({
222218 ( ) => ( {
223219 direction,
224220 flagAssetGraphGroupsPerCodeLocation,
225- facets : flagAssetNodeFacets ? Array . from ( facets ) : false ,
221+ facets : Array . from ( facets ) ,
226222 } ) ,
227- [ direction , facets , flagAssetGraphGroupsPerCodeLocation , flagAssetNodeFacets ] ,
223+ [ direction , facets , flagAssetGraphGroupsPerCodeLocation ] ,
228224 ) ,
229225 dataLoading ,
230226 ) ;
@@ -492,9 +488,7 @@ const AssetGraphExplorerWithData = ({
492488 hideEdgesToNodesOutsideQuery = { fetchOptions . hideEdgesToNodesOutsideQuery }
493489 setHideEdgesToNodesOutsideQuery = { setHideEdgesToNodesOutsideQuery }
494490 />
495- { flagAssetNodeFacets ? (
496- < AssetNodeFacetSettingsButton value = { facets } onChange = { setFacets } />
497- ) : undefined }
491+ < AssetNodeFacetSettingsButton value = { facets } onChange = { setFacets } />
498492 </ >
499493 }
500494 onClick = { onClickBackground }
@@ -638,31 +632,23 @@ const AssetGraphExplorerWithData = ({
638632 >
639633 { ! graphNode ? (
640634 < AssetNodeLink assetKey = { { path} } />
641- ) : scale < MINIMAL_SCALE || ( flagAssetNodeFacets && facets . size === 0 ) ? (
635+ ) : scale < MINIMAL_SCALE || facets . size === 0 ? (
642636 < AssetNodeContextMenuWrapper { ...contextMenuProps } >
643637 < AssetNodeMinimal
644- facets = { flagAssetNodeFacets ? facets : null }
638+ facets = { facets }
645639 definition = { graphNode . definition }
646640 selected = { selectedGraphNodes . includes ( graphNode ) }
647641 height = { bounds . height }
648642 />
649643 </ AssetNodeContextMenuWrapper >
650644 ) : (
651645 < AssetNodeContextMenuWrapper { ...contextMenuProps } >
652- { flagAssetNodeFacets ? (
653- < AssetNode2025
654- facets = { facets }
655- definition = { graphNode . definition }
656- selected = { selectedGraphNodes . includes ( graphNode ) }
657- onChangeAssetSelection = { onChangeAssetSelection }
658- />
659- ) : (
660- < AssetNode
661- definition = { graphNode . definition }
662- selected = { selectedGraphNodes . includes ( graphNode ) }
663- onChangeAssetSelection = { onChangeAssetSelection }
664- />
665- ) }
646+ < AssetNode
647+ facets = { facets }
648+ definition = { graphNode . definition }
649+ selected = { selectedGraphNodes . includes ( graphNode ) }
650+ onChangeAssetSelection = { onChangeAssetSelection }
651+ />
666652 </ AssetNodeContextMenuWrapper >
667653 ) }
668654 </ foreignObject >
0 commit comments