refactor: use interface injection for IntegrationWebviewProvider

Author: jankuca

src/notebooks/deepnote/integrations/integrationManager.ts

@@ -4,8 +4,7 @@ import { commands, NotebookDocument, window, workspace } from 'vscode';
 import { IExtensionContext } from '../../../platform/common/types';
 import { Commands } from '../../../platform/common/constants';
 import { logger } from '../../../platform/logging';
-import { IntegrationWebviewProvider } from './integrationWebview';
-import { IIntegrationDetector, IIntegrationStorage } from './types';
+import { IIntegrationDetector, IIntegrationStorage, IIntegrationWebviewProvider } from './types';
 import { IntegrationStatus, IntegrationWithStatus } from './integrationTypes';
 import { BlockWithIntegration, scanBlocksForIntegrations } from './integrationUtils';
 
@@ -22,7 +21,7 @@ export class IntegrationManager {
         @inject(IExtensionContext) private readonly extensionContext: IExtensionContext,
         @inject(IIntegrationDetector) private readonly integrationDetector: IIntegrationDetector,
         @inject(IIntegrationStorage) private readonly integrationStorage: IIntegrationStorage,
-        @inject(IntegrationWebviewProvider) private readonly webviewProvider: IntegrationWebviewProvider
+        @inject(IIntegrationWebviewProvider) private readonly webviewProvider: IIntegrationWebviewProvider
     ) {}
 
     public activate(): void {

src/notebooks/deepnote/integrations/integrationWebview.ts

@@ -3,14 +3,14 @@ import { Disposable, ViewColumn, WebviewPanel, window } from 'vscode';
 
 import { IExtensionContext } from '../../../platform/common/types';
 import { logger } from '../../../platform/logging';
-import { IIntegrationStorage } from './types';
+import { IIntegrationStorage, IIntegrationWebviewProvider } from './types';
 import { IntegrationConfig, IntegrationStatus, IntegrationWithStatus } from './integrationTypes';
 
 /**
  * Manages the webview panel for integration configuration
  */
 @injectable()
-export class IntegrationWebviewProvider {
+export class IntegrationWebviewProvider implements IIntegrationWebviewProvider {
     private currentPanel: WebviewPanel | undefined;
 
     private readonly disposables: Disposable[] = [];

src/notebooks/deepnote/integrations/types.ts

@@ -22,3 +22,11 @@ export interface IIntegrationDetector {
      */
     hasUnconfiguredIntegrations(projectId: string): Promise<boolean>;
 }
+
+export const IIntegrationWebviewProvider = Symbol('IIntegrationWebviewProvider');
+export interface IIntegrationWebviewProvider {
+    /**
+     * Show the integration management webview
+     */
+    show(integrations: Map<string, IntegrationWithStatus>): Promise<void>;
+}

src/notebooks/serviceRegistry.node.ts

@@ -47,7 +47,7 @@ import { IntegrationStorage } from './deepnote/integrations/integrationStorage';
 import { IntegrationDetector } from './deepnote/integrations/integrationDetector';
 import { IntegrationManager } from './deepnote/integrations/integrationManager';
 import { IntegrationWebviewProvider } from './deepnote/integrations/integrationWebview';
-import { IIntegrationDetector, IIntegrationStorage } from './deepnote/integrations/types';
+import { IIntegrationDetector, IIntegrationStorage, IIntegrationWebviewProvider } from './deepnote/integrations/types';
 import {
     IDeepnoteToolkitInstaller,
     IDeepnoteServerStarter,
@@ -133,7 +133,7 @@ export function registerTypes(serviceManager: IServiceManager, isDevMode: boolea
     serviceManager.addSingleton<IDeepnoteNotebookManager>(IDeepnoteNotebookManager, DeepnoteNotebookManager);
     serviceManager.addSingleton<IIntegrationStorage>(IIntegrationStorage, IntegrationStorage);
     serviceManager.addSingleton<IIntegrationDetector>(IIntegrationDetector, IntegrationDetector);
-    serviceManager.addSingleton<IntegrationWebviewProvider>(IntegrationWebviewProvider, IntegrationWebviewProvider);
+    serviceManager.addSingleton<IIntegrationWebviewProvider>(IIntegrationWebviewProvider, IntegrationWebviewProvider);
     serviceManager.addSingleton<IntegrationManager>(IntegrationManager, IntegrationManager);
 
     // Deepnote kernel services

src/notebooks/serviceRegistry.web.ts

@@ -42,7 +42,7 @@ import { IntegrationStorage } from './deepnote/integrations/integrationStorage';
 import { IntegrationDetector } from './deepnote/integrations/integrationDetector';
 import { IntegrationManager } from './deepnote/integrations/integrationManager';
 import { IntegrationWebviewProvider } from './deepnote/integrations/integrationWebview';
-import { IIntegrationDetector, IIntegrationStorage } from './deepnote/integrations/types';
+import { IIntegrationDetector, IIntegrationStorage, IIntegrationWebviewProvider } from './deepnote/integrations/types';
 
 export function registerTypes(serviceManager: IServiceManager, isDevMode: boolean) {
     registerControllerTypes(serviceManager, isDevMode);
@@ -99,7 +99,7 @@ export function registerTypes(serviceManager: IServiceManager, isDevMode: boolea
     serviceManager.addSingleton<IDeepnoteNotebookManager>(IDeepnoteNotebookManager, DeepnoteNotebookManager);
     serviceManager.addSingleton<IIntegrationStorage>(IIntegrationStorage, IntegrationStorage);
     serviceManager.addSingleton<IIntegrationDetector>(IIntegrationDetector, IntegrationDetector);
-    serviceManager.addSingleton<IntegrationWebviewProvider>(IntegrationWebviewProvider, IntegrationWebviewProvider);
+    serviceManager.addSingleton<IIntegrationWebviewProvider>(IIntegrationWebviewProvider, IntegrationWebviewProvider);
     serviceManager.addSingleton<IntegrationManager>(IntegrationManager, IntegrationManager);
 
     serviceManager.addSingleton<IExportBase>(IExportBase, ExportBase);