Skip to content

Commit 26bba97

Browse files
authored
fix(web_common): adjust types in lineage component (#5476)
1 parent cbab32c commit 26bba97

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

web/common/src/components/Lineage/help.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ export function getOnlySelectedNodes<
2323
TNodeData extends LineageNodeData = LineageNodeData,
2424
TNodeID extends string = NodeId,
2525
>(nodeMaps: LineageNodesMap<TNodeData, TNodeID>, selectedNodes: Set<TNodeID>) {
26-
return (Object.values(nodeMaps) as LineageNode<TNodeData, TNodeID>[]).reduce(
26+
return (
27+
Object.values(nodeMaps) satisfies LineageNode<TNodeData, TNodeID>[]
28+
).reduce(
2729
(acc, node) =>
2830
selectedNodes.has(node.id) ? { ...acc, [node.id]: node } : acc,
2931
{} as LineageNodesMap<TNodeData, TNodeID>,

web/common/src/components/Lineage/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export * from './node/useNodeMetadata'
2121
export * from './edge/EdgeWithGradient'
2222
export * from './edge/FactoryEdgeWithGradient'
2323
export * from './layout/dagreLayout'
24+
export * from './layout/help'
2425
export * from './LineageColumnLevel/ColumnLevelLineageContext'
2526
export * from './LineageColumnLevel/FactoryColumn'
2627
export * from './LineageColumnLevel/useColumns'

web/common/src/components/Lineage/stories/ModelNode.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ export const ModelNode = React.memo(function ModelNode({
254254
className="p-1 first:border-t-0 h-6"
255255
columnLineageData={
256256
(
257-
column as Column & {
257+
column satisfies Column & {
258258
columnLineageData?: ColumnLevelLineageAdjacencyList<
259259
ModelNameType,
260260
ColumnName
@@ -287,7 +287,7 @@ export const ModelNode = React.memo(function ModelNode({
287287
className="p-1 border-t border-lineage-divider first:border-t-0 h-6"
288288
columnLineageData={
289289
(
290-
column as Column & {
290+
column satisfies Column & {
291291
columnLineageData?: ColumnLevelLineageAdjacencyList<
292292
ModelNameType,
293293
ColumnName

web/common/src/components/Lineage/stories/dagreLayout.worker.ts

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,37 @@ import {
22
type LayoutedGraph,
33
type LineageEdgeData,
44
type LineageNodeData,
5+
type EdgeId,
6+
type NodeId,
7+
type PortId,
58
} from '../utils'
69
import { buildLayout } from '../layout/dagreLayout'
710

811
self.onmessage = <
912
TNodeData extends LineageNodeData = LineageNodeData,
1013
TEdgeData extends LineageEdgeData = LineageEdgeData,
14+
TNodeID extends string = NodeId,
15+
TEdgeID extends string = EdgeId,
16+
TPortID extends string = PortId,
1117
>(
12-
event: MessageEvent<LayoutedGraph<TNodeData, TEdgeData>>,
18+
event: MessageEvent<
19+
LayoutedGraph<TNodeData, TEdgeData, TNodeID, TEdgeID, TPortID>
20+
>,
1321
) => {
1422
try {
15-
const { edges, nodesMap } = buildLayout(event.data)
23+
const { edges, nodesMap } = buildLayout<
24+
TNodeData,
25+
TEdgeData,
26+
TNodeID,
27+
TEdgeID,
28+
TPortID
29+
>(event.data)
1630

1731
self.postMessage({
1832
edges,
1933
nodesMap,
20-
} as LayoutedGraph<TNodeData, TEdgeData>)
21-
} catch (outerError) {
22-
self.postMessage({ error: outerError } as { error: ErrorEvent })
34+
} satisfies LayoutedGraph<TNodeData, TEdgeData, TNodeID, TEdgeID, TPortID>)
35+
} catch (error) {
36+
self.postMessage({ error })
2337
}
2438
}

0 commit comments

Comments
 (0)