Skip to content

Commit 126cc79

Browse files
committed
temp [ci skip]
1 parent a2fce97 commit 126cc79

11 files changed

Lines changed: 202 additions & 184 deletions

File tree

vscode/extension/src/webviews/lineagePanel.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
9494
await window.showTextDocument(document)
9595
break
9696
}
97+
case 'queryRequest': {
98+
throw new Error('queryRequest is not supported')
99+
}
97100
default: {
98101
console.log('Unhandled message type under vscode_callback: ', message)
99102
}

vscode/react/src/components/graph/ModelColumns.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -645,18 +645,18 @@ function ColumnStatus({
645645
}
646646

647647
function ColumnSource({
648-
source,
648+
// source,
649649
expression,
650650
}: {
651651
source: LineageColumnSource
652652
expression?: LineageColumnExpression
653653
}): JSX.Element {
654654
const elSourceContainer = useRef<HTMLDivElement>(null)
655-
const { handleClickModel } = useLineageFlow()
655+
// const { handleClickModel } = useLineageFlow()
656656

657-
const modelExtensions = useSQLMeshModelExtensions(undefined, model => {
658-
handleClickModel?.(model.name)
659-
})
657+
// const modelExtensions = useSQLMeshModelExtensions(undefined, model => {
658+
// handleClickModel?.(model.name)
659+
// })
660660

661661
const [isShowing, setIsShowing] = useState(false)
662662

vscode/react/src/components/graph/ModelLineage.tsx

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ export function ModelLineage({
141141
}
142142
})
143143

144+
// @ts-ignore
144145
setUnknownModels(new Set(unknownModels))
145146
}, [modelLineage, models])
146147

