temp [ci skip]

benfdking · benfdking · commit 4a033d415e0c · 2025-05-08T16:40:59.000+02:00
diff --git a/vscode/extension/src/utilities/isDev.ts b/vscode/extension/src/utilities/isDev.ts
@@ -2,6 +2,5 @@
  * Determines if the extension is running in production mode.
  */
 export function isProduction(): boolean {
-  console.log('NODE_ENV', process.env.NODE_ENV)
   return process.env.NODE_ENV === 'production'
 }
diff --git a/vscode/extension/src/webviews/lineagePanel.ts b/vscode/extension/src/webviews/lineagePanel.ts
@@ -31,12 +31,6 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
 
     window.onDidChangeActiveTextEditor(editor => {
       if (editor) {
-        console.log(
-          'sending message to web view',
-          editor.document.uri.fsPath,
-          'panel is present',
-          this.panel?.webview,
-        )
         this.panel?.webview.postMessage({
           key: 'vscode_send',
           payload: {
@@ -64,7 +58,6 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
     // Set up message listener for events from the iframe
     webviewView.webview.onDidReceiveMessage(
       async message => {
-        console.log('message received in vscode', message)
         if (!message) {
           return
         }
@@ -77,7 +70,6 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
             // Handle callback events from the iframe
             switch (payload.key) {
               case 'openFile': {
-                console.log('opening file ', payload.payload.path)
                 const workspaceFolders = getWorkspaceFolders()
                 if (workspaceFolders.length != 1) {
                   throw new Error('Only one workspace folder is supported')
@@ -87,7 +79,6 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
                   workspaceFolder.uri,
                   payload.payload.path,
                 )
-                console.log('fullPath', fullPath)
                 const document = await workspace.openTextDocument(fullPath)
                 await window.showTextDocument(document)
                 break
@@ -96,7 +87,7 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
                 throw new Error('queryRequest is not supported')
               }
               default: {
-                console.log(
+                console.error(
                   'Unhandled message type under vscode_callback: ',
                   message,
                 )
@@ -105,28 +96,24 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
             break
           }
           case 'queryRequest': {
-            console.log('queryRequest', message.payload)
             const payload = message.payload
             const requestId = message.payload.requestId
             const response = await this.lsp.call_custom_method(
               'sqlmesh/api',
               payload,
             )
-            console.log(
-              'response from lsp',
-              response,
-              'with requestId',
-              requestId,
-            )
-            webviewView.webview.postMessage({
+             webviewView.webview.postMessage({
               key: 'query_response',
               payload: response,
               requestId,
             })
             break
           }
           default:
-            console.log('Unhandled message type under queryRequest: ', message)
+            console.error(
+              'Unhandled message type under queryRequest: ',
+              message,
+            )
         }
       },
       undefined,
@@ -181,7 +168,6 @@ export class LineagePanel implements WebviewViewProvider, Disposable {
 
     // Listen for messages from the extension
     window.addEventListener('message', (event) => {
-      console.log("message received in web view", event);
       // Only handle messages that are from the extension
       if (event.data && event.data.key === 'vscode_send' || event.data.key === 'query_response') {
         const iframe = document.querySelector('iframe');
diff --git a/vscode/react/src/api/instance.ts b/vscode/react/src/api/instance.ts
@@ -1,5 +1,5 @@
-import { IS_PRODUCTION } from '@/utilsutils/isProduction'
-import { getVSCodeAPI } from '@/utilsutils/vscodeapi'
+import { sendVSCodeMessage } from '@/hooks/vscode'
+import { isErr } from '@bus/result'
 
 declare global {
   interface Window {
@@ -34,22 +34,9 @@ interface FetchOptions<B extends object = any> {
   params?: Record<string, string | number | boolean | undefined | null>
 }
 
-/**
- * A result is a value that can be either an ok or an error
- */
-export type Result<T, E> = { ok: true; value: T } | { ok: false; error: E }
-
-/**
- * returns true if the result is an error
- */
-export const isErr = <T, E>(
-  result: Result<T, E>,
-): result is { ok: false; error: E } => {
-  return !result.ok
-}
-
-async function fetchAPIDevelopment<T = any, B extends object = any>(
+export async function fetchAPI<T = any, B extends object = any>(
   config: FetchOptions<B>,
+  _options?: Partial<FetchOptionsWithSignal>,
 ): Promise<T & ResponseWithDetail> {
   // Generate a unique ID for this request
   // Create a promise that will resolve when we get a response with matching ID
@@ -77,73 +64,12 @@ async function fetchAPIDevelopment<T = any, B extends object = any>(
     // Add the listener
     window.addEventListener('message', messageHandler)
 
-    // If we're in an iframe, we need to post the message to the parent window
-    if (window.parent !== window) {
-      window.parent.postMessage(
-        {
-          key: 'queryRequest',
-          payload: {
-            requestId,
-            url: config.url,
-            params: config.params as any,
-            data: config.data,
-            method: config.method,
-          },
-        },
-        '*',
-      )
-      return
-    }
-
-    // Set a timeout to prevent hanging promises
-    setTimeout(() => {
-      window.removeEventListener('message', messageHandler)
-      reject(new Error('Query request timed out'))
-    }, 30000) // 30 second timeout
-  })
-}
-
-export async function fetchAPIProduction<T = any, B extends object = any>(
-  config: FetchOptions<B>,
-): Promise<T & ResponseWithDetail> {
-  // Generate a unique ID for this request
-  const requestId = `query_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`
-  // Create a promise that will resolve when we get a response with matching ID
-  return new Promise((resolve, reject) => {
-    // Set up listener for the response
-    const messageHandler = (event: MessageEvent) => {
-      if (
-        event.data &&
-        event.data.key === 'query_response' &&
-        event.data.payload &&
-        event.data.payload.requestId === requestId
-      ) {
-        // Remove the listener once we get our response
-        window.removeEventListener('message', messageHandler)
-
-        if (event.data.payload.error) {
-          reject(new Error(event.data.payload.error))
-        } else {
-          resolve(event.data.payload.data)
-        }
-      }
-    }
-
-    // Add the listener
-    window.addEventListener('message', messageHandler)
-    console.log('added listener to window')
-
-    // Send the message to VSCode with the query parameters and request ID
-    // @ts-ignore
-    const vscode = getVSCodeAPI()
-    vscode.postMessage({
-      key: 'query_request',
-      payload: {
-        requestId,
-        queryKey: config.url,
-        // @ts-ignore
-        queryParams: config.params as any,
-      },
+    sendVSCodeMessage('queryRequest', {
+      requestId,
+      url: config.url,
+      params: config.params as any,
+      data: config.data,
+      method: config.method,
     })
 
     // Set a timeout to prevent hanging promises
@@ -153,13 +79,3 @@ export async function fetchAPIProduction<T = any, B extends object = any>(
     }, 30000) // 30 second timeout
   })
 }
-
-export function fetchAPI<T = any, B extends object = any>(
-  config: FetchOptions<B>,
-  _options?: Partial<FetchOptionsWithSignal>,
-): Promise<T & ResponseWithDetail> {
-  if (IS_PRODUCTION) {
-    return fetchAPIProduction(config)
-  }
-  return fetchAPIDevelopment(config)
-}
diff --git a/vscode/react/src/components/graph/ModelLineage.tsx b/vscode/react/src/components/graph/ModelLineage.tsx
@@ -77,7 +77,6 @@ export function ModelLineage({
   const { refetch: getModelLineage, isFetching: isFetchingModelLineage } =
     useApiModelLineage(model.name)
   const { isFetching: isFetchingModels } = useApiModels()
-  console.log('isfetchingmodels models', isFetchingModels)
 
   const [isMegringModels, setIsMergingModels] = useState(false)
   const [modelLineage, setModelLineage] = useState<
diff --git a/vscode/react/src/hooks/vscode.ts b/vscode/react/src/hooks/vscode.ts
@@ -1,28 +1,30 @@
+import { getVSCodeAPI } from '@/utilsutils/vscodeapi'
 import type { Callback } from '@bus/callbacks'
 
+/**
+ * use this hook to send messages to the vscode extension
+ *
+ * when deving the extension, we use an iframe to load the react app
+ * so we need to send messages to the parent window
+ */
 export const useVSCode = (): (<K extends keyof Callback>(
   callbackName: K,
   payload: Callback[K],
 ) => void) => {
-  return (callbackName, payload) => {
-    // Check if we're in an iframe, if so, we are in a webview
-    const isIframe = window !== window.parent
+  return sendVSCodeMessage
+}
 
-    if (isIframe) {
-      // Use a different variable name to avoid conflict with the parameter
-      const eventPayload = {
-        key: callbackName,
-        payload: payload,
-      }
-      window.parent.postMessage(
-        {
-          key: 'vscode_callback',
-          payload: eventPayload,
-        },
-        '*',
-      )
-    } else {
-      console.log('vscode callback', callbackName, payload)
-    }
+export const sendVSCodeMessage = (
+  callbackName: string,
+  payload: any,
+): void => {
+  const eventPayload = {
+    key: callbackName,
+    payload: payload,
+  }
+  if (window !== window.parent) {
+    window.parent.postMessage(eventPayload, '*')
+  } else {
+    getVSCodeAPI().postMessage(eventPayload)
   }
 }
diff --git a/vscode/react/src/pages/lineage.tsx b/vscode/react/src/pages/lineage.tsx
@@ -5,7 +5,7 @@ import {
   QueryClientProvider,
 } from '@tanstack/react-query'
 import { useApiModels } from '@/api'
-import LineageFlowProvider, { useLineageFlow } from '@/components/graph/context'
+import LineageFlowProvider from '@/components/graph/context'
 import { ModelLineage } from '@/components/graph/ModelLineage'
 import { useVSCode } from '@/hooks/vscode'
 import React from 'react'
@@ -63,11 +63,9 @@ function Lineage() {
   if (isLoadingModels || models === undefined) {
     return <div>Loading models...</div>
   }
-  console.log('models', models)
   if (!Array.isArray(models)) {
     return <div>Error: Models data is not in the expected format</div>
   }
-  console.log('models', models)
   const modelsRecord = models.reduce(
     (acc, model) => {
       acc[model.name] = model

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,5 @@`
`2`	`2`	`* Determines if the extension is running in production mode.`
`3`	`3`	`*/`
`4`	`4`	`export function isProduction(): boolean {`
`5`		`- console.log('NODE_ENV', process.env.NODE_ENV)`
`6`	`5`	`return process.env.NODE_ENV === 'production'`
`7`	`6`	`}`