Skip to content

Commit a3271ad

Browse files
committed
fix cll sytyling for source/expressions
1 parent ded7218 commit a3271ad

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

web/common/src/components/Lineage/LineageColumnLevel/FactoryColumn.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ export function FactoryColumn<
6565
error?: Error | null
6666
renderError?: (error: Error) => React.ReactNode
6767
renderExpression?: (expression: string) => React.ReactNode
68-
renderSource?: (source: string) => React.ReactNode
68+
renderSource?: (
69+
source: string,
70+
expression?: string | null,
71+
) => React.ReactNode
6972
onClick?: () => void
7073
onCancel?: () => void
7174
}) {
@@ -155,7 +158,7 @@ export function FactoryColumn<
155158
className="p-0 min-w-[30rem] max-w-xl bg-lineage-model-column-source-background"
156159
delayDuration={0}
157160
>
158-
{renderSource(column.source)}
161+
{renderSource(column.source, column.expression)}
159162
</Tooltip>
160163
)}
161164
{column?.expression && renderExpression && (

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,7 @@ export function getTransformedNodes<
3838
>(
3939
adjacencyListKeys: TAdjacencyListKey[],
4040
lineageDetails: LineageDetails<TAdjacencyListKey, TDetailsNode>,
41-
transformNode: TransformNodeFn<
42-
TDetailsNode,
43-
TNodeData,
44-
TAdjacencyListKey,
45-
TNodeID
46-
>,
41+
transformNode: TransformNodeFn<TDetailsNode, TNodeData, TNodeID>,
4742
): LineageNodesMap<TNodeData, TNodeID> {
4843
const nodesCount = adjacencyListKeys.length
4944
const nodesMap: LineageNodesMap<TNodeData, TNodeID> = Object.create(null)
@@ -53,7 +48,6 @@ export function getTransformedNodes<
5348
const encodedNodeId = toNodeID<TNodeID>(adjacencyListKey)
5449
nodesMap[encodedNodeId] = transformNode(
5550
encodedNodeId,
56-
adjacencyListKey,
5751
lineageDetails[adjacencyListKey],
5852
)
5953
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export const ModelLineage = ({
120120
}, [adjacencyListKeysColumnLevel, adjacencyList])
121121

122122
const transformNode = React.useCallback(
123-
(nodeId: ModelNodeId, _: ModelName, detail: ModelLineageNodeDetails) => {
123+
(nodeId: ModelNodeId, detail: ModelLineageNodeDetails) => {
124124
const columns = detail.columns
125125

126126
const node = createNode('node', nodeId, {

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,8 @@ export type PathType = 'bezier' | 'smoothstep' | 'step' | 'straight'
5555
export type TransformNodeFn<
5656
TData,
5757
TNodeData extends LineageNodeData = LineageNodeData,
58-
TAdjacencyListKey extends string = string,
5958
TNodeID extends string = NodeId,
60-
> = (
61-
nodeId: TNodeID,
62-
adjacencyListKey: TAdjacencyListKey,
63-
data: TData,
64-
) => LineageNode<TNodeData, TNodeID>
59+
> = (nodeId: TNodeID, data: TData) => LineageNode<TNodeData, TNodeID>
6560

6661
export type TransformEdgeFn<
6762
TEdgeData extends LineageEdgeData = LineageEdgeData,

0 commit comments

Comments
 (0)