@@ -407,15 +408,15 @@ function ModelColumnLineage(): JSX.Element {
407408
function GraphControls({ nodes = [] }: { nodes: Node[] }): JSX.Element {
408409
const {
409410
withColumns,
410-
mainNode,
411+
// mainNode,
411412
selectedNodes,
412413
withConnected,
413414
withImpacted,
414415
withSecondary,
415416
hasBackground,
416417
activeNodes,
417-
highlightedNodes,
418-
setSelectedNodes,
418+
// highlightedNodes,
419+
// setSelectedNodes,
419420
setWithColumns,
420421
setWithConnected,
421422
setWithImpacted,
@@ -432,25 +433,24 @@ function GraphControls({ nodes = [] }: { nodes: Node[] }): JSX.Element {
432433

433434
const lineageInfoTrigger = useRef<HTMLButtonElement>(null)
434435

435-
const highlightedNodeModels = useMemo(
436-
() => Object.values(highlightedNodes ?? {}).flat(),
437-
[highlightedNodes],
438-
)
439-
440-
function handleSelect(model: { name: string; description: string }): void {
441-
if (highlightedNodeModels.includes(model.name) || mainNode === model.name)
442-
return
443-
444-
setSelectedNodes(current => {
445-
if (current.has(model.name)) {
446-
current.delete(model.name)
447-
} else {
448-
current.add(model.name)
449-
}
450-
451-
return new Set(current)
452-
})
453-
}
436+
// const highlightedNodeModels = useMemo(
437+
// () => Object.values(highlightedNodes ?? {}).flat(),
438+
// [highlightedNodes],
439+
// )
440+
// function handleSelect(model: { name: string; description: string }): void {
441+
// if (highlightedNodeModels.includes(model.name) || mainNode === model.name)
442+
// return
443+
444+
// setSelectedNodes(current => {
445+
// if (current.has(model.name)) {
446+
// current.delete(model.name)
447+
// } else {
448+
// current.add(model.name)
449+
// }
450+
451+
// return new Set(current)
452+
// })
453+
// }
454454

455455
return (
456456
<div className="px-2 flex items-center text-xs text-neutral-400 @container">

vscode/react/src/components/graph/ModelNode.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { isNil, isArrayNotEmpty, isNotNil, toID, isFalse } from '@/utils/index'
1+
import { isNil, isArrayNotEmpty, isNotNil, isFalse } from '@/utils/index'
22
import clsx from 'clsx'
33
import { useMemo, useCallback, useState } from 'react'
44
import { ModelType } from '@/api/client'
@@ -31,7 +31,7 @@ export default function ModelNode({
3131
}: NodeProps): JSX.Element {
3232
const nodeData: GraphNodeData = data ?? {}
3333
const {
34-
connections,
34+
// connections,
3535
models,
3636
handleClickModel,
3737
lineage,
@@ -55,7 +55,7 @@ export default function ModelNode({
5555
const modelColumns = model?.columns ?? []
5656

5757
Object.keys(lineage[decodedId]?.columns ?? {}).forEach((column: string) => {
58-
const found = modelColumns.find(({ name }) => {
58+
const found = modelColumns.find(({ name }: any) => {
5959
try {
6060
return name === decodeURI(column)
6161
} catch {
@@ -68,7 +68,7 @@ export default function ModelNode({
6868
}
6969
})
7070

71-
modelColumns.forEach(column => {
71+
modelColumns.forEach((column: any) => {
7272
let columnType = column.type ?? EnumColumnType.UNKNOWN
7373

7474
if (columnType.startsWith(EnumColumnType.STRUCT)) {
@@ -118,9 +118,9 @@ export default function ModelNode({
118118
)
119119

120120
const splat = highlightedNodes['*']
121-
const hasSelectedColumns = columns.some(({ name }) =>
122-
connections.get(toID(id, name)),
123-
)
121+
// const hasSelectedColumns = columns.some(({ name }) =>
122+
// connections.get(toID(id, name)),
123+
// )
124124
const hasHighlightedNodes = Object.keys(highlightedNodes).length > 0
125125
const highlighted = Object.keys(highlightedNodes).find(key =>
126126
highlightedNodes[key]!.includes(id),

vscode/react/src/components/graph/context.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ export default function LineageFlowProvider({
162162
() =>
163163
getNodeMap({
164164
lineage,
165+
// @ts-ignore
165166
models,
166167
unknownModels,
167168
withColumns,

vscode/react/src/components/graph/help.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ function getEdges(lineage: Record<string, Lineage> = {}): Edge[] {
102102

103103
for (const targetModelName of modelNames) {
104104
const targetModel = lineage[targetModelName]!
105-
105+
106+
// @ts-ignore
106107
targetModel.models.forEach(sourceModelName => {
107108
outputEdges.push(createGraphEdge(sourceModelName, targetModelName))
108109
})
@@ -172,6 +173,7 @@ function getNodeMap({
172173
const modelNames = Object.keys(lineage)
173174

174175
return modelNames.reduce((acc: Record<string, Node>, modelName: string) => {
176+
// @ts-ignore
175177
const model = models[modelName]
176178
const node = createGraphNode(modelName, {
177179
label: model?.displayName ?? modelName,
@@ -187,6 +189,7 @@ function getNodeMap({
187189
: EnumLineageNodeModelType.cte,
188190
})
189191
const columnsCount = withColumns
192+
// @ts-ignore
190193
? (models[modelName]?.columns?.length ?? 0)
191194
: 0
192195

@@ -216,6 +219,7 @@ function getNodeMap({
216219

217220
function getNodeMaxWidth(label: string, hasColumns: boolean = false): number {
218221
const defaultWidth = label.length * CHAR_WIDTH
222+
// @ts-ignore
219223
const columns = models[label]?.columns ?? []
220224

221225
return hasColumns
@@ -366,6 +370,7 @@ function mergeLineageWithColumns(
366370
newLineageModelColumnModel,
367371
),
368372
),
373+
// @ts-ignore
369374
).map(encodeURI)
370375
}
371376
}
@@ -472,6 +477,7 @@ function getLineageIndex(lineage: Record<string, Lineage> = {}): string {
472477
const { models = [], columns = {} } = lineage[key]!
473478
const allModels = new Set<string>()
474479

480+
// @ts-ignore
475481
models.forEach(m => allModels.add(m))
476482

477483
if (isNotNil(columns)) {
@@ -692,7 +698,7 @@ function getUpdatedNodes(
692698

693699
function hasActiveEdge(
694700
activeEdges: ActiveEdges = new Map(),
695-
[leftConnect, rightConnect]: [Maybe<string>, Maybe<string>],
701+
[leftConnect, rightConnect]: [string | undefined | null, string | undefined | null],
696702
): boolean {
697703
if (isNil(leftConnect) && isNil(rightConnect)) return false
698704

vscode/react/src/pages/lineage.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import LineageFlowProvider, { useLineageFlow } from '@/components/graph/context'
99
import { ModelLineage } from '@/components/graph/ModelLineage'
1010
import { useVSCode } from '@/hooks/vscode'
1111
import React from 'react'
12+
import { ModelSQLMeshModel } from '@/domain/sqlmesh-model'
1213

1314
export function LineagePage() {
1415
// Handle messages from VSCode extension
@@ -104,6 +105,9 @@ export function LineageComponentFromWeb({
104105
return <div>Error: Model not found</div>
105106
}
106107

108+
const sqlmModel = new ModelSQLMeshModel()
109+
sqlmModel.update(model)
110+
107111
return (
108112
<div className="h-[100vh] w-[100vw]">
109113
<LineageFlowProvider
@@ -113,7 +117,7 @@ export function LineageComponentFromWeb({
113117
models={models}
114118
showControls={false}
115119
> <UpdateLineageFocus>
116-
<ModelLineage model={model} />
120+
<ModelLineage model={sqlmModel} />
117121
</UpdateLineageFocus>
118122
</LineageFlowProvider>
119123
</div>

vscode/react/src/utils/additional-components.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @ts-nocheck
12
import React from 'react'
23
import { createComponent } from '@lit/react'
34

web/client/src/library/components/fileExplorer/Directory.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ const Directory = function Directory({
243243
e.stopPropagation()
244244

245245
if (activeRange.length > 1 && inActiveRange(directory)) {
246-
;(activeRange as ModelDirectory[]).forEach(artifact => {
246+
(activeRange as ModelDirectory[]).forEach(artifact => {
247247
if (shouldClose) {
248248
artifact.collapse()
249249
} else if (shouldOpen) {

web/client/src/main.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ export interface PropsComponent extends HTMLAttributes<HTMLElement> {}
2020
const client = new QueryClient({
2121
queryCache: new QueryCache({
2222
onError(error, query) {
23-
;(query.meta as ApiQueryMeta).onError(error as ErrorIDE)
23+
(query.meta as ApiQueryMeta).onError(error as ErrorIDE)
2424
},
2525
onSuccess(_, query) {
26-
;(query.meta as ApiQueryMeta).onSuccess()
26+
(query.meta as ApiQueryMeta).onSuccess()
2727
},
2828
}),
2929
defaultOptions: {

0 commit comments

Comments
 (0)