Skip to content

fix(web_common): add more generic type for cll components #5505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mykalmax merged 2 commits into from
Oct 8, 2025
Merged

fix(web_common): add more generic type for cll components #5505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40254df
add more generic types and fix satories
mykalmax Oct 7, 2025
3853a85
celan up
mykalmax Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 19 additions & 26 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions web/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"@testing-library/react": "16.3.0",
"@testing-library/user-event": "14.6.1",
"@types/dagre": "0.7.53",
"@types/lodash": "4.17.20",
"@types/node": "20.11.25",
"@types/react": "18.3.23",
"@types/react-dom": "18.3.7",
Expand All @@ -34,7 +33,6 @@
"eslint-plugin-storybook": "9.1.5",
"fuse.js": "7.1.0",
"globals": "16.3.0",
"lodash": "4.17.21",
"lucide-react": "0.542.0",
"playwright": "1.54.1",
"postcss": "8.5.6",
Expand Down Expand Up @@ -95,7 +93,6 @@
"dagre": "0.8.5",
"deepmerge": "4.3.1",
"fuse.js": "7.1.0",
"lodash": "4.17.21",
"lucide-react": "0.542.0",
"react": "18.3.1",
"react-dom": "18.3.1",
Expand Down
91 changes: 36 additions & 55 deletions web/common/src/components/Lineage/LineageColumnLevel/ColumnLevelLineageContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,64 +2,36 @@ import React from 'react'

import { type PortId } from '../utils'

export type LineageColumn = {
source?: string | null
expression?: string | null
models: Record<string, string[]>
}

export type ColumnLevelModelConnections<
TAdjacencyListKey extends string,
TAdjacencyListColumnKey extends string,
> = Record<TAdjacencyListKey, TAdjacencyListColumnKey[]>
export type ColumnLevelDetails<
TAdjacencyListKey extends string,
TAdjacencyListColumnKey extends string,
> = Omit<LineageColumn, 'models'> & {
models: ColumnLevelModelConnections<
TAdjacencyListKey,
TAdjacencyListColumnKey
>
}
export type ColumnLevelConnections<
TAdjacencyListKey extends string,
TAdjacencyListColumnKey extends string,
> = Record<
TAdjacencyListColumnKey,
ColumnLevelDetails<TAdjacencyListKey, TAdjacencyListColumnKey>
>
export type ColumnLevelLineageAdjacencyList<
TAdjacencyListKey extends string,
TAdjacencyListColumnKey extends string,
> = Record<
TAdjacencyListKey,
ColumnLevelConnections<TAdjacencyListKey, TAdjacencyListColumnKey>
>
> = {
[K in TAdjacencyListKey]: {
[C in TAdjacencyListColumnKey]: {
source?: string | null
expression?: string | null
models: Record<TAdjacencyListKey, TAdjacencyListColumnKey[]>
}
}
}

export type ColumnLevelLineageContextValue<
TAdjacencyListKey extends string,
TAdjacencyListColumnKey extends string,
TColumnID extends string = PortId,
> = {
adjacencyListColumnLevel: ColumnLevelLineageAdjacencyList<
TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
>
> = ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
>,
> = {
adjacencyListColumnLevel: TColumnLevelLineageAdjacencyList
selectedColumns: Set<TColumnID>
columnLevelLineage: Map<
TColumnID,
ColumnLevelLineageAdjacencyList<TAdjacencyListKey, TAdjacencyListColumnKey>
>
columnLevelLineage: Map<TColumnID, TColumnLevelLineageAdjacencyList>
setColumnLevelLineage: React.Dispatch<
React.SetStateAction<
Map<
TColumnID,
ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
>
>
>
React.SetStateAction<Map<TColumnID, TColumnLevelLineageAdjacencyList>>
>
showColumns: boolean
setShowColumns: React.Dispatch<React.SetStateAction<boolean>>
Expand All @@ -71,16 +43,17 @@ export function getColumnLevelLineageContextInitial<
TAdjacencyListKey extends string,
TAdjacencyListColumnKey extends string,
TColumnID extends string = PortId,
TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
> = ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
>,
>() {
return {
adjacencyListColumnLevel: {},
columnLevelLineage: new Map<
TColumnID,
ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
>
>(),
adjacencyListColumnLevel: {} as TColumnLevelLineageAdjacencyList,
columnLevelLineage: new Map<TColumnID, TColumnLevelLineageAdjacencyList>(),
setColumnLevelLineage: () => {},
showColumns: false,
setShowColumns: () => {},
Expand All @@ -94,8 +67,16 @@ export type ColumnLevelLineageContextHook<
TAdjacencyListKey extends string,
TAdjacencyListColumnKey extends string,
TColumnID extends string = PortId,
TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
> = ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
>,
> = () => ColumnLevelLineageContextValue<
TAdjacencyListKey,
TAdjacencyListColumnKey,
TColumnID
TColumnID,
TColumnLevelLineageAdjacencyList
>
21 changes: 14 additions & 7 deletions web/common/src/components/Lineage/LineageColumnLevel/FactoryColumn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import React from 'react'
import { cn } from '@/utils'
import { NodeBadge } from '../node/NodeBadge'
import { NodePort } from '../node/NodePort'
import { type NodeId, type PortId } from '../utils'
import { type NodeId, type PortHandleId, type PortId } from '../utils'
import {
type ColumnLevelLineageAdjacencyList,
type ColumnLevelLineageContextHook,
Expand All @@ -28,11 +28,21 @@ export function FactoryColumn<
TAdjacencyListColumnKey extends string,
TNodeID extends string = NodeId,
TColumnID extends string = PortId,
TLeftPortHandleId extends string = PortHandleId,
TRightPortHandleId extends string = PortHandleId,
TColumnLevelLineageAdjacencyList extends ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
> = ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
>,
>(
useLineage: ColumnLevelLineageContextHook<
TAdjacencyListKey,
TAdjacencyListColumnKey,
TColumnID
TColumnID,
TColumnLevelLineageAdjacencyList
>,
) {
return React.memo(function FactoryColumn({
Expand All @@ -59,10 +69,7 @@ export function FactoryColumn<
type: string
description?: string | null
className?: string
data?: ColumnLevelLineageAdjacencyList<
TAdjacencyListKey,
TAdjacencyListColumnKey
>
data?: TColumnLevelLineageAdjacencyList
isFetching?: boolean
error?: Error | null
renderError?: (error: Error) => React.ReactNode
Expand Down Expand Up @@ -248,7 +255,7 @@ export function FactoryColumn<
}

return isSelectedColumn ? (
<NodePort
<NodePort<TColumnID, TNodeID, TLeftPortHandleId, TRightPortHandleId>
id={id}
nodeId={nodeId}
className={cn(
Expand Down
Loading